summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-02-12 22:14:57 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-02-12 22:24:50 +0100
commit81e8a77f5fb397d63647ba2ae29c5350117f980e (patch)
treef568d70c5517edf9dba7f20fa6dd85056c88f9a2 /app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch
parentnet-libs/gnutls: no longer need cxx hack (diff)
downloadgentoo-81e8a77f5fb397d63647ba2ae29c5350117f980e.tar.gz
gentoo-81e8a77f5fb397d63647ba2ae29c5350117f980e.tar.bz2
gentoo-81e8a77f5fb397d63647ba2ae29c5350117f980e.zip
app-cdr/k3b: Fix DVD-ripping, flac, build w/ ffmpeg-3 and gcc-7
Also update DESCRIPTION, HOMEPAGE, pkg_postinst info Gentoo-bug: 578894 Package-Manager: portage-2.3.3
Diffstat (limited to 'app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch')
-rw-r--r--app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch b/app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch
new file mode 100644
index 00000000000..5a06503304a
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.3-ffmpeg-3.patch
@@ -0,0 +1,27 @@
+From 5b9b3537b658ad342d688fa4f210113a3d066d2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
+Date: Sat, 14 Feb 2015 15:31:07 +0100
+Subject: Fixed compilation with newer ffmpeg/libav.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 64 ++++++++++++++++++++++++-----
+ 1 file changed, 54 insertions(+), 10 deletions(-)
+
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.old 2017-02-12 21:09:02.258453125 +0100
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2017-02-12 21:12:44.799077359 +0100
+@@ -378,7 +378,11 @@
+ #endif
+
+ if( d->packetSize <= 0 || len < 0 )
++#if LIBAVCODEC_VERSION_MAJOR >= 56
++ ::av_packet_unref( &d->packet );
++#else
+ ::av_free_packet( &d->packet );
++#endif
+ if( len < 0 ) {
+ kDebug() << "(K3bFFMpegFile) decoding failed for " << m_filename;
+ return -1;