Add kdelibs-automagic patch, which has already been accepted upstream. Add kdenlive useflag, as it is separately configurable from linking to kdelibs. Fixes bug #445230. Thanks to Enlik for the patches.

(Portage version: 2.2.0_alpha157/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 285 insertions, 3 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 24491b9e525d..f59cd51d7ee4 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/mlt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.99 2012/11/26 14:32:40 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.100 2013/01/20 18:39:53 yngwin Exp $
+
+*mlt-0.8.6-r1 (20 Jan 2013)
+
+  20 Jan 2013; Ben de Groot <yngwin@gentoo.org>
+  +files/mlt-0.8.6-kdelibs-automagic.patch, +mlt-0.8.6-r1.ebuild, metadata.xml:
+  Add kdelibs-automagic patch, which has already been accepted upstream. Add
+  kdenlive useflag, as it is separately configurable from linking to kdelibs.
+  Fixes bug #445230. Thanks to Enlik for the patches.
 
   26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Update to global useflag.
diff --git a/media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch b/media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch
new file mode 100644
index 000000000000..c1d561204d51
--- /dev/null
+++ b/media-libs/mlt/files/mlt-0.8.6-kdelibs-automagic.patch
@@ -0,0 +1,94 @@
+diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
+index a75b75a..04a93d5 100755
+--- a/src/modules/qimage/configure
++++ b/src/modules/qimage/configure
+@@ -12,6 +12,7 @@ QImage options:
+   --kde-includedir        - Location of KDE include directory [/usr/include/kde]
+   --exif-libdir           - Location of libexif lib directory [/usr/lib]
+   --exif-includedir       - Location of libexif include directory [/usr/include/libexif]
++  --without-kde           - Don't link to KDE libraries
+ 
+ EOF
+ 
+@@ -42,6 +43,7 @@ else
+ 
+ 	export force_qt3=
+ 	export qt4_found=
++	export without_kde=
+ 
+ 	for i in "$@"
+ 	do
+@@ -53,6 +55,7 @@ else
+ 			--exif-libdir=* )	exif_libdir="${i#--exif-libdir=}" ;;
+ 			--exif-includedir=* )	exif_includedir="${i#--exif-includedir=}" ;;
+ 			--force-qt3 )		force_qt3="true" ;;
++			--without-kde )	without_kde="true" ;;
+ 		esac
+ 	done
+ 
+@@ -112,7 +115,7 @@ else
+ 				echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtXml -lQtSvg >> config.mak
+ 			fi
+ 		else
+-		    if [ -d "$kde_includedir" ]
++		    if [ "$without_kde" = "" ] && [ -d "$kde_includedir" ]
+ 		    then
+ 			    echo "#define USE_KDE3" >> config.h
+ 			    echo "USE_KDE3=1" >> config.mak
+@@ -121,7 +124,7 @@ else
+ 			    echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir -DQT_THREAD_SUPPORT >> config.mak
+ 				echo QTLIBS=-L$qimage_libdir -L$kde_libdir -lqt-mt >> config.mak
+ 		    else
+-			    echo "qimage: KDE environment not found - disabling extra image formats"
++			    echo "qimage: KDE environment not found or disabled by request - disabling extra image formats"
+ 			    echo "#define USE_QT3" >> config.h
+ 			    echo "USE_QT3=1" >> config.mak
+ 			    echo QTCXXFLAGS=-I$qimage_includedir -DQT_THREAD_SUPPORT>> config.mak
+@@ -144,26 +147,29 @@ else
+ 		fi
+ 	fi
+ 
+-	kde4-config
+-	if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
++	if [ "$without_kde" = "" ]
+ 	then
+-		# test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
+-		if [ "$kde_includedir" = "" ]
++		kde4-config
++		if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
+ 		then
+-		      kde_includedir=`kde4-config --install include`
+-		fi
+-		if [ "$kde_libdir" = "" ]
+-		then
+-		      kde_libdir=`kde4-config --install lib`
+-		fi
+-		if [ -d "$kde_includedir" ] && [ -d "$kde_libdir" ]
+-		then
+-			echo "KDE version 4.x detected, will enable extra image formats"
+-			echo "#define USE_KDE4" >> config.h
+-			echo "USE_KDE4=1" >> config.mak
+-			echo KDECXXFLAGS=-I$kde_includedir >> config.mak
+-			# the -L with kde4/devel is for Fedora
+-			echo KDELIBS=-L$kde_libdir -L${kde_libdir}/kde4/devel -lkdecore >> config.mak
++			# test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
++			if [ "$kde_includedir" = "" ]
++			then
++				  kde_includedir=`kde4-config --install include`
++			fi
++			if [ "$kde_libdir" = "" ]
++			then
++				  kde_libdir=`kde4-config --install lib`
++			fi
++			if [ -d "$kde_includedir" ] && [ -d "$kde_libdir" ]
++			then
++				echo "KDE version 4.x detected, will enable extra image formats"
++				echo "#define USE_KDE4" >> config.h
++				echo "USE_KDE4=1" >> config.mak
++				echo KDECXXFLAGS=-I$kde_includedir >> config.mak
++				# the -L with kde4/devel is for Fedora
++				echo KDELIBS=-L$kde_libdir -L${kde_libdir}/kde4/devel -lkdecore >> config.mak
++			fi
+ 		fi
+ 	fi
+ 
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index e3d1c619af6a..7174f2d1e9eb 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
 	<flag name="melt">Build the melt commandline tool</flag>
 	<flag name="lua">Build SWIG bindings for Lua</flag>
