summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-05-12 08:28:56 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-05-12 08:28:56 +0000
commit47398fcc29d03658b1c579d09f232e3842259726 (patch)
tree84a8476c1ca425d852328e529beaf8ff045fba2b /media-video/kdenlive
parentfix build of ruby bindings on a system without libcaca installed, by Arfrever... (diff)
downloadgentoo-2-47398fcc29d03658b1c579d09f232e3842259726.tar.gz
gentoo-2-47398fcc29d03658b1c579d09f232e3842259726.tar.bz2
gentoo-2-47398fcc29d03658b1c579d09f232e3842259726.zip
Fix automagic on libiec61883 by Olivier Huber <oli.huber@gmail.com>, bug #220095
(Portage version: 2.1.5_rc10)
Diffstat (limited to 'media-video/kdenlive')
-rw-r--r--media-video/kdenlive/ChangeLog7
-rw-r--r--media-video/kdenlive/files/kdenlive-0.5-iec61883_automagic.patch20
-rw-r--r--media-video/kdenlive/kdenlive-0.5.ebuild8
3 files changed, 31 insertions, 4 deletions
diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index 6e3a423bcc58..7e48c9e5467b 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/kdenlive
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.25 2008/05/12 07:34:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.26 2008/05/12 08:28:56 aballier Exp $
+
+ 12 May 2008; Alexis Ballier <aballier@gentoo.org>
+ +files/kdenlive-0.5-iec61883_automagic.patch, kdenlive-0.5.ebuild:
+ Fix automagic on libiec61883 by Olivier Huber <oli.huber@gmail.com>, bug
+ #220095
12 May 2008; Alexis Ballier <aballier@gentoo.org> -kdenlive-0.4.ebuild:
remove old
diff --git a/media-video/kdenlive/files/kdenlive-0.5-iec61883_automagic.patch b/media-video/kdenlive/files/kdenlive-0.5-iec61883_automagic.patch
new file mode 100644
index 000000000000..9f04707a5237
--- /dev/null
+++ b/media-video/kdenlive/files/kdenlive-0.5-iec61883_automagic.patch
@@ -0,0 +1,20 @@
+Index: kdenlive-0.5/configure.in.in
+===================================================================
+--- kdenlive-0.5.orig/configure.in.in
++++ kdenlive-0.5/configure.in.in
+@@ -59,9 +59,15 @@ AC_CHECK_HEADERS([ffmpeg/avformat.h liba
+
+ # LIBIEC61883
+
++AC_ARG_WITH([libiec61883], AS_HELP_STRING([--without-libiec61883], [Build without libiec61883 library (default: test)]))
++
++use_iec61883=no
++
++if test "x$with_libiec61883" != "xno"; then
+ PKG_CHECK_MODULES(LIBIEC61883, libiec61883 >= 1.0.0,
+ [use_iec61883=yes],
+ [use_iec61883=no])
++fi
+ AC_SUBST(LIBIEC61883_CFLAGS)
+ AC_SUBST(LIBIEC61883_LIBS)
+
diff --git a/media-video/kdenlive/kdenlive-0.5.ebuild b/media-video/kdenlive/kdenlive-0.5.ebuild
index 407f9a732c36..111c004f623d 100644
--- a/media-video/kdenlive/kdenlive-0.5.ebuild
+++ b/media-video/kdenlive/kdenlive-0.5.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/media-video/kdenlive/kdenlive-0.5.ebuild,v 1.4 2008/04/11 13:40:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.5.ebuild,v 1.5 2008/05/12 08:28:56 aballier Exp $
inherit eutils kde
@@ -11,9 +11,10 @@ SRC_URI="mirror://sourceforge/kdenlive/${P}-1.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
+IUSE="ieee1394"
RDEPEND="media-video/ffmpeg
+ ieee1394? ( >=media-libs/libiec61883-1.0.0 sys-libs/libraw1394 )
>=media-libs/mlt-0.2.4-r1
>=media-libs/mlt++-0.2.2"
@@ -40,11 +41,12 @@ src_unpack() {
kde_src_unpack
epatch "${FILESDIR}/${P}-ffmpegheaders.patch"
epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+ epatch "${FILESDIR}/${P}-iec61883_automagic.patch"
rm -f configure
}
src_compile() {
- myconf="--enable-pch"
+ myconf="--enable-pch $(use_with ieee1394 libiec61883)"
kde_src_compile
}