Fix underlinked modules, bug 266593.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 211 insertions, 12 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 6c5048063b24..1fab1ec2b4fc 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.39 2009/04/15 18:37:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.40 2009/04/22 11:08:39 loki_val Exp $
+
+*mlt-0.3.8-r1 (22 Apr 2009)
+
+  22 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mlt-0.3.8-as-needed.patch, +mlt-0.3.8-r1.ebuild:
+  Fix underlinked modules, bug 266593.
 
 *mlt-0.3.8 (15 Apr 2009)
 
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 8c62d6979c22..2b40c7e65f74 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mlt-0.2.3-nostrip.patch 1763 RMD160 958ea322e598e286dc9adcc6ba509c7b2eeae5b2 SHA1 8a24c74980b8cdefb19164a4c6a36217b23244dd SHA256 1e0945b45245c297464e845bf6409a91582d288047b2b511357ead52be70fceb
 AUX mlt-0.3.6-avutil.patch 5678 RMD160 2643d1a170b1bfba6e34eeef9e162aed834f0f03 SHA1 2a6bfc9a1514e4d485e4d0afcade7cc654e028d5 SHA256 251c3bd4956c5c4221e59b54a2e8d900e42e720c48bcb09be90733d48ab2a4db
 AUX mlt-0.3.6-qimage.patch 706 RMD160 b7d2ee57ed6b14678d402d28531d411b1418700a SHA1 4571bfacd0317d8b90244d0343727ab6939815f3 SHA256 8c30ece5d14202867441773ad93c61b2ee84d1afdcb3f009582ce48522c0e527
+AUX mlt-0.3.8-as-needed.patch 2262 RMD160 e98ebf835f23b25297ba97f14eff7ac9dedbedf6 SHA1 836dff43ace64398fbb23c43ae7cf98fb0bc9907 SHA256 9957757c36916e5732bdba1f8787f4ce3b829e25c4f00bdbf7b116c77514959f
 DIST mlt-0.3.4.tar.gz 744993 RMD160 094f90548c6dd01cc190cc4dea0a471731a9636c SHA1 da673028a731ffbc968726fc19dc284d31c99796 SHA256 a25dd02aa4de5b85a64160444fbd2c1860b408391783fd93dd9dcc23ae05e425
 DIST mlt-0.3.6.tar.gz 755211 RMD160 e68584c5665460cee5f6a5057db6dfa2792d008f SHA1 cfa6039b57e357a9e3cc3b8dd00cfe29715dd0df SHA256 da82437e3a03f6ef835c3546aa2c8c0fb16a0d47925c3c7d56db3db90d2ecfc5
 DIST mlt-0.3.8.tar.gz 765811 RMD160 c8c67f23cd519414f6410ee02c1c37704facf180 SHA1 b3e114b343fb825df292d8343850512d631dea23 SHA256 cea314c08cf2a9256ef50f9cd09202f1c8c778ad278c324112e3c8a9d3b28e24
 EBUILD mlt-0.3.4.ebuild 2633 RMD160 bd31039d6fe8bdf93f0b730bd599d7fc8f40a5e4 SHA1 f4936732ffb6cb5de8c62c6567a56931d841f7a1 SHA256 3b4ed897f2532218fbaf84c42eb3129870889374b4c08f951f9fc66fd86e5c2c
 EBUILD mlt-0.3.6.ebuild 3302 RMD160 e0b657d92e701e8499fd6ac0de4e11a050c1c61d SHA1 a21480ad7e7abe34956772fd39fafca0a83670c7 SHA256 73a1c0f32fda0643e497b46b5858fb4d05b87284d19c58be02d0d8d01361144d
+EBUILD mlt-0.3.8-r1.ebuild 3322 RMD160 c3b2c09aa17b26b4f6db623bad3af75d2a75470f SHA1 3bf50eb849ed08003503419715e6bf059d39d425 SHA256 137de4bc429670058fe8873edd3571f6751f3fd8902920845ec1f77f345a3706
 EBUILD mlt-0.3.8.ebuild 3269 RMD160 f0573c9c2e057101ddc9783cabee2fee591e74f7 SHA1 8f420995baab9133dc7e144aae9705cf78ad765e SHA256 52b5ec53138f2553c3fcbad20054f4f99e2f73aca46515cf33387219b01e23ff
