diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-07-06 11:45:28 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-07-06 11:45:28 +0000 |
| commit | bc868f956c81cca7e16b0151ebe2835dde2f4328 (patch) | |
| tree | e4fcd5983f6c31c403903eaa070c10bfa3b95afe /app-cdr | |
| parent | Initial commit. Thanks Vadim Efimov <evadim@evadim.ru> of bug #210192 for the... (diff) | |
| download | gentoo-2-bc868f956c81cca7e16b0151ebe2835dde2f4328.tar.gz gentoo-2-bc868f956c81cca7e16b0151ebe2835dde2f4328.tar.bz2 gentoo-2-bc868f956c81cca7e16b0151ebe2835dde2f4328.zip | |
Fix for newer ffmpeg. Bug 230143.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k9copy/ChangeLog | 9 | ||||
| -rw-r--r-- | app-cdr/k9copy/files/k9copy-1.2.3-new-ffmpeg.patch | 24 | ||||
| -rw-r--r-- | app-cdr/k9copy/k9copy-1.2.3-r2.ebuild (renamed from app-cdr/k9copy/k9copy-1.2.3-r1.ebuild) | 9 |
3 files changed, 37 insertions, 5 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/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 |