diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-07-05 14:57:20 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-07-05 14:57:20 +0000 |
| commit | 4e5f591b4cc46f41c972c9e75e83dd37956ae650 (patch) | |
| tree | c20b9ac1235bd0c611597a0f3aa35c2f0e4dfc27 /media-plugins/frei0r-plugins | |
| parent | amd64 stable, bug #266409 (diff) | |
| download | gentoo-2-4e5f591b4cc46f41c972c9e75e83dd37956ae650.tar.gz gentoo-2-4e5f591b4cc46f41c972c9e75e83dd37956ae650.tar.bz2 gentoo-2-4e5f591b4cc46f41c972c9e75e83dd37956ae650.zip | |
Add libdir patch from Fedora for multilib compatibility
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/frei0r-plugins')
3 files changed, 35 insertions, 4 deletions
diff --git a/media-plugins/frei0r-plugins/ChangeLog b/media-plugins/frei0r-plugins/ChangeLog index 74369a4cc486..7a1d63949b8e 100644 --- a/media-plugins/frei0r-plugins/ChangeLog +++ b/media-plugins/frei0r-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/frei0r-plugins # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.1 2009/07/05 13:59:19 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/ChangeLog,v 1.2 2009/07/05 14:57:20 yngwin Exp $ + + 05 Jul 2009; Ben de Groot <yngwin@gentoo.org> + frei0r-plugins-1.1.22.ebuild, +files/frei0r-plugins-1.1.22-libdir.patch: + Add libdir patch from Fedora for multilib compatibility *frei0r-plugins-1.1.22 (05 Jul 2009) diff --git a/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch new file mode 100644 index 000000000000..70d20329ff8d --- /dev/null +++ b/media-plugins/frei0r-plugins/files/frei0r-plugins-1.1.22-libdir.patch @@ -0,0 +1,24 @@ +diff -up frei0r-plugins-1.1.21/src/Makefile.am.libdir frei0r-plugins-1.1.21/src/Makefile.am +--- frei0r-plugins-1.1.21/src/Makefile.am.libdir 2008-06-07 15:21:48.000000000 +0200 ++++ frei0r-plugins-1.1.21/src/Makefile.am 2008-06-07 15:23:30.000000000 +0200 +@@ -112,7 +112,7 @@ AM_CPPFLAGS = -I@top_srcdir@/include + AM_CFLAGS = -I@top_srcdir@/include + AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles + +-plugindir = @prefix@/lib/frei0r-1 ++plugindir = @libdir@/frei0r-1 + + + install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) +diff -up frei0r-plugins-1.1.21/src/Makefile.in.libdir frei0r-plugins-1.1.21/src/Makefile.in +--- frei0r-plugins-1.1.21/src/Makefile.in.libdir 2008-06-07 15:21:44.000000000 +0200 ++++ frei0r-plugins-1.1.21/src/Makefile.in 2008-06-07 15:23:08.000000000 +0200 +@@ -583,7 +583,7 @@ RGB_la_SOURCES = mixer3/RGB/RGB.c + AM_CPPFLAGS = -I@top_srcdir@/include + AM_CFLAGS = -I@top_srcdir@/include + AM_LDFLAGS = -module -avoid-version -Wc,-nostartfiles +-plugindir = @prefix@/lib/frei0r-1 ++plugindir = @libdir@/frei0r-1 + all: all-am + + .SUFFIXES: diff --git a/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22.ebuild b/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22.ebuild index c92383c5cfcb..44dbdfcd0781 100644 --- a/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22.ebuild +++ b/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22.ebuild,v 1.1 2009/07/05 13:59:19 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/frei0r-plugins/frei0r-plugins-1.1.22.ebuild,v 1.2 2009/07/05 14:57:20 yngwin Exp $ EAPI="2" -inherit base eutils autotools +inherit base eutils autotools multilib DESCRIPTION="A minimalistic plugin API for video effects" HOMEPAGE="http://www.piksel.org/frei0r/" @@ -20,11 +20,14 @@ RDEPEND="${DEPEND}" src_prepare() { epatch "${FILESDIR}"/${P}-no-automagic-deps.patch + epatch "${FILESDIR}"/${P}-libdir.patch eautoreconf } src_configure() { - econf $(use_enable facedetect) $(use_enable scale0tilt) + econf $(use_enable facedetect) \ + $(use_enable scale0tilt) \ + --libdir=/usr/$(get_libdir) } src_install() { |