Respect {C,LD}FLAGS when building shared library. Bug #308873

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

4 files changed, 179 insertions, 13 deletions

diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog
index 43973dc16e8a..1d450ebe5ea2 100644
--- a/media-libs/mlt/ChangeLog
+++ b/media-libs/mlt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mlt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.63 2010/07/07 12:27:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.64 2010/08/06 21:21:38 hwoarang Exp $
+
+*mlt-0.5.4-r1 (06 Aug 2010)
+
+  06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> +mlt-0.5.4-r1.ebuild:
+  Respect {C,LD}FLAGS when building shared library. Bug #308873
 
   07 Jul 2010; Christian Faulhammer <fauli@gentoo.org> mlt-0.5.4.ebuild:
   stable x86, bug 325727
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 9822559d8ce0..fc67177e4e7c 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mlt-0.5.4-asneeded.patch 338 RMD160 1fd1f17c6461fa518a621064a9d1f5a981e94059 SHA1 06784b1c39a9766e45c9b29e9c7a03916472e21e SHA256 9331f20822eb6cb0ed7e20952b0e37cb3e9a5df0203d1ab6361b4289a6c0cba8
 DIST mlt-0.4.6.tar.gz 759717 RMD160 e0fcffcfb157576a6757fd953294efdc21f77def SHA1 978da7b578bc919c4cecda708b563b02ab31aa9c SHA256 df0339d98ffc2244a558933b91457c6bc1b2555c4f1f5f4f94a9dce597377dff
 DIST mlt-0.5.4.tar.gz 802138 RMD160 429ba2a2d30da29d9f92cd1f80ab75ff48773731 SHA1 8c38f78e99f9eb1b8e06961aebee7213b995144a SHA256 12ea1f2fc8adeda7db0d31c1270e843d9036a65a81fbeac7c885605397fd458b
 EBUILD mlt-0.4.6.ebuild 2696 RMD160 4c541e83adbffae3538b279bdc0630eccec1f2e4 SHA1 91f027bfa49d8302c5b0275abeb68b755406259f SHA256 448ded08835f7d0928c2de1e6780f120389d0a8f2bec75dad4fa8e6687db4900
+EBUILD mlt-0.5.4-r1.ebuild 4461 RMD160 dce9bac31b98eaefa51b8d928b2556fdafd77be4 SHA1 55708baabe41ac455fd82d4f71f50c4269086a56 SHA256 19db1ef64ae9c09f58d54a19bbf8e04b5a86aeb06176f3d9d4b87a4e6a8ef3cd
 EBUILD mlt-0.5.4.ebuild 4217 RMD160 2c81a33d75a0a1fa41d4fb8c8dce3e017e83139c SHA1 abf5a2f05ef9895d6481948aa7e5dadaff7a3ce6 SHA256 5a0d3f3a59df9085d9b64d07af4b08565fe16ab568e61de193ae0352a672273c
-MISC ChangeLog 9962 RMD160 f6ad194f4fac0969a74a618e1152b2f2220a4349 SHA1 f6df298bae728c2758e44dfa25d5f4a7a75e73d0 SHA256 947b868691447abdc27834c7bd63cc212ccdf48757606e84d4c8d77e709c3aa0
+MISC ChangeLog 10134 RMD160 f5d4c850ad268ed7c4a3f46aea06c2843cbf7d84 SHA1 e3be1e28672ca12dade04e9325c06cc8ede6afea SHA256 dc6429a15400ab5631ed587fee4d50cc321716a1a42e38fb136125d827a56796
 MISC metadata.xml 902 RMD160 9cbaf3b801eeda6ba3733ffdc947eec947c9c905 SHA1 564c50101ea02bc5b3adc1c94a59962e8652e4f5 SHA256 42ad9c42cec4fbde252f7bfb7656012f7b452525679de4a644697bcbea73b7e6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkw0cxgACgkQNQqtfCuFneOIgwCfWfpyK5lr9FiBITBSfnkz3PEE
