[med-svn] r16300 - in trunk/packages/amide/trunk/debian: . patches
Andreas Tille
tille at moszumanska.debian.org
Mon Feb 24 15:06:11 UTC 2014
Author: tille
Date: 2014-02-24 15:06:11 +0000 (Mon, 24 Feb 2014)
New Revision: 16300
Added:
trunk/packages/amide/trunk/debian/patches/10_Makefile.am.patch
trunk/packages/amide/trunk/debian/patches/10_configure.ac.patch
trunk/packages/amide/trunk/debian/patches/10_desktop.in.patch
Removed:
trunk/packages/amide/trunk/debian/patches/10_all.patch
trunk/packages/amide/trunk/debian/patches/deprecated-libav.patch
trunk/packages/amide/trunk/debian/patches/gcc-4.8_format-security.patch
Modified:
trunk/packages/amide/trunk/debian/changelog
trunk/packages/amide/trunk/debian/patches/libav10.patch
trunk/packages/amide/trunk/debian/patches/series
Log:
Adapted patches to new upstream version
Modified: trunk/packages/amide/trunk/debian/changelog
===================================================================
--- trunk/packages/amide/trunk/debian/changelog 2014-02-24 14:42:58 UTC (rev 16299)
+++ trunk/packages/amide/trunk/debian/changelog 2014-02-24 15:06:11 UTC (rev 16300)
@@ -1,5 +1,6 @@
amide (1.0.4-2) UNRELEASED; urgency=low
+ * New upstream version (adapted patches)
* debian/upstream/metadata: Add publication data
* debian/patches/libav10.patch: Fix compilation against libav 10
(Thanks to Reinhard Tartler <siretart at tauware.de> for the patch)
Added: trunk/packages/amide/trunk/debian/patches/10_Makefile.am.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/10_Makefile.am.patch (rev 0)
+++ trunk/packages/amide/trunk/debian/patches/10_Makefile.am.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -0,0 +1,38 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Thu, 24 Mar 2011 15:02:45 +0100
+LastChanged: Mon, 26 Aug 2013 14:53:06 +0200
+Description: debian/patches/10_all.diff: Make sure -lavcodec and -lavutil
+ is propagated to the linker
+
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,12 +24,11 @@ AM_CFLAGS = \
+ $(GSL_CFLAGS) \
+ $(LIBFAME_CFLAGS) \
+ $(AMIDE_GTK_CFLAGS) \
+- $(AMIDE_DEBUG_CFLAGS) \
+ $(AMIDE_CHECK_OBSOLETE_CFLAGS) \
+ $(AMIDE_LIBDCMDATA_CFLAGS) \
+- -I/usr/local/include \
+ $(XMEDCON_CFLAGS) \
+- $(FFMPEG_CFLAGS)
++ $(LIBAVCODEC_CFLAGS) \
++ -DG_DISABLE_DEPRECATED
+
+
+
+@@ -42,12 +41,11 @@ bin_PROGRAMS = amide
+ # to be behind the DCMTK stuff
+ amide_LDADD = \
+ $(GSL_LIBS) \
+- $(LIBFAME_LIBS) \
+ $(AMIDE_LIBECAT_LIBS) \
+ $(AMIDE_LIBVOLPACK_LIBS) \
+ $(AMIDE_GTK_LIBS) \
+ $(XMEDCON_LIBS) \
+- $(FFMPEG_LIBS) \
++ $(LIBAVCODEC_LIBS) \
+ $(AMIDE_LIBDCMDATA_LIBS) \
+ $(AMIDE_LDADD_WIN32)
+
Deleted: trunk/packages/amide/trunk/debian/patches/10_all.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/10_all.patch 2014-02-24 14:42:58 UTC (rev 16299)
+++ trunk/packages/amide/trunk/debian/patches/10_all.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -1,95 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Date: Thu, 24 Mar 2011 15:02:45 +0100
-LastChanged: Mon, 26 Aug 2013 14:53:06 +0200
-Description: debian/patches/10_all.diff: Make sure -lavcodec and -lavutil
- is propagated to the linker
-
-
---- a/configure.in
-+++ b/configure.in
-@@ -69,7 +69,7 @@ if test $CC = "gcc"; then
- read continue_with_bad_gcc
- if test $continue_with_bad_gcc = "y"; then
- echo "removing optimizations to reduce potential of compiler error"
-- CFLAGS="-g -O0"
-+ CFLAGS="-O0"
- else
- exit 1
- fi
-@@ -92,8 +92,8 @@ fi
-
- dnl check for various libraries and programs that we might need
- AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
--AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no, -L/sw/lib)
--AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm -L/sw/lib -L/usr/local/lib)
-+AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no)
-+AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm)
- AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
-
-
-@@ -101,8 +101,8 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=ye
- dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
- dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
- AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
--AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
--AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
-+AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS"
-+AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
- dnl 2010.02.20 AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include/dcmtk/dcmdata -I/usr/local/dicom/include/dcmtk/ofstd -I/usr/local/dicom/include -I/usr/include/dcmtk/dcmdata -I/usr/local/include/dcmtk/ofstd -I/sw/include/dcmtk/dcmdata -I/sw/include/dcmtk/ofstd -I/sw/include/dcmtk"
- saved_libs="${LIBS}"
- LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
-@@ -249,7 +249,7 @@ if (test $enable_libmdc = yes) && (test
- AC_DEFINE(AMIDE_LIBMDC_SUPPORT, 1, Define to compile with (X)MedCon)
-
- dnl 2007.10.28 - new xmedcon's should be using glib2/gtk2, dont' have to overwrite XMEDCON_LIBS
-- dnl XMEDCON_LIBS="-L/usr/local/lib -L/usr/local/xmedcon/lib -lmdc"
-+ dnl XMEDCON_LIBS="-lmdc"
- AC_SUBST(XMEDCON_LIBS)
- else
- echo "compiling without xmedcon/libmdc file support"
-@@ -453,6 +453,3 @@ AC_OUTPUT
- dnl help/C/Makefile
- dnl help/es/Makefile
-
--dnl Move the spec file so it won't get eaten by make distclean
--echo "Moving SPEC file to base directory"
--mv etc/amide.spec ./
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -23,12 +23,11 @@ AM_CFLAGS = \
- $(GSL_CFLAGS) \
- $(LIBFAME_CFLAGS) \
- $(AMIDE_GTK_CFLAGS) \
-- $(AMIDE_DEBUG_CFLAGS) \
- $(AMIDE_CHECK_OBSOLETE_CFLAGS) \
- $(AMIDE_LIBDCMDATA_CFLAGS) \
-- -I/usr/local/include \
- $(XMEDCON_CFLAGS) \
-- $(FFMPEG_CFLAGS)
-+ $(LIBAVCODEC_CFLAGS) \
-+ -DG_DISABLE_DEPRECATED
-
-
-
-@@ -41,12 +40,11 @@ bin_PROGRAMS = amide
- # to be behind the DCMTK stuff
- amide_LDADD = \
- $(GSL_LIBS) \
-- $(LIBFAME_LIBS) \
- $(AMIDE_LIBECAT_LIBS) \
- $(AMIDE_LIBVOLPACK_LIBS) \
- $(AMIDE_GTK_LIBS) \
- $(XMEDCON_LIBS) \
-- $(FFMPEG_LIBS) \
-+ $(LIBAVCODEC_LIBS) \
- $(AMIDE_LIBDCMDATA_LIBS) \
- $(AMIDE_LDADD_WIN32)
-
---- a/etc/amide.desktop.in
-+++ b/etc/amide.desktop.in
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- _GenericName=Medical Image Examiner
- _Name=Amide
- _Comment=analysis tool for medical images
Added: trunk/packages/amide/trunk/debian/patches/10_configure.ac.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/10_configure.ac.patch (rev 0)
+++ trunk/packages/amide/trunk/debian/patches/10_configure.ac.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -0,0 +1,33 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ dnl echo -n "continue anyway? (y/n) "
+ dnl read continue_with_bad_gcc
+ dnl if test $continue_with_bad_gcc = "y"; then
+ dnl echo "removing optimizations to reduce potential of compiler error"
+-dnl CFLAGS="-g -O0"
++dnl CFLAGS="-O0"
+ dnl else
+ dnl exit 1
+ dnl fi
+@@ -97,8 +97,8 @@ dnl fi
+
+ dnl check for various libraries and programs that we might need
+ AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
+-AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no, -L/sw/lib)
+-AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm -L/sw/lib -L/usr/local/lib)
++AC_CHECK_LIB(ecat, matrix_open, FOUND_LIBECAT=yes, FOUND_LIBECAT=no)
++AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm)
+ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
+
+
+@@ -106,8 +106,8 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=ye
+ dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
+ dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
+ AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
+-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
+-AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
++AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS"
++AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
+ saved_libs="${LIBS}"
+ LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
+ saved_cxxflags="${CXXFLAGS}"
Added: trunk/packages/amide/trunk/debian/patches/10_desktop.in.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/10_desktop.in.patch (rev 0)
+++ trunk/packages/amide/trunk/debian/patches/10_desktop.in.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Thu, 24 Mar 2011 15:02:45 +0100
+LastChanged: Mon, 26 Aug 2013 14:53:06 +0200
+Description: debian/patches/10_all.diff: Make sure -lavcodec and -lavutil
+ is propagated to the linker
+
+
+--- a/etc/amide.desktop.in
++++ b/etc/amide.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _GenericName=Medical Image Examiner
+ _Name=Amide
+ _Comment=analysis tool for medical images
Deleted: trunk/packages/amide/trunk/debian/patches/deprecated-libav.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/deprecated-libav.patch 2014-02-24 14:42:58 UTC (rev 16299)
+++ trunk/packages/amide/trunk/debian/patches/deprecated-libav.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -1,26 +0,0 @@
-Author: Andreas Moog <andreas.moog at warperbbs.de>
-LastChanged: Tue, 27 Aug 2013 13:34:56 +0200
-BugsDebian: http://bugs.debian.org/720779
-Description: recent libavcodec removed some more deprecated functions and
- your source code needs some adaptation.
-
---- amide-1.0.4.orig/src/mpeg_encode.c
-+++ amide-1.0.4/src/mpeg_encode.c
-@@ -261,7 +261,7 @@
- return NULL;
- }
-
-- encode->context = avcodec_alloc_context();
-+ encode->context = avcodec_alloc_context3(NULL);
- if (!encode->context) {
- g_warning("couldn't allocate memory for encode->context");
- encode_free(encode);
-@@ -299,7 +299,7 @@
- encode->context->trellis=2; /* turn trellis quantization on */
-
- /* open it */
-- if (avcodec_open(encode->context, encode->codec) < 0) {
-+ if (avcodec_open2(encode->context, encode->codec, NULL) < 0) {
- g_warning("could not open codec");
- encode_free(encode);
- return NULL;
Deleted: trunk/packages/amide/trunk/debian/patches/gcc-4.8_format-security.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/gcc-4.8_format-security.patch 2014-02-24 14:42:58 UTC (rev 16299)
+++ trunk/packages/amide/trunk/debian/patches/gcc-4.8_format-security.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -1,50 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-LastChanged: Mon, 26 Aug 2013 14:53:06 +0200
-Description: Make sure package builds even with --format-security enabled
- (build using hardening flags)
-
-
---- amide-1.0.4.orig/src/amide.c
-+++ amide-1.0.4/src/amide.c
-@@ -146,7 +146,7 @@
- #endif
- NULL);
-
-- g_warning(comments);
-+ g_warning("%s", comments);
-
- g_free(comments);
- amide_gconf_set_string("MISSING_FUNCTIONALITY", "AlreadyWarned", VERSION);
---- amide-1.0.4.orig/src/amide_gnome.c
-+++ amide-1.0.4/src/amide_gnome.c
-@@ -166,7 +166,7 @@
- g_set_error (error,
- AMIDE_GNOME_URL_ERROR,
- AMIDE_GNOME_URL_ERROR_VFS,
-- gnome_vfs_result_to_string (result));
-+ "%s", gnome_vfs_result_to_string (result));
- }
-
- return FALSE;
---- amide-1.0.4.orig/src/amitk_space_edit.c
-+++ amide-1.0.4/src/amitk_space_edit.c
-@@ -335,7 +335,7 @@
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_OK_CANCEL,
-- message);
-+ "%s", message);
- return_val = gtk_dialog_run(GTK_DIALOG(question));
-
- gtk_widget_destroy(question);
---- amide-1.0.4.orig/src/tb_profile.c
-+++ amide-1.0.4/src/tb_profile.c
-@@ -368,7 +368,7 @@
- }
-
- results = results_as_string(tb_profile);
-- fprintf(file_pointer, results);
-+ fprintf(file_pointer, "%s", results);
- g_free(results);
-
- fclose(file_pointer);
Modified: trunk/packages/amide/trunk/debian/patches/libav10.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/libav10.patch 2014-02-24 14:42:58 UTC (rev 16299)
+++ trunk/packages/amide/trunk/debian/patches/libav10.patch 2014-02-24 15:06:11 UTC (rev 16300)
@@ -35,7 +35,7 @@
if (!encode->picture) {
g_warning("couldn't allocate memory for encode->picture");
encode_free(encode);
-@@ -359,15 +360,19 @@ gpointer mpeg_encode_setup(gchar * outpu
+@@ -361,15 +362,19 @@ gpointer mpeg_encode_setup(gchar * outpu
gboolean mpeg_encode_frame(gpointer data, GdkPixbuf * pixbuf) {
encode_t * encode = data;
Modified: trunk/packages/amide/trunk/debian/patches/series
===================================================================
--- trunk/packages/amide/trunk/debian/patches/series 2014-02-24 14:42:58 UTC (rev 16299)
+++ trunk/packages/amide/trunk/debian/patches/series 2014-02-24 15:06:11 UTC (rev 16300)
@@ -1,4 +1,4 @@
-10_all.patch
-gcc-4.8_format-security.patch
-deprecated-libav.patch
+10_configure.ac.patch
+10_Makefile.am.patch
+10_desktop.in.patch
libav10.patch
More information about the debian-med-commit
mailing list