Author: tille Date: 2014-02-26 09:20:48 +0000 (Wed, 26 Feb 2014) New Revision: 16327
Modified: trunk/packages/amide/trunk/debian/changelog trunk/packages/amide/trunk/debian/control trunk/packages/amide/trunk/debian/patches/libav10.patch Log: Enhanced patch allows one to build also against libav in unstable Modified: trunk/packages/amide/trunk/debian/changelog =================================================================== --- trunk/packages/amide/trunk/debian/changelog 2014-02-25 20:47:43 UTC (rev 16326) +++ trunk/packages/amide/trunk/debian/changelog 2014-02-26 09:20:48 UTC (rev 16327) @@ -1,3 +1,11 @@ +amide (1.0.5-2) unstable; urgency=medium + + * Enhanced patch allows one to build also against libav in unstable + * New upstream version in unstable + Closes: #703076 + + -- Andreas Tille <[email protected]> Wed, 26 Feb 2014 09:09:59 +0100 + amide (1.0.5-1) experimental; urgency=low * New upstream version (adapted patches) Modified: trunk/packages/amide/trunk/debian/control =================================================================== --- trunk/packages/amide/trunk/debian/control 2014-02-25 20:47:43 UTC (rev 16326) +++ trunk/packages/amide/trunk/debian/control 2014-02-26 09:20:48 UTC (rev 16327) @@ -22,7 +22,7 @@ libvolpack1-dev, libavcodec-dev, libavformat-dev, - libavutil-dev ( >= 6:10~alpha2-1~ ) + libavutil-dev Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/amide/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/amide/trunk/ Modified: trunk/packages/amide/trunk/debian/patches/libav10.patch =================================================================== --- trunk/packages/amide/trunk/debian/patches/libav10.patch 2014-02-25 20:47:43 UTC (rev 16326) +++ trunk/packages/amide/trunk/debian/patches/libav10.patch 2014-02-26 09:20:48 UTC (rev 16327) @@ -1,18 +1,22 @@ Description: Fix compilation against libav 10 Author: Reinhard Tartler <[email protected]> +Last-Update: Tue, 25 Feb 2014 13:37:02 +0000 Bug-Debian: http://bugs.debian.org/739211 --- a/src/mpeg_encode.c +++ b/src/mpeg_encode.c -@@ -142,6 +142,7 @@ static void convert_rgb_pixbuf_to_yuv(yu - #ifdef AMIDE_FFMPEG_SUPPORT +@@ -143,6 +143,10 @@ static void convert_rgb_pixbuf_to_yuv(yu #include <libavcodec/avcodec.h> + ++#if LIBAVCODEC_VERSION_MAJOR >= 55 +#include <libavutil/frame.h> ++#endif ++ - typedef struct { -@@ -234,11 +235,11 @@ gpointer mpeg_encode_setup(gchar * outpu + AVCodec *codec; +@@ -234,11 +238,11 @@ gpointer mpeg_encode_setup(gchar * outpu switch(type) { case ENCODE_MPEG4: @@ -26,16 +30,19 @@ break; } -@@ -268,7 +269,7 @@ gpointer mpeg_encode_setup(gchar * outpu +@@ -268,7 +272,11 @@ gpointer mpeg_encode_setup(gchar * outpu return NULL; } -- encode->picture= avcodec_alloc_frame(); ++#if LIBAVCODEC_VERSION_MAJOR >= 55 + encode->picture= av_frame_alloc(); ++#else + encode->picture= avcodec_alloc_frame(); ++#endif if (!encode->picture) { g_warning("couldn't allocate memory for encode->picture"); encode_free(encode); -@@ -361,15 +362,19 @@ gpointer mpeg_encode_setup(gchar * outpu +@@ -361,15 +369,19 @@ gpointer mpeg_encode_setup(gchar * outpu gboolean mpeg_encode_frame(gpointer data, GdkPixbuf * pixbuf) { encode_t * encode = data; _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
