fix build with ffmpeg2, bug #515160. patch grabbed from k9copy ebuild

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 35 insertions, 22 deletions

diff --git a/app-cdr/backlite/ChangeLog b/app-cdr/backlite/ChangeLog
index afcae1d57bef..60fd0742e202 100644
--- a/app-cdr/backlite/ChangeLog
+++ b/app-cdr/backlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/backlite
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/ChangeLog,v 1.42 2014/12/31 12:45:26 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/ChangeLog,v 1.43 2015/02/06 10:15:21 aballier Exp $
+
+  06 Feb 2015; Alexis Ballier <aballier@gentoo.org> backlite-1.0.3-r1.ebuild,
+  +files/backlite-1.0.3-ffmpeg2.patch:
+  fix build with ffmpeg2, bug #515160. patch grabbed from k9copy ebuild
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org>
   backlite-1.0.3-r1.ebuild:
diff --git a/app-cdr/backlite/Manifest b/app-cdr/backlite/Manifest
index 05ddd0914c67..a9818bfc49a0 100644
--- a/app-cdr/backlite/Manifest
+++ b/app-cdr/backlite/Manifest
@@ -2,26 +2,16 @@
 Hash: SHA256
 
 AUX backlite-1.0.3-ffmpeg-0.11.patch 23775 SHA256 a1f37a12ab5a4cc14517f3db18b5ae64a9da4e5bf56a564392778f679a1cd676 SHA512 0da3063316df2e9c87ec5c41fffb6e8828f99ed37af27bd4dbae7b9b1cf3cf9a36bbf256924afbc817e7e7da6eac8c135bb8f8068071838b64cf4bf645598710 WHIRLPOOL 0c2bddeb37a460ccbdcc86ddbeb46122cb219a882e8b60a50faf2aec91219c15289674adf5224e18a8558fb0b1eeccba1edff450e20b223e3b27599d327b9db6
+AUX backlite-1.0.3-ffmpeg2.patch 701 SHA256 34e83f36f02e6c2367639a83b893e5a29679180c4c085c1cfb806d290665699b SHA512 6dd4cee3b58cf20ae7c31604f3144148d7b82be9244f304891d42b41b4d5622f76e4c88da0fa0efcb0990fcdde0aea336e99f7b61d3d094a9fa60d142667190a WHIRLPOOL 3fb8aedfc970b9d365599dfab8a9ab96055880ac5f6615c808cadc88cd9d5131a5a8ce65f80c34289ca70a0ccfc7e212b220d4169a778bc99fbbfd1b1e680f86
 AUX backlite-1.0.3-includepaths.patch 2556 SHA256 b2fb92758a9ed84cdd6d0e2cba1159d38a1a8b5651a9d7e309752cc9cfc8b519 SHA512 5b74f39d0dff9ec1a648de42ef825e64a3e71e2be5f884950db4ba4670e97adff828147c241bbbbb9111663db9c5e3f5833041f752d3effb2c1f0a61e4bd2c97 WHIRLPOOL 80d6c3fa619f802db7895d8af515cd9b8b3094e4c030fba604de4549b23ae893be79ca9cfd9df44d8e9439e050e6e9f23cd6bcf019772d70cce17159a8d7ff90
 DIST backlite-1.0.3.tar.gz 1597117 SHA256 f181667b585a26e7b44c2cd89e46ed00e4b0363542f2cfeb9ae2378d1718e5ca SHA512 6deb5cf33594da26a4ba1a4a01999feda10e8225b82c141df06eb958b559e5162be18b54a285ef34f4cf06af88dc635a4b2a27845a51a7fdecc96b94ac27f4c1 WHIRLPOOL b061a308443e226be9a1f479247e11baf0d14876b03bc87f8c7d39b0b42cc220725635f5433519f134c4e983401b4253a2ab66d5a952692b0499ef6082b3f5e7
