Package: gmerlin-avdecoder Version: 1.2.0~dfsg-1 Severity: important Tags: patch
Hi, Your package FTBFS against libav 9, which is currently in experimental: /bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include -I../include -D_FORTIFY_SOURCE=2 -DLOCALE_DIR=\"/usr/share/locale\" -D__BGAV__ -fvisibility=hidden -march=k8 -mtune=k8 -O3 -funroll-all-loops -ffast-math -I/usr/include -I/usr/include -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -I/usr/include/mpeg2dec -I/usr/include/libdca -I/usr/include/schroedinger-1.0 -I/usr/include/orc-0.4 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-declarations -Wdeclaration-after-statement -c -o demux_ffmpeg.lo demux_ffmpeg.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../include -I../include -D_FORTIFY_SOURCE=2 -DLOCALE_DIR=\"/usr/share/locale\" -D__BGAV__ -fvisibility=hidden -march=k8 -mtune=k8 -O3 -funroll-all-loops -ffast-math -I/usr/include -I/usr/include -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -I/usr/include/mpeg2dec -I/usr/include/libdca -I/usr/include/schroedinger-1.0 -I/usr/include/orc-0.4 -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-declarations -Wdeclaration-after-statement -c demux_ffmpeg.c -fPIC -DPIC -o .libs/demux_ffmpeg.o demux_ffmpeg.c:299:7: error: 'CODEC_ID_SONIC' undeclared here (not in a function) The attached patch fixes this. Please forward and discuss this with your upstream. Cheers, Reinhard -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise-proposed'), (500, 'precise') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-33-generic (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
Description: Fix FTBFS against libav 9 * Unbreak compilation against libav 9 Author: Reinhard Tartler <siret...@tauware.de> --- Bug-Debian: http://bugs.debian.org/<bugnumber> Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> Forwarded: no Index: gmerlin-avdecoder-1.2.0~dfsg/lib/demux_ffmpeg.c =================================================================== --- gmerlin-avdecoder-1.2.0~dfsg.orig/lib/demux_ffmpeg.c 2012-11-17 07:26:54.000000000 +0000 +++ gmerlin-avdecoder-1.2.0~dfsg/lib/demux_ffmpeg.c 2012-11-17 07:26:54.000000000 +0000 @@ -296,8 +296,10 @@ { CODEC_ID_MACE3, BGAV_MK_FOURCC('M', 'A', 'C', '3') }, { CODEC_ID_MACE6, BGAV_MK_FOURCC('M', 'A', 'C', '6') }, { CODEC_ID_VMDAUDIO, BGAV_MK_FOURCC('V', 'M', 'D', 'A')}, +#if LIBAVCODEC_VERSION_MAJOR == 53 { CODEC_ID_SONIC, BGAV_WAVID_2_FOURCC(0x2048) }, // { CODEC_ID_SONIC_LS, }, +#endif // { CODEC_ID_FLAC, }, { CODEC_ID_MP3ADU, BGAV_MK_FOURCC('r', 'm', 'p', '3') }, { CODEC_ID_MP3ON4, BGAV_MK_FOURCC('m', '4', 'a', 29) }, Index: gmerlin-avdecoder-1.2.0~dfsg/lib/audio_ffmpeg.c =================================================================== --- gmerlin-avdecoder-1.2.0~dfsg.orig/lib/audio_ffmpeg.c 2012-11-17 07:29:36.478270559 +0000 +++ gmerlin-avdecoder-1.2.0~dfsg/lib/audio_ffmpeg.c 2012-11-17 07:30:47.176321476 +0000 @@ -773,10 +773,12 @@ CODEC_ID_VMDAUDIO, (uint32_t[]){ BGAV_MK_FOURCC('V', 'M', 'D', 'A'), 0x00 } }, +#if LIBAVCODEC_VERSION_MAJOR == 53 /* CODEC_ID_SONIC, */ { "FFmpeg Sonic decoder", "Sonic", CODEC_ID_SONIC, (uint32_t[]){ BGAV_WAVID_2_FOURCC(0x2048), 0x00 }, -1 }, +#endif /* CODEC_ID_SONIC_LS, */ /* CODEC_ID_FLAC, */
