Package: ffmpegthumbnailer Version: 2.0.6-3 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
Hi, Ubuntu as well as Debian experimental have libav 0.7, and ffmpegthumbnailer FTBFS because of a use of a deprecated variable: ... /bin/bash ./libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I/usr/include/libpng12 -D__STDC_CONSTANT_MACROS -c -o libffmpegthumbnailer_la-moviedecoder.lo `test -f 'libffmpegthumbnailer/moviedecoder.cpp' || echo './'`libffmpegthumbnailer/moviedecoder.cpp libtool: compile: g++ -DHAVE_CONFIG_H -I. -I/usr/include/libpng12 -D__STDC_CONSTANT_MACROS -c libffmpegthumbnailer/moviedecoder.cpp -fPIC -DPIC -o .libs/libffmpegthumbnailer_la-moviedecoder.o libffmpegthumbnailer/moviedecoder.cpp: In member function 'void ffmpegthumbnailer::MovieDecoder::initialize(const string&)': libffmpegthumbnailer/moviedecoder.cpp:64:39: warning: 'int av_open_input_file(AVFormatContext**, const char*, AVInputFormat*, int, AVFormatParameters*)' is deprecated (declared at /usr/include/libavformat/avformat.h:1043) [-Wdeprecated-declarations] libffmpegthumbnailer/moviedecoder.cpp:64:109: warning: 'int av_open_input_file(AVFormatContext**, const char*, AVInputFormat*, int, AVFormatParameters*)' is deprecated (declared at /usr/include/libavformat/avformat.h:1043) [-Wdeprecated-declarations] libffmpegthumbnailer/moviedecoder.cpp: In member function 'void ffmpegthumbnailer::MovieDecoder::initializeVideo()': libffmpegthumbnailer/moviedecoder.cpp:130:64: error: 'CODEC_TYPE_VIDEO' was not declared in this scope make[3]: *** [libffmpegthumbnailer_la-moviedecoder.lo] Error 1 In Ubuntu, the following patch, taken from upstream, makes it builds fine: *** /tmp/tmpaTNv9u Thanks for considering the patch. If you are not able to upload it soon to Debian, I'll upload it to Ubuntu, and sync the package back later on. Thanks, 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 ffmpegthumbnailer-2.0.6/debian/patches/99_fix-FTBFS-libav-0.7.patch ffmpegthumbnailer-2.0.6/debian/patches/99_fix-FTBFS-libav-0.7.patch --- ffmpegthumbnailer-2.0.6/debian/patches/99_fix-FTBFS-libav-0.7.patch 1970-01-01 01:00:00.000000000 +0100 +++ ffmpegthumbnailer-2.0.6/debian/patches/99_fix-FTBFS-libav-0.7.patch 2011-07-21 11:04:23.000000000 +0200 @@ -0,0 +1,19 @@ +Description: fix FTBFS because CODEC_TYPE_VIDEO being deprecated in libav 0.7. + Patch taken from upstream svn +Origin: vendor, http://code.google.com/p/ffmpegthumbnailer/source/detail?r=234 + +--- ffmpegthumbnailer-2.0.6.orig/libffmpegthumbnailer/moviedecoder.cpp ++++ ffmpegthumbnailer-2.0.6/libffmpegthumbnailer/moviedecoder.cpp +@@ -127,7 +127,11 @@ void MovieDecoder::initializeVideo() + { + for (unsigned int i = 0; i < m_pFormatContext->nb_streams; ++i) + { +- if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) ++#if LIBAVCODEC_VERSION_MAJOR < 53 ++ if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) ++#else ++ if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) ++#endif + { + m_pVideoStream = m_pFormatContext->streams[i]; + m_VideoStream = i; diff -Nru ffmpegthumbnailer-2.0.6/debian/patches/series ffmpegthumbnailer-2.0.6/debian/patches/series --- ffmpegthumbnailer-2.0.6/debian/patches/series 2011-05-15 20:57:35.000000000 +0200 +++ ffmpegthumbnailer-2.0.6/debian/patches/series 2011-07-21 10:59:30.000000000 +0200 @@ -1,2 +1,3 @@ 01_fix-ftbfs-as-needed.patch 02_fix-ftbfs-missing-include-NULL.patch +99_fix-FTBFS-libav-0.7.patch