-EBUILD backlite-1.0.3-r1.ebuild 1176 SHA256 df1060fbb075933ae6f260ac379a73258372e87b5aeced8d73860b316bb27a23 SHA512 c481e62457eb4c607a08905235543910a155143277dbdcfe08a041cf0675943427456c07ba1e15a51b92c1ffa9fc1be04fc81ee39a2fc55eb9ee83f887582fbe WHIRLPOOL d821cd4322290904e50d0817e02e789efdf8e06665bc2d27e8e76591aed19bbdac01b5f2b60fb7c87f131e36a08d3bc1ee5f67e8059967adf69a119abb777eea
-MISC ChangeLog 5549 SHA256 7dc44c094ef9bb5d4b2440685fd3c5495e4534dc26faa86dda39a1242c9b0b7e SHA512 b61e2ea5d046effbe59f58631dc0bb8a03a220704fc41f5221ded662fb4be6294747b8b1e57f2f32dd79ee4144ff99771d967c1857d371686e5bf8b9a8b87a40 WHIRLPOOL 03806cd225ee7b2ecae410cf140c4bb7bf0983d5ba6b6a531369a142883c43fcb1427be6c72a574c7c37e4e691b5464d671a1bc9b1bdbc93b3bbb4cf182f2e80
+EBUILD backlite-1.0.3-r1.ebuild 1211 SHA256 d1d3c9090829546d5de111a4a2cfffba6cd2e840bd39fd585500bd0975a3ed8a SHA512 42a3fac7f03f0acff082ce324790832dedf8ce6c87ea834e9e08cf3a93a51a2f5defdcd1446ffe472912436e1a2e4c8e133cd0e50f250fe658b0a6b816a3f59b WHIRLPOOL 6b3f94aa23dc551c0342a68109c77d44d7c4ab11a99257738912d8d311f6723d7aec66075c3ce8e64b91277c996a8f3b30e925d34674239e9c1bfbca25ce8044
+MISC ChangeLog 5737 SHA256 bb522ea8cb6a51235147e747034eacda0941325efab8d9b2e8e5932db7258b69 SHA512 d48ecb9b30cb7a802bf51b30ca1736458524123e6df72bac25864e82a715f2ed672c40f7c0fdfec3a9c1324bed973f9d862ba98c998cd96c9b2844355c06c062 WHIRLPOOL 55d8121189cbf0c7009a70270bb88a912b7aee3f691f774a0a223825258c93a8610151292a2bffa23bc080a300454fe7de71e0ca7598706583add67dd4fb57f2
 MISC metadata.xml 345 SHA256 b1fe48e308ef42b24d4932d637ea5c6b52f2716772b42c59907ecb913c3ce0a8 SHA512 d1e522603852d84368f03e5e49eadee4e880dd46fbda578f3fdc4fb8326fe31d114c87b7c920014c91f61b75923eb968d0627e4110e7c6ded04a0ccebd451fe8 WHIRLPOOL 6bfd875c15e6f039949dccf0b20f8cdef64b21c5571a34fd7db92cbea453c6e542594a12ba1c06a35d4fa1bc9824760fd7ddc43deed8c01bf6577e8f07f4816c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUo+/4RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7P+lEACjcxgM/3rappU7J3ETDw1VhDewCrlDE1ef+h7ChB88fiS4Xrxa247qF4Fq
-jukTBzHRHkWGjOGRAacXG7NsHq1s+EgHTyL3rCGuDZvfqfzCVxP8dR+fvDFbmKMR
-pUpZTeBFIq8Kckk4zjDO4I96xHlAssDlDfRf14LNpwOGGpNxmS4p8TLq8C+h2hcl
-SxWSxHGC58HcDyYgIhhheGJBY7ZSufKpkYJNUNwcZsIBxYlannZicLiI+foGba1L
-aNpsEeyMrMVoFuRBhydGBgJJp3mml/9HXcs4AEQ/xxk7elXHx2H7kGKogge5yqQa
-FZFHg+BPotcQRjMqO+fBLyuho9M2Aa5aTLxZbxelSdB8KzBLKve7nIb4dr3fLb97
-i56IcjpTTD1ZqBPlMzhlp4hoVkM+zGTuSW5DyWB3QJ7uaTc76+O6CB3fGeyKnIUj
-GVqAYqHbc8MeP2d3mnH8cNHnSQWBXY3MyujsUnBP/LJgYNq/y/NaQaGmOXcw9e/7
-5YDJXQXP2kfpT30pN4ffRbluCUSRZ/jkxyKfPgOI6zKzb0SYAPqsXxDV/EsCQXjR
-29cMXCsPXzfwaRiokLHOHgZ3+sAySer1QMdPMVeBMQ4HGD8cC0auQYm/5yLX6HUc
-XhakG0Z+5AOqUj3ibwVuM/knULofoIqCiZiyYMqHDn/utF3dyA==
-=23hx
+iEYEAREIAAYFAlTUlDoACgkQvFcC4BYPU0o9ugCgy46Is//GdfLSjtjWP2wBASAD
+du8AnjMdW9LOTKuQprWkwW4xvK1EAhUj
+=EbS6
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/backlite/backlite-1.0.3-r1.ebuild b/app-cdr/backlite/backlite-1.0.3-r1.ebuild
index 495e701b019b..33430863996b 100644
--- a/app-cdr/backlite/backlite-1.0.3-r1.ebuild
+++ b/app-cdr/backlite/backlite-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.3-r1.ebuild,v 1.10 2014/12/31 12:45:26 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.3-r1.ebuild,v 1.11 2015/02/06 10:15:21 aballier Exp $
 
 EAPI=5
 
@@ -34,7 +34,8 @@ src_prepare() {
 	sed -i -e '/^MimeTypes=.*/d' \
 		-e '/^Encoding=.*/d' *.desktop || die
 	epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch" \
-		"${FILESDIR}/${P}-includepaths.patch"
+		"${FILESDIR}/${P}-includepaths.patch" \
+		"${FILESDIR}/${P}-ffmpeg2.patch"
 }
 
 src_configure() {
diff --git a/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch
new file mode 100644
index 000000000000..63739350460b
--- /dev/null
+++ b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=515160
+
+Index: backlite-1.0.3/src/import/k9avidecode.h
+===================================================================
+--- backlite-1.0.3.orig/src/import/k9avidecode.h
++++ backlite-1.0.3/src/import/k9avidecode.h
+@@ -40,7 +40,11 @@ typedef int (*avformat_find_stream_info_
+ #else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
+ #endif
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#else
++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
++#endif
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
+ typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
+ #else