fix build with ffmpeg/libav latest git

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 36 insertions, 4 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index 78cdd4f0f4cd..18d0e802c838 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/k9copy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.64 2011/04/27 23:56:47 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.65 2011/04/28 21:09:40 aballier Exp $
+
+  28 Apr 2011; Alexis Ballier <aballier@gentoo.org> k9copy-2.3.7.ebuild,
+  +files/k9copy-2.3.7-ffmpeg.patch:
+  fix build with ffmpeg/libav latest git
 
 *k9copy-2.3.7 (27 Apr 2011)
 
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index 546ca7728154..658b06f8361b 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX k9copy-2.3.6-return.patch 205 RMD160 9a734c1bc0ee9b4a69d0a1c84c0e338d4c473b52 SHA1 efc9d53f6cc67543a007e9aa78d85e880fb0b216 SHA256 4563523438fb290f37c569411e2d9cb8838280996cc9df5214701e7658598903
+AUX k9copy-2.3.7-ffmpeg.patch 664 RMD160 fad7bd83cf932edb13ce2a5b332dda90d8943c64 SHA1 d9be05d7a362ad95fcf584ce22611e18d06a136d SHA256 76c0e7f4e29ef41ecc7948f1a81eaabd41f00fcc520401d9943c24e70a301d58
 DIST k9copy-2.3.6-Source.tar.gz 1562476 RMD160 c61a2f3802b50fd99058f448f1687d7bbd543267 SHA1 e0399b42a8dc8b9ea5b0bb332a1e2d7bfa18e104 SHA256 d2ebbb6ee72b8e6b3e7daf62746442e8e3a2edb54603333a418d7da753045436
 DIST k9copy-2.3.7-Source.tar.gz 1571305 RMD160 c3b57c77bdb32365f9f694101f1eaf59059d22d9 SHA1 8b0aa8f1e63e4a396746f88ca9c763808895b7d0 SHA256 516f4108a189a050f0aadf5b617d151b6b0e52c18823941f2b895073c104e74e
 EBUILD k9copy-2.3.6.ebuild 1181 RMD160 121150dd5b6e800126cce01e37b522a55d7be7cf SHA1 c98619f26770079b03909778ce1cc83212a61930 SHA256 d9f3b33efa7b5864c8634c447a3c59dc49270ed7fcbc09d154ded8358bdd5986
-EBUILD k9copy-2.3.7.ebuild 1138 RMD160 d582cbbff96a7af15d3ce77130ead7e5fede3724 SHA1 14a71b07dff1f9896a1aa1027886a9daf5c84a88 SHA256 35840f9e8d9e5b9d56b880b2feb41d89690d2fe1328eb177dead2a891331a501
-MISC ChangeLog 10332 RMD160 3e65146fe90a66737165cb5f9f91ef497f336e6d SHA1 fa84e00caafb06c24dd151e537bd750d0ec3abee SHA256 d59d19735e24c5a54b46a9b3a5bba4c9a730fc0136962dce229e635770207ddc
+EBUILD k9copy-2.3.7.ebuild 1182 RMD160 8812870f4d9a775ad8fd8a55e9047464ae14b5bc SHA1 c0c16e3ea33b8a014fd15c5a5fc83aa78b83de20 SHA256 5d2e66db5d92f5b53e450cfd82d29842e6ef0cd7e2826924d151bbf7318b8450
+MISC ChangeLog 10482 RMD160 fa599779e2256345bf7f5d9255f4f53e54785a26 SHA1 48382de1bb6f085bfd8765a4696955a4b72cbffb SHA256 1c9ffeea7c29c185eaad49ce737c681c40abc8cb14d311caa7a58dc1921127c6
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2515oACgkQvFcC4BYPU0pmBQCghEv4T/E+6zk9ZdChRfS3kiwe
+7AAAnAzwjZulQH7AE8VrI6mwuSiHyj5O
+=Ld8X
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch b/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch
new file mode 100644
index 000000000000..c92582a8dd55
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch
@@ -0,0 +1,15 @@
+Fix build with ffmpeg/libav trunk after the big bump.
+
+Index: k9copy-2.3.7-Source/src/import/k9avidecode.cpp
+===================================================================
+--- k9copy-2.3.7-Source.orig/src/import/k9avidecode.cpp
++++ k9copy-2.3.7-Source/src/import/k9avidecode.cpp
+@@ -145,7 +145,7 @@ bool k9AviDecode::open(const QString & _
+ // Find the first video stream
+     m_videoStream=-1;
+     for (i=0; i<m_FormatCtx->nb_streams; i++)
+-        if (m_FormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) {
++        if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
+             m_videoStream=i;
+             break;
+         }
diff --git a/app-cdr/k9copy/k9copy-2.3.7.ebuild b/app-cdr/k9copy/k9copy-2.3.7.ebuild
index 3b341ca19683..bd2937fe555c 100644
--- a/app-cdr/k9copy/k9copy-2.3.7.ebuild
+++ b/app-cdr/k9copy/k9copy-2.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.7.ebuild,v 1.1 2011/04/27 23:56:47 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-2.3.7.ebuild,v 1.2 2011/04/28 21:09:40 aballier Exp $
 
 EAPI=3
 
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( README )
 
+PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" )
+
 pkg_postinst() {
 	kde4-base_pkg_postinst
 	has_version '>=app-cdr/k3b-1.50' || elog "If you want K3b burning support in ${P}, please install app-cdr/k3b separately."