diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-30 15:23:55 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-10-30 15:23:55 +0000 |
| commit | 4c28c5976b3102830e2ea21394e2eb9137db1d6e (patch) | |
| tree | 3d96d04adf910b0b976dcab271d3369cf60c4005 /media-libs | |
| parent | alpha/ia64/sparc stable wrt #385699 (diff) | |
| download | gentoo-2-4c28c5976b3102830e2ea21394e2eb9137db1d6e.tar.gz gentoo-2-4c28c5976b3102830e2ea21394e2eb9137db1d6e.tar.bz2 gentoo-2-4c28c5976b3102830e2ea21394e2eb9137db1d6e.zip | |
Fix build with USE=ruby, bug 351718
(Portage version: 2.1.10.31/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mlt/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.7.2-ruby-link.patch | 18 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-0.7.2.ebuild | 4 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog index 6a8a2b707101..73548f1ff3aa 100644 --- a/media-libs/mlt/ChangeLog +++ b/media-libs/mlt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mlt # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.72 2011/05/20 11:50:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.73 2011/10/30 15:23:55 dilfridge Exp $ + + 30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> mlt-0.7.2.ebuild, + +files/mlt-0.7.2-ruby-link.patch: + Fix build with USE=ruby, bug 351718 20 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> mlt-0.7.2.ebuild: Bump dependency over swig. Fixes bug #351718. diff --git a/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch b/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch new file mode 100644 index 000000000000..c0427c1a3df0 --- /dev/null +++ b/media-libs/mlt/files/mlt-0.7.2-ruby-link.patch @@ -0,0 +1,18 @@ +The build system tries to link to installed system libraries first, which +fails because the ABI has changed... + +diff -ruN mlt-0.7.2.orig/src/swig/ruby/build mlt-0.7.2/src/swig/ruby/build +--- mlt-0.7.2.orig/src/swig/ruby/build 2011-05-02 07:59:12.000000000 +0200 ++++ mlt-0.7.2/src/swig/ruby/build 2011-10-30 16:21:01.000000000 +0100 +@@ -5,8 +5,10 @@ + exit 0 + end + system( "ln -sf ../mlt.i" ) ++system( "ln -sf ../../framework/libmlt.so" ) ++system( "ln -sf ../../mlt++/libmlt++.so" ) + system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" ) + $CFLAGS += " -I../.." +-$LDFLAGS += " -L../../mlt++ -lmlt++" ++$LIBS += " -lmlt++ -lmlt -lstdc++" + create_makefile('mlt') + system( "make" ) diff --git a/media-libs/mlt/mlt-0.7.2.ebuild b/media-libs/mlt/mlt-0.7.2.ebuild index 56d4e3f50d0b..17db6aab7172 100644 --- a/media-libs/mlt/mlt-0.7.2.ebuild +++ b/media-libs/mlt/mlt-0.7.2.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/media-libs/mlt/mlt-0.7.2.ebuild,v 1.2 2011/05/20 11:50:40 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.7.2.ebuild,v 1.3 2011/10/30 15:23:55 dilfridge Exp $ EAPI=3 PYTHON_DEPEND="python? 2:2.6" @@ -59,7 +59,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.4-asneeded.patch + epatch "${FILESDIR}"/${PN}-0.7.2-ruby-link.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 |