Package: xine-lib-1.2 Version: 1.2.2-4 Severity: wishlist Tags: patch User: [email protected] Usertags: origin-ubuntu raring ubuntu-patch
Dear Maintainer, When compiled against libav 0.9 from experimental, xine-lib-1.2 FTBFS with the following errors: .... CC xineplug_vo_out_dxr3_la-ffmpeg_encoder.lo ffmpeg_encoder.c: In function 'lavc_on_update_format': ffmpeg_encoder.c:123:5: error: implicit declaration of function 'av_mallocz' [-Werror=implicit-function-declaration] ffmpeg_encoder.c:123:5: warning: nested extern declaration of 'av_mallocz' [-Wnested-externs] ffmpeg_encoder.c:123:30: warning: assignment makes pointer from integer without a cast [enabled by default] ffmpeg_encoder.c: In function 'lavc_on_display_frame': ffmpeg_encoder.c:254:3: warning: 'avcodec_encode_video' is deprecated (declared at /usr/include/libavcodec/avcodec.h:3986) [-Wdeprecated-declarations] cc1: some warnings being treated as errors make[3]: *** [xineplug_vo_out_dxr3_la-ffmpeg_encoder.lo] Error 1 make[3]: se sale del directorio «/tmp/xine-lib-1.2/xine-lib-1.2-1.2.2/src/dxr3» make[2]: *** [all-recursive] Error 1 *** /tmp/tmpAZ8sHk/bug_body In Ubuntu, the attached patch was applied to achieve the following: * 0003-fix-libav9-ftbfs: fix FTBFS with LIBAV9 by adding a missing header. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers quantal-updates APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500, 'quantal') Architecture: i386 (i686) Kernel: Linux 3.5.0-18-generic (SMP w/1 CPU core) Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru xine-lib-1.2-1.2.2/debian/patches/0003-fix-libav9-ftbfs xine-lib-1.2-1.2.2/debian/patches/0003-fix-libav9-ftbfs --- xine-lib-1.2-1.2.2/debian/patches/0003-fix-libav9-ftbfs 1970-01-01 01:00:00.000000000 +0100 +++ xine-lib-1.2-1.2.2/debian/patches/0003-fix-libav9-ftbfs 2012-11-12 07:33:00.000000000 +0100 @@ -0,0 +1,47 @@ +Description: Fix FTBFS with libav9, by adding libavutil/mem.h header. This + defines av_mallocz that is required. +Author: Fabrice Coutadeur <[email protected]> +--- a/src/dxr3/ffmpeg_encoder.c ++++ b/src/dxr3/ffmpeg_encoder.c +@@ -44,6 +44,7 @@ + # include <libavcodec/avcodec.h> + #endif + ++#include <libavutil/mem.h> + #include "../combined/ffmpeg/ffmpeg_compat.h" + + /* buffer size for encoded mpeg1 stream; will hold one intra frame +--- a/src/combined/ffmpeg/ff_audio_decoder.c ++++ b/src/combined/ffmpeg/ff_audio_decoder.c +@@ -43,6 +43,7 @@ + #include "bswap.h" + #include "ffmpeg_decoder.h" + #include "ffmpeg_compat.h" ++#include <libavutil/mem.h> + + #define AUDIOBUFSIZE (64 * 1024) + +--- a/src/combined/ffmpeg/ff_video_decoder.c ++++ b/src/combined/ffmpeg/ff_video_decoder.c +@@ -50,6 +50,7 @@ + # include <libpostproc/postprocess.h> + #endif + ++#include <libavutil/mem.h> + #include "ffmpeg_compat.h" + + #define VIDEOBUFSIZE (128*1024) +@@ -258,13 +259,6 @@ + av_frame->linesize[1] = img->pitches[1]; + av_frame->linesize[2] = img->pitches[2]; + +- /* We should really keep track of the ages of xine frames (see +- * avcodec_default_get_buffer in libavcodec/utils.c) +- * For the moment tell ffmpeg that every frame is new (age = bignumber) */ +-#ifdef AVFRAMEAGE +- av_frame->age = 256*256*256*64; +-#endif +- + av_frame->type= FF_BUFFER_TYPE_USER; + + /* take over pts for this frame to have it reordered */ diff -Nru xine-lib-1.2-1.2.2/debian/patches/series xine-lib-1.2-1.2.2/debian/patches/series --- xine-lib-1.2-1.2.2/debian/patches/series 2012-06-30 20:16:35.000000000 +0200 +++ xine-lib-1.2-1.2.2/debian/patches/series 2012-11-12 06:31:45.000000000 +0100 @@ -3,3 +3,4 @@ 0002-fix-greedy2frame-sse2 0002-fix-raw-yuv 0002-free-DR1-frames +0003-fix-libav9-ftbfs
