Package: libvalhalla
Version: 2.0.0-3
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi,
libvalhalla FTBFS with libav 0.7 (Debian experimental and Ubuntu oneiric) with
the following error:
...
gcc -c -g -O2 -fPIC -W -Wall -I/usr/include/libxml2 -I/usr/include/libexif -g
-O2 -DPIC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DHAVE_DEBUG
-DUSE_XML -DUSE_LAVC -DHAVE_GRABBER_ALLOCINE -DHAVE_GRABBER_AMAZON
-DHAVE_GRABBER_CHARTLYRICS -DHAVE_GRABBER_EXIF -DHAVE_GRABBER_FFMPEG
-DHAVE_GRABBER_IMDB -DHAVE_GRABBER_LASTFM -DHAVE_GRABBER_LOCAL
-DHAVE_GRABBER_LYRICWIKI -DHAVE_GRABBER_NFO -DHAVE_GRABBER_TMDB
-DHAVE_GRABBER_TVDB -DHAVE_GRABBER_TVRAGE -DUSE_GRABBER -DUSE_LOGCOLOR -o
grabber_ffmpeg.o grabber_ffmpeg.c
grabber_ffmpeg.c: In function 'grabber_ffmpeg_properties_get':
grabber_ffmpeg.c:92:10: error: 'CODEC_TYPE_AUDIO' undeclared (first use in this
function)
grabber_ffmpeg.c:92:10: note: each undeclared identifier is reported only once
for each function it appears in
grabber_ffmpeg.c:106:10: error: 'CODEC_TYPE_VIDEO' undeclared (first use in
this function)
grabber_ffmpeg.c:141:10: error: 'CODEC_TYPE_SUBTITLE' undeclared (first use in
this function)
make[2]: *** [grabber_ffmpeg.o] Error 1
In Ubuntu, the following patch fixed the FTBFS:
*** /tmp/tmpXsT_Ie
Thanks for considering the patch.
Fabrice
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-10-generic (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF8, LC_CTYPE=es_ES.UTF8 (charmap=UTF-8) (ignored: LC_ALL
set to es_ES.UTF8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libvalhalla-2.0.0/debian/patches/fix_ftbfs_libav_0.7.patch libvalhalla-2.0.0/debian/patches/fix_ftbfs_libav_0.7.patch
--- libvalhalla-2.0.0/debian/patches/fix_ftbfs_libav_0.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ libvalhalla-2.0.0/debian/patches/fix_ftbfs_libav_0.7.patch 2011-07-26 13:28:57.000000000 +0200
@@ -0,0 +1,46 @@
+Description: fix FTBFS with libav 0.7 because of use of deprecated functions
+Author: Fabrice Coutadeur <fabric...@ubuntu.com>
+
+--- libvalhalla-2.0.0.orig/src/parser.c
++++ libvalhalla-2.0.0/src/parser.c
+@@ -340,9 +340,9 @@ parser_stream_info (AVFormatContext *ctx
+ {
+ AVStream *st = ctx->streams[i];
+
+- if (st->codec->codec_type == CODEC_TYPE_VIDEO)
++ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+ video_st = 1;
+- else if (st->codec->codec_type == CODEC_TYPE_AUDIO)
++ else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ audio_st = 1;
+ }
+
+--- libvalhalla-2.0.0.orig/src/grabber_ffmpeg.c
++++ libvalhalla-2.0.0/src/grabber_ffmpeg.c
+@@ -89,7 +89,7 @@ grabber_ffmpeg_properties_get (grabber_f
+
+ switch (codec->codec_type)
+ {
+- case CODEC_TYPE_AUDIO:
++ case AVMEDIA_TYPE_AUDIO:
+ audio_streams++;
+ name = grabber_ffmpeg_codec_name (codec->codec_id);
+ if (name)
+@@ -103,7 +103,7 @@ grabber_ffmpeg_properties_get (grabber_f
+ VALHALLA_METADATA_AUDIO_BITRATE, ffmpeg->pl);
+ break;
+
+- case CODEC_TYPE_VIDEO:
++ case AVMEDIA_TYPE_VIDEO:
+ /* Common part (image + video) */
+ video_streams++;
+ name = grabber_ffmpeg_codec_name (codec->codec_id);
+@@ -138,7 +138,7 @@ grabber_ffmpeg_properties_get (grabber_f
+ VALHALLA_METADATA_VIDEO_ASPECT, ffmpeg->pl);
+ break;
+
+- case CODEC_TYPE_SUBTITLE:
++ case AVMEDIA_TYPE_SUBTITLE:
+ sub_streams++;
+ break;
+
diff -Nru libvalhalla-2.0.0/debian/patches/series libvalhalla-2.0.0/debian/patches/series
--- libvalhalla-2.0.0/debian/patches/series 2011-02-25 13:02:41.000000000 +0100
+++ libvalhalla-2.0.0/debian/patches/series 2011-07-26 13:28:15.000000000 +0200
@@ -1 +1,2 @@
add-lrt-to-ldflags.patch
+fix_ftbfs_libav_0.7.patch
