Fix for newer ffmpeg. Bug 230143.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 40 insertions, 7 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index beb3675c7ba6..52212924194d 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/k9copy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.36 2008/06/30 02:50:46 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.37 2008/07/06 11:45:27 loki_val Exp $
+
+*k9copy-1.2.3-r2 (06 Jul 2008)
+
+  06 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/k9copy-1.2.3-new-ffmpeg.patch, -k9copy-1.2.3-r1.ebuild,
+  +k9copy-1.2.3-r2.ebuild:
+  Fix for newer ffmpeg. Bug 230143.
 
 *k9copy-1.2.3-r1 (30 Jun 2008)
 
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
index 136ade743619..d18c8e66cc60 100644
--- a/app-cdr/k9copy/Manifest
+++ b/app-cdr/k9copy/Manifest
@@ -1,6 +1,7 @@
 AUX k9copy-1.2.3-desktop-entry-2.diff 689 RMD160 90594426be3e2513d7e96762eb9bec173935d2b9 SHA1 df11b6287b3fa677c5de5ce61546c23d4a92b162 SHA256 8ccde406a59469196c6623bb02d51f867288ce2dd769518acc1acb6732859bfd
 AUX k9copy-1.2.3-gcc43.patch 769 RMD160 2711f9a8f988ab4906715794319b134055519bf7 SHA1 122d4a9c1a0c8163b76351a7551a87639247f1c1 SHA256 f098660456973036229b2f9932704161f2aae028208283c7701d5e7b6952d49d
+AUX k9copy-1.2.3-new-ffmpeg.patch 721 RMD160 5b4613fac2037ef016adc8e5695f448f2bacad1f SHA1 17dc97c89341897841bb5bb03cafe667ac9fe5aa SHA256 74532727580a339a0aff2f6286e755aac673841efa9f264f9abff0a74c6fc406
 DIST k9copy-1.2.3.tar.gz 2810070 RMD160 2c1bf0cf09bf45d412c8a9e061c86ebec11ca34c SHA1 b69e5e9571db2f02f6f50698380556c5619bb62a SHA256 22d9359217a72842166f8db80f5fc6644ef9ebfc036c956356c92d2d68dec9bf
-EBUILD k9copy-1.2.3-r1.ebuild 1142 RMD160 9ea992196855eff380f95b8263c022bea5ef4cad SHA1 9c2bba8fe5c47985f3fb9bba0e68032f8c292d82 SHA256 62301fa3ca9eded5f05526a90eda6cc0e1c27ec8b4235c5c8e1ddfeda50b0d69
-MISC ChangeLog 6262 RMD160 59a0275721e68932a43c3c541282c2f9218b5a2e SHA1 43ab4b66eaa8c769a1b0426bdb6025831dee517a SHA256 4b6c0e285d6360b9b5a9ba0a19b26dc6d7d628eb295b98727fbddc852a59e823
+EBUILD k9copy-1.2.3-r2.ebuild 1183 RMD160 6ff07a9a7b3f8335a9faf77319488d5a3d2224d9 SHA1 1585ae5ec2d158a5d325591c6e973f59acfab81c SHA256 f0d9f014bec90b3c7439eeacf7609a936ae20becb8e29eeb4e9cae7a582bc877
+MISC ChangeLog 6479 RMD160 6aaa81d4836ccea6b071a098561696c85784872d SHA1 2d80035b351efa26bef2298c2e031a821742bd01 SHA256 cb68d346c433b02967beaf4b8ae5a6a684452954a74787d5e6132c8fb22d1351
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
diff --git a/app-cdr/k9copy/files/k9copy-1.2.3-new-ffmpeg.patch b/app-cdr/k9copy/files/k9copy-1.2.3-new-ffmpeg.patch
new file mode 100644
index 000000000000..85289ec6e162
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-1.2.3-new-ffmpeg.patch
@@ -0,0 +1,24 @@
+diff -ru k9author.old/k9avidecode.cpp k9author/k9avidecode.cpp
+--- k9author.old/k9avidecode.cpp	2007-09-29 21:13:18.000000000 +0200
++++ k9author/k9avidecode.cpp	2008-07-01 04:28:43.000000000 +0200
+@@ -10,7 +10,7 @@
+ //
+ //
+ #include "k9avidecode.h"
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #include <qimage.h>
+ #include <dlfcn.h>
+ #include <klocale.h>
+diff -ru k9author.old/k9avidecode.h k9author/k9avidecode.h
+--- k9author.old/k9avidecode.h	2007-09-29 21:12:56.000000000 +0200
++++ k9author/k9avidecode.h	2008-07-01 04:24:55.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ #include "k9common.h"
+ #include <qobject.h>
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ #include <qimage.h>
+ 
+ /**
diff --git a/app-cdr/k9copy/k9copy-1.2.3-r1.ebuild b/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild
index 51ddbe38b60a..2b37385d8d8d 100644
--- a/app-cdr/k9copy/k9copy-1.2.3-r1.ebuild
+++ b/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3-r1.ebuild,v 1.1 2008/06/30 02:50:46 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3-r2.ebuild,v 1.1 2008/07/06 11:45:27 loki_val Exp $
 
 EAPI="1"
 
@@ -22,14 +22,15 @@ DEPEND="media-libs/libdvdread
 	>=app-cdr/k3b-0.12.10
 	dev-libs/dbus-qt3-old
 	sys-apps/hal
-	>=media-video/ffmpeg-0.4.9_p20070616
+	>=media-video/ffmpeg-0.4.9_p20080326
 	media-video/mplayer"
 RDEPEND="${DEPEND}
 	media-video/dvdauthor"
 need-kde 3.5
 
-PATCHES=( "${FILESDIR}"/${P}-desktop-entry-2.diff
-		"${FILESDIR}"/${P}-gcc43.patch )
+PATCHES=(	"${FILESDIR}"/${P}-desktop-entry-2.diff
+		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-new-ffmpeg.patch	)
 
 pkg_setup() {
 	kde_pkg_setup