Control: tags 803820 + pending Dear maintainer,
I've prepared an NMU for goldendict (versioned as 1.5.0~git20150923-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru goldendict-1.5.0~git20150923/debian/changelog goldendict-1.5.0~git20150923/debian/changelog
--- goldendict-1.5.0~git20150923/debian/changelog 2015-09-23 10:54:24.000000000 +0200
+++ goldendict-1.5.0~git20150923/debian/changelog 2016-03-06 22:23:32.000000000 +0100
@@ -1,3 +1,12 @@
+goldendict (1.5.0~git20150923-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Andreas Cadhalpun ]
+ * Fix FTBFS against ffmpeg 3.0. (Closes: #803820)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sun, 06 Mar 2016 22:23:31 +0100
+
goldendict (1.5.0~git20150923-1) unstable; urgency=medium
* New snapshot.
diff -Nru goldendict-1.5.0~git20150923/debian/patches/ffmpeg_2.9.patch goldendict-1.5.0~git20150923/debian/patches/ffmpeg_2.9.patch
--- goldendict-1.5.0~git20150923/debian/patches/ffmpeg_2.9.patch 1970-01-01 01:00:00.000000000 +0100
+++ goldendict-1.5.0~git20150923/debian/patches/ffmpeg_2.9.patch 2016-03-06 22:23:27.000000000 +0100
@@ -0,0 +1,24 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2015-11-02>
+
+--- goldendict-1.5.0~git20150923.orig/ffmpegaudio.cc
++++ goldendict-1.5.0~git20150923/ffmpegaudio.cc
+@@ -334,7 +334,7 @@ void DecoderContext::closeOutputDevice()
+
+ bool DecoderContext::play( QString & errorString )
+ {
+- AVFrame * frame = avcodec_alloc_frame();
++ AVFrame * frame = av_frame_alloc();
+ if ( !frame )
+ {
+ errorString = QObject::tr( "avcodec_alloc_frame() failed." );
+@@ -383,7 +383,7 @@ bool DecoderContext::play( QString & err
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+ av_free( frame );
+ #else
+- avcodec_free_frame( &frame );
++ av_frame_free( &frame );
+ #endif
+
+ return true;
diff -Nru goldendict-1.5.0~git20150923/debian/patches/series goldendict-1.5.0~git20150923/debian/patches/series
--- goldendict-1.5.0~git20150923/debian/patches/series 2015-09-23 10:22:52.000000000 +0200
+++ goldendict-1.5.0~git20150923/debian/patches/series 2016-03-06 22:23:27.000000000 +0100
@@ -1,2 +1,3 @@
disable-autostart-control
wordnet-dict-paths
+ffmpeg_2.9.patch
signature.asc
Description: PGP signature
