diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-08-28 16:24:38 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-08-28 16:24:38 +0000 |
| commit | e0acb7a7127d70439a5eb7cdb30abef4e33a00a4 (patch) | |
| tree | 3f295e29844536ee0425c06bdd255d89f4321a92 /media-libs | |
| parent | Marked ~x64-macos (diff) | |
| download | gentoo-2-e0acb7a7127d70439a5eb7cdb30abef4e33a00a4.tar.gz gentoo-2-e0acb7a7127d70439a5eb7cdb30abef4e33a00a4.tar.bz2 gentoo-2-e0acb7a7127d70439a5eb7cdb30abef4e33a00a4.zip | |
Fix for build with introspection adapted from upstream patch, #380115
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/babl/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/babl/babl-0.1.4-r2.ebuild (renamed from media-libs/babl/babl-0.1.4-r1.ebuild) | 9 | ||||
| -rw-r--r-- | media-libs/babl/files/babl-0.1.4-introspection.patch | 16 | ||||
| -rw-r--r-- | media-libs/babl/metadata.xml | 14 |
4 files changed, 38 insertions, 9 deletions
diff --git a/media-libs/babl/ChangeLog b/media-libs/babl/ChangeLog index 831849c20fff..0cb570d0dde6 100644 --- a/media-libs/babl/ChangeLog +++ b/media-libs/babl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/babl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.29 2011/08/23 15:58:24 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.30 2011/08/28 16:24:37 jlec Exp $ + +*babl-0.1.4-r2 (28 Aug 2011) + + 28 Aug 2011; Justin Lecher <jlec@gentoo.org> -babl-0.1.4-r1.ebuild, + +babl-0.1.4-r2.ebuild, +files/babl-0.1.4-introspection.patch, metadata.xml: + Fix for build with introspection adapted from upstream patch, #380115 *babl-0.1.4-r1 (23 Aug 2011) diff --git a/media-libs/babl/babl-0.1.4-r1.ebuild b/media-libs/babl/babl-0.1.4-r2.ebuild index be6fd9a2e785..e818678bac89 100644 --- a/media-libs/babl/babl-0.1.4-r1.ebuild +++ b/media-libs/babl/babl-0.1.4-r2.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.4-r1.ebuild,v 1.1 2011/08/23 15:58:24 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.4-r2.ebuild,v 1.1 2011/08/28 16:24:37 jlec Exp $ EAPI=3 +inherit autotools eutils + DESCRIPTION="A dynamic, any to any, pixel format conversion library" HOMEPAGE="http://www.gegl.org/babl/" SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" @@ -16,6 +18,11 @@ IUSE="altivec +introspection sse mmx" RDEPEND="introspection? ( >=dev-libs/gobject-introspection-0.6.8 )" DEPEND="${RDEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-introspection.patch + eautoreconf +} + src_configure() { # Automagic rsvg support is just for website generation we do not call, # so we don't need to fix it diff --git a/media-libs/babl/files/babl-0.1.4-introspection.patch b/media-libs/babl/files/babl-0.1.4-introspection.patch new file mode 100644 index 000000000000..14f2b9c3fa65 --- /dev/null +++ b/media-libs/babl/files/babl-0.1.4-introspection.patch @@ -0,0 +1,16 @@ +diff --git a/babl/Makefile.am b/babl/Makefile.am +index 6abf148..6b3e270 100644 +--- a/babl/Makefile.am ++++ b/babl/Makefile.am +@@ -92,10 +92,9 @@ if HAVE_INTROSPECTION + Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am + $(INTROSPECTION_SCANNER) -v --namespace Babl --nsversion=$(BABL_API_VERSION) \ + --add-include-path=$(srcdir) --add-include-path=. \ +- --library=babl-$(BABL_API_VERSION) \ ++ --library=libbabl-$(BABL_API_VERSION).la \ + --libtool="$(LIBTOOL)" \ + --output $@ \ +- --pkg babl \ + -DBABL_IS_BEING_COMPILED \ + -I$(top_srcdir) \ + -I$(top_builddir) \ diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml index 572efe79fcfc..9d5906267eb1 100644 --- a/media-libs/babl/metadata.xml +++ b/media-libs/babl/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>hanno@gentoo.org</email> -</maintainer> -<use> - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for + <herd>no-herd</herd> + <maintainer> + <email>hanno@gentoo.org</email> + </maintainer> + <use> + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> -</use> + </use> </pkgmetadata> |