+	<flag name="kdenlive">Build support for <pkg>media-video/kdenlive</pkg></flag>
 	<flag name="python">Build SWIG bindings for Python</flag>
 	<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
 	<flag name="ruby">Build SWIG bindings for Ruby</flag>
@@ -22,4 +23,3 @@
 	-->
 </use>
 </pkgmetadata>
-
diff --git a/media-libs/mlt/mlt-0.8.6-r1.ebuild b/media-libs/mlt/mlt-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..6c7e0a526ceb
--- /dev/null
+++ b/media-libs/mlt/mlt-0.8.6-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.8.6-r1.ebuild,v 1.1 2013/01/20 18:39:53 yngwin Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.6"
+inherit eutils toolchain-funcs multilib python
+
+DESCRIPTION="An open source multimedia framework, designed and developed for television broadcasting"
+HOMEPAGE="http://www.mltframework.org/"
+SRC_URI="mirror://sourceforge/mlt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="compressed-lumas dv debug ffmpeg frei0r gtk jack kde kdenlive libsamplerate melt
+mmx qt4 quicktime rtaudio sdl sse sse2 swfdec vorbis xine xml lua python ruby vdpau" # java perl php tcl
+IUSE="${IUSE} kernel_linux"
+
+#rtaudio will use OSS on non linux OSes
+RDEPEND="ffmpeg? ( virtual/ffmpeg[vdpau?] )
+	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[X,opengl]
+		 >=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 )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gtk? ( x11-libs/gtk+:2
+		media-libs/libexif
+		x11-libs/pango )
+	quicktime? ( media-libs/libquicktime )
+	rtaudio? ( kernel_linux? ( media-libs/alsa-lib ) )
+	swfdec? ( media-libs/swfdec )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		media-libs/libexif )
+	kde? ( kde-base/kdelibs:4
+		media-libs/libexif )
+	!media-libs/mlt++
+	lua? ( >=dev-lang/lua-5.1.4-r4 )
+	ruby? ( dev-lang/ruby )"
+#	sox? ( media-sound/sox )
+#	java? ( >=virtual/jre-1.5 )
+#	perl? ( dev-lang/perl )
+#	php? ( dev-lang/php )
+#	tcl? ( dev-lang/tcl )
+
+SWIG_DEPEND=">=dev-lang/swig-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	compressed-lumas? ( || ( media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[imagemagick,png] ) )
+	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
+	python? ( ${SWIG_DEPEND} )
+	ruby? ( ${SWIG_DEPEND} )"
+#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
+#	perl? ( ${SWIG_DEPEND} )
+#	php? ( ${SWIG_DEPEND} )
+#	tcl? ( ${SWIG_DEPEND} )
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.6-ruby-link.patch
+	epatch "${FILESDIR}"/${P}-kdelibs-automagic.patch
+
+	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
+	for x in python lua; do
+		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+	done
+	sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
+}
+
+src_configure() {
+	tc-export CC CXX
+
+	local myconf="--enable-gpl
+		--enable-motion-est
+		$(use_enable debug)
+		$(use_enable dv)
+		$(use_enable sse)
+		$(use_enable sse2)
+		$(use_enable swfdec)
+		$(use_enable gtk gtk2)
+		$(use_enable vorbis)
+		$(use_enable sdl)
+		$(use_enable jack jackrack)
+		$(use_enable ffmpeg avformat)
+		$(use_enable frei0r)
+		$(use_enable melt)
+		$(use_enable libsamplerate resample)
+		$(use_enable rtaudio)
+		$(use vdpau && echo ' --avformat-vdpau')
+		$(use_enable xml)
+		$(use_enable xine)
+		$(use_enable kdenlive)
+		$(use_enable qt4 qimage)
+		--disable-sox"
+		#$(use_enable sox)  FIXME
+
+	use ffmpeg && myconf="${myconf} --avformat-swscale"
+	use kde || myconf="${myconf} --without-kde"
+	(use quicktime && use dv) ||  myconf="${myconf} --disable-kino"
+	use compressed-lumas && myconf="${myconf} --luma-compress"
+
+	( use x86 || use amd64 ) && \
+		myconf="${myconf} $(use_enable mmx)" ||
+		myconf="${myconf} --disable-mmx"
+
+	use melt || sed -i -e "s;src/melt;;" Makefile
+
+	# TODO: add swig language bindings
+	# see also http://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
+
+	local swig_lang
+	# TODO: java perl php tcl
+	for i in lua python ruby ; do
+		use $i && swig_lang="${swig_lang} $i"
+	done
+	[ -z "${swig_lang}" ] && swig_lang="none"
+
+	econf ${myconf} --swig-languages="${swig_lang}"
+	sed -i -e s/^OPT/#OPT/ "${S}/config.mak"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README docs/*.txt
+
+	dodir /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r demo
+
+	docinto swig
+
+	# Install SWIG bindings
+	if use lua; then
+		cd "${S}"/src/swig/lua
+		exeinto $(pkg-config --variable INSTALL_CMOD lua)
+		doexe mlt.so || die
+		dodoc play.lua
+	fi
+
+	if use python; then
+		cd "${S}"/src/swig/python
+		insinto $(python_get_sitedir)
+		doins mlt.py || die
+		exeinto $(python_get_sitedir)
+		doexe _mlt.so || die
+		dodoc play.py
+	fi
+
+	if use ruby; then
+		cd "${S}"/src/swig/ruby
+		exeinto $("${EPREFIX}"/usr/bin/ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+		doexe mlt.so || die
+		dodoc play.rb thumbs.rb
+	fi
+	# TODO: java perl php tcl
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize mlt.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup mlt.py
+	fi
+}