tags 739328 + patch
tags 739328 + pending
thanks
Dear maintainer,
I've prepared an NMU for lightspark (versioned as 0.7.2-3.1) and
uploaded it to DELAYED/02. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru lightspark-0.7.2/debian/changelog lightspark-0.7.2/debian/changelog
--- lightspark-0.7.2/debian/changelog 2013-12-02 09:00:25.0 -0500
+++ lightspark-0.7.2/debian/changelog 2014-05-14 22:22:50.0 -0400
@@ -1,3 +1,10 @@
+lightspark (0.7.2-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS against libav10 (Closes: #739328)
+
+ -- Reinhard Tartler siret...@tauware.de Wed, 14 May 2014 22:22:03 -0400
+
lightspark (0.7.2-3) unstable; urgency=low
[ Sylvestre Ledru ]
diff -Nru lightspark-0.7.2/debian/patches/libav10.patch lightspark-0.7.2/debian/patches/libav10.patch
--- lightspark-0.7.2/debian/patches/libav10.patch 1969-12-31 19:00:00.0 -0500
+++ lightspark-0.7.2/debian/patches/libav10.patch 2014-05-14 22:22:44.0 -0400
@@ -0,0 +1,285 @@
+Description: Fix FTBFS against libav10
+Bug-Debian: http://bugs.debian.org/739328
+
+Most changes in this patch have been manually cherry-picked from upstream.
+The only missing change are the CODEC_ID - AV_CODEC_ID renames
+
+Applied upstream git commits:
+
+* 9b20db3 fix compilation without HAVE_AVCODEC_DECODE_AUDIO4
+* e01bb75 Fix audio decoding when using avcodec_decode_audio2
+* e957947 Fix compilation when libavresample is not installed (Ubuntu) or AVCodecID is defined (new libavcodec)
+* 4d2d927 Add an include file (needed on Debian unstable)
+* fff7e63 fix compilation with ffmpeg 2.0 avcodec_decode_audio4 seems not to deliver data in AV_SAMPLE_FMT_S16 format, so we have to use libavresample for resampling
+
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -287,12 +287,17 @@ ENDIF(AUDIO_BACKEND)
+
+ IF(ENABLE_LIBAVCODEC)
+ pkg_check_modules(FFMPEG libavcodec libavutil libavformat)
++ pkg_check_modules(LIBAVRESAMPLE libavresample)
+ IF(NOT(FFMPEG_FOUND))
+ INCLUDE(FindFFMpeg REQUIRED)
+ ENDIF(NOT(FFMPEG_FOUND))
+ # Compatibility checks for ffmpeg deprecated functions
+ INCLUDE(CheckFunctionExists REQUIRED)
+- SET(CMAKE_REQUIRED_FLAGS ${LIBAVCODEC_CFLAGS})
++ INCLUDE(CheckCSourceCompiles)
++ SET(FFMPEG_FLAGS ${LIBAVCODEC_CFLAGS} ${LIBAVRESAMPLE_FLAGS})
++ SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS})
++ SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES};${LIBAVRESAMPLE_LIBRARIES})
++ SET(CMAKE_REQUIRED_FLAGS ${FFMPEG_FLAGS})
+ SET(CMAKE_REQUIRED_INCLUDES ${FFMPEG_INCLUDE_DIRS})
+ SET(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES})
+ CHECK_FUNCTION_EXISTS(avcodec_decode_video2 HAVE_AVCODEC_DECODE_VIDEO2)
+@@ -303,7 +308,8 @@ IF(ENABLE_LIBAVCODEC)
+ CHECK_FUNCTION_EXISTS(avcodec_open2 HAVE_AVCODEC_OPEN2)
+ CHECK_FUNCTION_EXISTS(avformat_close_input HAVE_AVFORMAT_CLOSE_INPUT)
+ CHECK_FUNCTION_EXISTS(avformat_find_stream_info HAVE_AVFORMAT_FIND_STREAM_INFO)
+-
++ CHECK_C_SOURCE_COMPILES(#include libavcodec/avcodec.h\nint main() { enum AVCodecID c; return 0; } HAVE_AVCODECID)
++
+ SET(CMAKE_REQUIRED_FLAGS)
+ SET(CMAKE_REQUIRED_INCLUDES)
+ SET(CMAKE_REQUIRED_LIBRARIES)
+@@ -331,6 +337,12 @@ IF(ENABLE_LIBAVCODEC)
+ IF(HAVE_AVFORMAT_FIND_STREAM_INFO)
+ ADD_DEFINITIONS(-DHAVE_AVFORMAT_FIND_STREAM_INFO)
+ ENDIF(HAVE_AVFORMAT_FIND_STREAM_INFO)
++ IF(HAVE_AVCODECID)
++ADD_DEFINITIONS(-DHAVE_AVCODECID)
++ ENDIF(HAVE_AVCODECID)
++ IF(LIBAVRESAMPLE_FOUND)
++ADD_DEFINITIONS(-DHAVE_LIBAVRESAMPLE)
++ ENDIF(LIBAVRESAMPLE_FOUND)
+ ADD_DEFINITIONS(-DENABLE_LIBAVCODEC)
+ ENDIF(ENABLE_LIBAVCODEC)
+
+--- a/conf/FindFFMpeg.cmake
b/conf/FindFFMpeg.cmake
+@@ -23,7 +23,11 @@ FIND_LIBRARY(FFMPEG_AVFORMAT_LIBRARY NAM
+ avformat
+ )
+
+-SET(FFMPEG_LIBRARY ${FFMPEG_AVCODEC_LIBRARY} ${FFMPEG_AVUTIL_LIBRARY} ${FFMPEG_AVFORMAT_LIBRARY})
++FIND_LIBRARY(FFMPEG_AVRESAMPLE_LIBRARY NAMES
++avresample
++)
++
++SET(FFMPEG_LIBRARY ${FFMPEG_AVCODEC_LIBRARY} ${FFMPEG_AVUTIL_LIBRARY} ${FFMPEG_AVFORMAT_LIBRARY} ${FFMPEG_AVRESAMPLE_LIBRARY})
+ MARK_AS_ADVANCED(FFMPEG_LIBRARY)
+
+ # handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if
+--- a/src/backends/decoder.cpp
b/src/backends/decoder.cpp
+@@ -119,7 +119,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(L
+ if(codecId==H264)
+ {
+ //TODO: serialize access to avcodec_open
+- const enum CodecID FFMPEGcodecId=CODEC_ID_H264;
++ const enum CodecID FFMPEGcodecId=AV_CODEC_ID_H264;
+ codec=avcodec_find_decoder(FFMPEGcodecId);
+ assert(codec);
+ //Ignore the frameRateHint as the rate is gathered from the video data
+@@ -127,7 +127,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(L
+ else if(codecId==H263)
+ {
+ //TODO: serialize access to avcodec_open
+- const enum CodecID FFMPEGcodecId=CODEC_ID_FLV1;
++ const enum CodecID FFMPEGcodecId=AV_CODEC_ID_FLV1;
+ codec=avcodec_find_decoder(FFMPEGcodecId);
+ assert(codec);
+
+@@ -138,7 +138,7 @@
