summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/k9copy/ChangeLog6
-rw-r--r--app-cdr/k9copy/files/k9copy-2.3.7-ffmpeg.patch15
-rw-r--r--app-cdr/k9copy/k9copy-2.3.7.ebuild4
3 files changed, 23 insertions, 2 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/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."