tags 739439 + patch tags 739439 + pending thanks Dear maintainer,
I've prepared an NMU for opal (versioned as 3.12.8~dfsg-1.1) and intend to upload it to experimental soon. I'm not uploading because I thinking about how to workaround #728452. Please share any concerns that you have about that patch with me. Regards.
diff -Nru opal-3.12.8~dfsg/debian/changelog opal-3.12.8~dfsg/debian/changelog --- opal-3.12.8~dfsg/debian/changelog 2013-12-22 18:41:39.000000000 -0500 +++ opal-3.12.8~dfsg/debian/changelog 2014-05-03 11:59:07.000000000 -0400 @@ -1,3 +1,10 @@ +opal (3.12.8~dfsg-1.1) experimental; urgency=low + + * Non-maintainer upload. + * Add libav10.patch and compile against Libav10 (Closes: #739439) + + -- Reinhard Tartler <siret...@tauware.de> Fri, 02 May 2014 22:53:45 -0400 + opal (3.12.8~dfsg-1) experimental; urgency=low * New upstream release diff -Nru opal-3.12.8~dfsg/debian/control opal-3.12.8~dfsg/debian/control --- opal-3.12.8~dfsg/debian/control 2013-12-22 18:41:39.000000000 -0500 +++ opal-3.12.8~dfsg/debian/control 2014-05-02 23:47:02.000000000 -0400 @@ -4,7 +4,7 @@ Maintainer: Debian VoIP Team <pkg-voip-maintain...@lists.alioth.debian.org> Uploaders: Mark Purcell <m...@debian.org>, Eugen Dedu <eugen.d...@pu-pm.univ-fcomte.fr>, Kilian Krause <kil...@debian.org>, Tzafrir Cohen <tzaf...@debian.org> Build-Depends: debhelper (>= 8), doxygen, autotools-dev, pkg-config, - libpt-dev (>= 2.12.8~), libavcodec-dev, libx264-dev, + libpt-dev (>= 2.12.8~), libavcodec-dev (>= 6:10~), libx264-dev, libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libsrtp-dev [alpha amd64 armel hppa i386 mips mipsel powerpc s390], libcapi20-dev [linux-any], libspandsp-dev (>= 0.0.6~pre17) diff -Nru opal-3.12.8~dfsg/debian/patches/libav10.patch opal-3.12.8~dfsg/debian/patches/libav10.patch --- opal-3.12.8~dfsg/debian/patches/libav10.patch 1969-12-31 19:00:00.000000000 -0500 +++ opal-3.12.8~dfsg/debian/patches/libav10.patch 2014-05-03 11:59:17.000000000 -0400 @@ -0,0 +1,106 @@ +Description: Fix compilation against libav10 +Author: Reinhard Tartler <siret...@tauware.de> +Bug-Debian: http://bugs.debian.org/739439 + +--- opal-3.12.8~dfsg.orig/plugins/video/H.263-1998/h263-1998.cxx ++++ opal-3.12.8~dfsg/plugins/video/H.263-1998/h263-1998.cxx +@@ -555,7 +555,7 @@ class H263_RFC2190_Encoder : public H263 + + bool Construct() + { +- if (!InitEncoder(CODEC_ID_H263)) ++ if (!InitEncoder(AV_CODEC_ID_H263)) + return false; + + #if LIBAVCODEC_RTP_MODE +@@ -598,7 +598,7 @@ class H263_RFC2429_Encoder : public H263 + + bool Construct() + { +- return InitEncoder(CODEC_ID_H263P); ++ return InitEncoder(AV_CODEC_ID_H263P); + } + }; + +@@ -621,7 +621,7 @@ class H263_Base_Decoder : public PluginV + bool Construct() + { + m_fullFrame->Reset(); +- return InitDecoder(CODEC_ID_H263) && OpenCodec(); ++ return InitDecoder(AV_CODEC_ID_H263) && OpenCodec(); + } + + +--- opal-3.12.8~dfsg.orig/plugins/video/H.264/h264-x264.cxx ++++ opal-3.12.8~dfsg/plugins/video/H.264/h264-x264.cxx +@@ -763,12 +763,12 @@ class H264_Decoder : public PluginVideoD + + virtual bool Construct() + { +- if (!InitDecoder(CODEC_ID_H264)) ++ if (!InitDecoder(AV_CODEC_ID_H264)) + return false; + +- m_context->idct_algo = FF_IDCT_H264; ++ m_context->idct_algo = FF_IDCT_AUTO; + m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; +- m_context->flags2 = CODEC_FLAG2_SKIP_RD | ++ m_context->flags2 = + #ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE + CODEC_FLAG2_DROP_FRAME_TIMECODE | + #endif + +--- opal-3.12.8~dfsg.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ++++ opal-3.12.8~dfsg/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +@@ -354,7 +354,7 @@ class MPEG4_Encoder : public PluginVideo + + virtual bool Construct() + { +- return InitEncoder(CODEC_ID_MPEG4); ++ return InitEncoder(AV_CODEC_ID_MPEG4); + } + + +@@ -455,7 +455,7 @@ class MPEG4_Decoder : public PluginVideo + + bool Construct() + { +- if (!InitDecoder(CODEC_ID_MPEG4)) ++ if (!InitDecoder(AV_CODEC_ID_MPEG4)) + return false; + + m_context->flags |= CODEC_FLAG_4MV; + +--- opal-3.12.8~dfsg.orig/plugins/video/common/ffmpeg.cxx ++++ opal-3.12.8~dfsg/plugins/video/common/ffmpeg.cxx +@@ -179,7 +179,7 @@ static void StaticRTPCallBack(AVCodecCon + static_cast<FFMPEGCodec *>(ctx->opaque)->GetEncodedFrame()->RTPCallBack(data, size, numMB); + } + +-bool FFMPEGCodec::InitEncoder(CodecID codecId) ++bool FFMPEGCodec::InitEncoder(AVCodecID codecId) + { + PTRACE(5, m_prefix, "Opening encoder"); + +@@ -214,7 +214,7 @@ bool FFMPEGCodec::InitEncoder(CodecID co + } + + +-bool FFMPEGCodec::InitDecoder(CodecID codecId) ++bool FFMPEGCodec::InitDecoder(AVCodecID codecId) + { + if ((m_codec = avcodec_find_decoder(codecId)) == NULL) { + PTRACE(1, m_prefix, "Codec not found for decoder"); +--- opal-3.12.8~dfsg.orig/plugins/video/common/ffmpeg.h ++++ opal-3.12.8~dfsg/plugins/video/common/ffmpeg.h +@@ -120,8 +120,8 @@ class FFMPEGCodec + FFMPEGCodec(const char * prefix, EncodedFrame * fullFrame); + ~FFMPEGCodec(); + +- virtual bool InitEncoder(CodecID codecId); +- virtual bool InitDecoder(CodecID codecId); ++ virtual bool InitEncoder(AVCodecID codecId); ++ virtual bool InitDecoder(AVCodecID codecId); + + bool SetResolution(unsigned width, unsigned height); + void SetEncoderOptions( diff -Nru opal-3.12.8~dfsg/debian/patches/series opal-3.12.8~dfsg/debian/patches/series --- opal-3.12.8~dfsg/debian/patches/series 2013-08-30 20:05:32.000000000 -0400 +++ opal-3.12.8~dfsg/debian/patches/series 2014-05-02 23:47:09.000000000 -0400 @@ -1,2 +1,3 @@ #disable-samples-ftbfs.diff #plugins_clean_target.patch +libav10.patch