-MISC ChangeLog 6462 RMD160 76f8642b1e1ce565dd5e750f20373208999fda78 SHA1 886c717113a10f81100802e3e422058adc03a869 SHA256 7c7782b95e4418558c4358f1daed79e2399a8ba621b67c54f82881798a2ced38
+MISC ChangeLog 6642 RMD160 15b0dc3f6de3f8e58ddc9dce1f28948954a6e7a1 SHA1 b73b39720fbb6422cb1e563b27bd4426fddee79a SHA256 b986fbe9ba4e47555c97a544a8de1f9205d4b1ad0f998f8eb48996c21c62bc4b
 MISC metadata.xml 309 RMD160 eda168c8e7d4d6351c0d68920f9a16fc7be98faa SHA1 75c4b1dacecba9d2b7613a25b9477d8bc0c19631 SHA256 dfe032959539b7a48f33ab6520dde1814e062ce636efc4be8795cc480b90ead7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknmKXAACgkQvFcC4BYPU0oF+wCdGkTZX1LugrBtprPktl1iDm/8
-dr0AoJKD7APFy59s7eWI6pfK9lD4wfzM
-=YUSt
------END PGP SIGNATURE-----
diff --git a/media-libs/mlt/files/mlt-0.3.8-as-needed.patch b/media-libs/mlt/files/mlt-0.3.8-as-needed.patch
new file mode 100644
index 000000000000..7d98dc104db1
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.3.8-as-needed.patch
@@ -0,0 +1,80 @@
+diff -NrU5 mlt-0.3.8.orig/src/modules/core/Makefile mlt-0.3.8/src/modules/core/Makefile
+--- mlt-0.3.8.orig/src/modules/core/Makefile	2009-04-22 12:56:59.000000000 +0200
++++ mlt-0.3.8/src/modules/core/Makefile	2009-04-22 12:59:34.000000000 +0200
+@@ -31,11 +31,11 @@
+ 
+ ASM_OBJS = 
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
+ 
+diff -NrU5 mlt-0.3.8.orig/src/modules/effectv/Makefile mlt-0.3.8/src/modules/effectv/Makefile
+--- mlt-0.3.8.orig/src/modules/effectv/Makefile	2009-04-22 12:56:59.000000000 +0200
++++ mlt-0.3.8/src/modules/effectv/Makefile	2009-04-22 12:59:23.000000000 +0200
+@@ -7,11 +7,11 @@
+ 	   image.o \
+ 	   utils.o
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
+ 
+diff -NrU5 mlt-0.3.8.orig/src/modules/motion_est/Makefile mlt-0.3.8/src/modules/motion_est/Makefile
+--- mlt-0.3.8.orig/src/modules/motion_est/Makefile	2009-04-22 12:56:59.000000000 +0200
++++ mlt-0.3.8/src/modules/motion_est/Makefile	2009-04-22 12:58:45.000000000 +0200
+@@ -10,11 +10,11 @@
+ 	   filter_vismv.o \
+ 	   producer_slowmotion.o
+ 
+ CFLAGS += -I../.. 
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
+ 
+diff -NrU5 mlt-0.3.8.orig/src/modules/normalize/Makefile mlt-0.3.8/src/modules/normalize/Makefile
+--- mlt-0.3.8.orig/src/modules/normalize/Makefile	2009-04-22 12:56:59.000000000 +0200
++++ mlt-0.3.8/src/modules/normalize/Makefile	2009-04-22 12:58:00.000000000 +0200
+@@ -5,11 +5,11 @@
+ OBJS = factory.o \
+ 	   filter_volume.o 
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
+ 
+diff -NrU5 mlt-0.3.8.orig/src/modules/plus/Makefile mlt-0.3.8/src/modules/plus/Makefile
+--- mlt-0.3.8.orig/src/modules/plus/Makefile	2009-04-22 12:56:59.000000000 +0200
++++ mlt-0.3.8/src/modules/plus/Makefile	2009-04-22 12:57:40.000000000 +0200
+@@ -9,11 +9,11 @@
+ 	   filter_sepia.o \
+ 	   transition_affine.o
+ 
+ CFLAGS += -I../..
+ 
+-LDFLAGS+=-L../../framework -lmlt
++LDFLAGS+=-L../../framework -lmlt -lm
+ 
+ SRCS := $(OBJS:.o=.c)
+ 
+ all: 	$(TARGET)
+ 
diff --git a/media-libs/mlt/mlt-0.3.8-r1.ebuild b/media-libs/mlt/mlt-0.3.8-r1.ebuild
new file mode 100644
index 000000000000..3d10326a68ba
--- /dev/null
+++ b/media-libs/mlt/mlt-0.3.8-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.3.8-r1.ebuild,v 1.1 2009/04/22 11:08:39 loki_val Exp $
+
+EAPI=1
+
+inherit kde-functions eutils toolchain-funcs multilib
+
+DESCRIPTION="MLT is an open source multimedia framework, designed and developed
+for television broadcasting"
+HOMEPAGE="http://mlt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dv compressed-lumas ffmpeg gtk jack kde libsamplerate mmx qt3 qt4 quicktime sdl sox sse vorbis xine xml"
+
+RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	dv?	( >=media-libs/libdv-0.104 )
+	xml?	( >=dev-libs/libxml2-2.5 )
+	vorbis?	( >=media-libs/libvorbis-1.1.2 )
+	sdl?	( >=media-libs/libsdl-1.2.10
+		  >=media-libs/sdl-image-1.2.4 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	jack?	( media-sound/jack-audio-connection-kit
+			  media-libs/ladspa-sdk
+			  >=dev-libs/libxml2-2.5 )
+	gtk?	( >=x11-libs/gtk+-2
+		  x11-libs/pango )
+	sox? ( media-sound/sox )
+	quicktime? ( media-libs/libquicktime )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	qt3? ( x11-libs/qt:3
+		kde? ( kde-base/kdelibs:3.5 ) )
+	!qt3?   ( qt4? ( x11-libs/qt-gui:4 ) )"
+
+DEPEND="${RDEPEND}
+	compressed-lumas? ( media-gfx/imagemagick )"
+
+pkg_setup() {
+	local fail="USE sox needs also USE libsamplerate enabled."
+
+	if use sox && ! use libsamplerate; then
+		eerror "${fail}"
+		die "${fail}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch
+	epatch "${FILESDIR}"/${PN}-0.3.6-qimage.patch
+	epatch "${FILESDIR}"/${PN}-0.3.8-as-needed.patch
+}
+
+src_compile() {
+	tc-export CC
+
+	local myconf="	--enable-gpl
+			--enable-motion-est
+			$(use_enable dv)
+			$(use_enable mmx)
+			$(use_enable sse)
+			$(use_enable gtk gtk2)
+			$(use_enable vorbis)
+			$(use_enable sdl)
+			$(use_enable jack jackrack)
+			$(use_enable sox)
+			$(use_enable ffmpeg avformat)
+			$(use_enable libsamplerate resample)
+			$(use_enable xml westley)
+			$(use_enable xine)"
+
+	use ffmpeg && has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" &&
+		myconf="${myconf} --avformat-swscale"
+
+	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
+
+	use compressed-lumas && myconf="${myconf} --luma-compress"
+
+	# Waiting for media-plugins/frei0r (bug 255321)
+	myconf="${myconf} --disable-frei0r"
+
+	if use qt3; then
+		myconf="${myconf} --disable-kdenlive"
+	else
+		myconf="${myconf} $(use_enable kde kdenlive)"
+	fi
+
+	if use qt3; then
+		myconf="${myconf} --qimage-libdir=$QTDIR/$(get_libdir)
+			--qimage-includedir=$QTDIR/include"
+		if use kde; then
+			# compile extra image formats using kde
+			set-kdedir 3.5
+			myconf="${myconf} --kde-libdir=$KDEDIR/$(get_libdir)
+				--kde-includedir=$KDEDIR/include"
+		fi
+	elif use qt4; then
+		myconf="${myconf} --qimage-libdir=/usr/$(get_libdir)/qt4
+			--qimage-includedir=/usr/include/qt4"
+	else
+		myconf="${myconf} --disable-qimage"
+	fi
+
+	econf ${myconf} || die "econf failed"
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc docs/*.txt ChangeLog README docs/TODO
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+}