-6hUAn1Ag92O7fBQZUe/TZaE75f0m7wn2
-=QJ80
------END PGP SIGNATURE-----
diff --git a/media-libs/mlt/mlt-0.5.4-r1.ebuild b/media-libs/mlt/mlt-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..6404f8c9995d
--- /dev/null
+++ b/media-libs/mlt/mlt-0.5.4-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.5.4-r1.ebuild,v 1.1 2010/08/06 21:21:39 hwoarang Exp $
+
+EAPI=3
+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 libsamplerate melt
+mmx qt4 quicktime sdl sse sse2 vorbis xine xml lua python ruby vdpau" # java perl php tcl
+
+RDEPEND="ffmpeg? ( >=media-video/ffmpeg-0.5[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
+		 >=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
+		x11-libs/pango )
+	quicktime? ( media-libs/libquicktime )
+	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
+	qt4? ( x11-libs/qt-gui:4 )
+	!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-1.3.38"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	compressed-lumas? ( || ( media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick] ) )
+	lua? ( ${SWIG_DEPEND} dev-util/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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.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
+	done
+	sed -i "/^LDFLAGS/:s += : &${LDFLAGS} :" src/swig/ruby/build
+}
+
+src_configure() {
+	use vdpau || export MLT_NO_VDPAU=1
+
+	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 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 xml)
+		$(use_enable xine)
+		$(use_enable kde kdenlive)
+		$(use_enable qt4 qimage)
+		--disable-sox"
+		#$(use_enable sox)  FIXME
+
+	use ffmpeg && myconf="${myconf} --avformat-swscale"
+
+	(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/{TODO,*.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
+}
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 3e79507726b4..ea2d3dec5a36 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,5 +1,7 @@
 AUX vigra-1.6.0-gcc44.patch 635 RMD160 2d787b30517e501f9eb97f9c83e5b8697f6598c2 SHA1 21600a4fae903e3b34e1c869f01b4de1c1c2bdd3 SHA256 800afef55c0e390f831207c98f047bccd80c3538ad998ff0dc8bc9269e98a277
+AUX vigra-1.6.0-ldflags.patch 543 RMD160 a4ec09c3c4667f67b8b0be48d65fe5ba0e7d3d12 SHA1 3ca172b40f642b0e06fdc00e1f445257dfcfad55 SHA256 d117f57058c569e21a63895a4febd4ed7d1bd5743ee8b2af114d7f6e8b1b6349
 DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
+EBUILD vigra-1.6.0-r1.ebuild 1872 RMD160 2469cb4ae848101289eff8df511d897411556dee SHA1 38ed0c2aa1f78b4b043b72ab6b69d02683bc6b9a SHA256 da512d5a865d8d146bd323fdc93f0befb2cdc09472e88bc4eafa3b1fb694f7b4
 EBUILD vigra-1.6.0.ebuild 1794 RMD160 57369e4acb977e806431922f718367598ee76922 SHA1 0bab8ee7ebdaac87f284c3e24ff3e28547ef9fe6 SHA256 bca236914bc5eb820672fd2fac337d00c5f25f4fcb64d6cbaabbba3d73d8a880
-MISC ChangeLog 3259 RMD160 a193d71bb579ff08171e422193b4fab07b7f12bc SHA1 fe11e049af075ffb08836c9c3ca158fb058a13fe SHA256 f5d64b3583705d343952a6fde02a2550f616cb9327931986bd2fb26ca11aba22
+MISC ChangeLog 3502 RMD160 bb43107d548e6b01335d49ec3c6226c46c9c6c39 SHA1 55ae4d6932f4a0637c8c61d0e8c2d06ec6ac5175 SHA256 22a4ffc856bdbc136c44f89b9f396a95757de342aba079fb2fe762c1cf11e573
 MISC metadata.xml 187 RMD160 9c8b8edd91cb93979173540d1df3d264539f1f94 SHA1 c1f16177a9daf628b0fe0dcc6f8e694111d2a578 SHA256 6f9a63412850ecb6e6c0d6989f6ebe6dffe84bbb1bf3038cf8a0491b7c819161