Add patch to build with latest ffmpeg/libav just like for k9copy.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 32 insertions, 11 deletions

diff --git a/app-cdr/backlite/ChangeLog b/app-cdr/backlite/ChangeLog
index 9bdc06a3c8e7..2c2a6cb0c4c6 100644
--- a/app-cdr/backlite/ChangeLog
+++ b/app-cdr/backlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/backlite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/ChangeLog,v 1.22 2011/07/26 17:09:18 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/ChangeLog,v 1.23 2011/08/07 13:26:29 billie Exp $
+
+  07 Aug 2011; Daniel Pielmeier <billie@gentoo.org> backlite-1.0.2.ebuild,
+  +files/backlite-1.0.2-ffmpeg.patch:
+  Add patch to build with latest ffmpeg/libav just like for k9copy.
 
   26 Jul 2011; Daniel Pielmeier <billie@gentoo.org> -backlite-1.0.1.ebuild:
   Remove old.
diff --git a/app-cdr/backlite/Manifest b/app-cdr/backlite/Manifest
index 05ae94d1692a..bd91724aa5b2 100644
--- a/app-cdr/backlite/Manifest
+++ b/app-cdr/backlite/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX backlite-1.0.2-ffmpeg.patch 442 RMD160 5dfc0fc24748338609c342bfa48df0cfff3982de SHA1 d944ac1ae8cf2dd59b4337626c1fa3ce4b2fd7aa SHA256 877f7402d4e40a411b9995cc466e83cd3e0fcb1e747430fcd2151c81e5dbb38c
 DIST backlite-1.0.2.tar.gz 1454009 RMD160 a7365f16675cf89e8fe2eba40b68343551825466 SHA1 8287c67dfefb99c4f6cdad1d56fe3f52ecdb3428 SHA256 1970454328e22f60f758531b88dd09df02dacbc6c48995bd274e14b1363bd3e9
-EBUILD backlite-1.0.2.ebuild 985 RMD160 4b3e91d3b9da5561e8670e17ce35a798e9522076 SHA1 884e1fe254b1ddac8895bda23808cfbaa063bfd9 SHA256 aaf5cf8a02dda9a04f56f8723aa0b603b437613e53d316ad0eecc90036532442
-MISC ChangeLog 3096 RMD160 f30f00c24eb26f9b7d4bcd7512025002ee938d09 SHA1 df074440fdb6689bf6bbf306e4b0d031618f6ca5 SHA256 6a46d1400f99a4335cc75cb3b1f831218efe055c05918c75bb3d0980926c6be6
+EBUILD backlite-1.0.2.ebuild 1044 RMD160 1da20b09a82495659409cc876d81a51831852d16 SHA1 b8f1ec15be0e99e73cb09f1c1a16b08d977d935c SHA256 8588f44b964a76c8b9127eea69b22075f4fb3f1483c3728e2ab8dea74abdc0cc
+MISC ChangeLog 3278 RMD160 f077caaa005b21f963138cedc22a42f81ad57db2 SHA1 54e03d8e868c782d89a6b78d6b2ebcdd76589a40 SHA256 1b67012684ebb697f34f35952e92f4742ed9e1fe96586c0ea1d18a3f539001e8
 MISC metadata.xml 367 RMD160 7c8c3fe78a28ea51287da79f2a7a2101da659144 SHA1 1aa496a49f65b322c211f385e7c10a6493726e1e SHA256 e60bdab3131a216dde9209c3b2d574233a5479b894535511632e9b70fc8a699d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4u9NoACgkQlcuUeyFa0U17iQCcCecO8lAPpkarRECF0MlECDS8
-XdsAoKAR+01Sf+AwHkWzmt4QSwvcx3Yk
-=gCP+
+iEYEAREIAAYFAk4+kpoACgkQlcuUeyFa0U0lYQCfQsyCcOsShfx2WNQHS9w83QJg
+Y4cAniaWgI4R7oc+Dj19xZsHDirmjJ63
+=4pzA
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/backlite/backlite-1.0.2.ebuild b/app-cdr/backlite/backlite-1.0.2.ebuild
index bd47fba13211..8c921f572ca3 100644
--- a/app-cdr/backlite/backlite-1.0.2.ebuild
+++ b/app-cdr/backlite/backlite-1.0.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.2.ebuild,v 1.3 2011/06/19 13:44:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.2.ebuild,v 1.4 2011/08/07 13:26:29 billie Exp $
 
-EAPI=2
+EAPI=4
 
-inherit qt4-r2
+inherit eutils qt4-r2
 
 DESCRIPTION="backlite is a pure QT4 version of k9copy"
 HOMEPAGE="http://k9copy.sourceforge.net/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/k9copy/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="mplayer"
 
 # According to the author of backlite/k9copy libdvdread and libdvdnav are
@@ -29,10 +29,15 @@ RDEPEND="${DEPEND}
 	media-video/dvdauthor
 	mplayer? ( media-video/mplayer )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.0.2-ffmpeg.patch"
+}
+
 src_configure() {
 	eqmake4 backlite.pro PREFIX="${D}"/usr
 }
 
 src_install() {
-	emake install || die "emake install failed"
+	unset INSTALL_ROOT
+	default
 }
diff --git a/app-cdr/backlite/files/backlite-1.0.2-ffmpeg.patch b/app-cdr/backlite/files/backlite-1.0.2-ffmpeg.patch
new file mode 100644
index 000000000000..c7a772525ba2
--- /dev/null
+++ b/app-cdr/backlite/files/backlite-1.0.2-ffmpeg.patch
@@ -0,0 +1,11 @@
+--- src/import/k9avidecode.cpp
++++ 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;
+         }