From: Samuli Suominen Date: Thu, 15 Sep 2011 10:47:35 +0000 (+0000) Subject: Fix gdk-pixbuf path wrt #383045 by Priit Laes X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f3ecc5e8ef627d47c0f6544b857c99649f624c53;p=gentoo.git Fix gdk-pixbuf path wrt #383045 by Priit Laes Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- diff --git a/media-libs/libopenraw/ChangeLog b/media-libs/libopenraw/ChangeLog index 4f2567d9ff58..c21e8828ee7e 100644 --- a/media-libs/libopenraw/ChangeLog +++ b/media-libs/libopenraw/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/libopenraw # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/ChangeLog,v 1.48 2011/03/28 17:18:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/ChangeLog,v 1.49 2011/09/15 10:47:35 ssuominen Exp $ + +*libopenraw-0.0.8-r1 (15 Sep 2011) + + 15 Sep 2011; Samuli Suominen + +libopenraw-0.0.8-r1.ebuild, + +files/libopenraw-0.0.8-fix_gdk-pixbuf_path.patch: + Fix gdk-pixbuf path wrt #383045 by Priit Laes 28 Mar 2011; Samuli Suominen libopenraw-0.0.8.ebuild: Remove useless libtool archive files. diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest index c5f284a78d17..ead4370fdda3 100644 --- a/media-libs/libopenraw/Manifest +++ b/media-libs/libopenraw/Manifest @@ -1,4 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX libopenraw-0.0.8-fix_gdk-pixbuf_path.patch 1351 RMD160 f0c1dd81b627262eacb33130904f1646de54bf8e SHA1 352ab749ca9d728b1df6fb989d1550178959ec7c SHA256 41b1409e7f19e02a9344a8093d7612093d8ae911dfac5cf1d2b69b69b6b97cd3 DIST libopenraw-0.0.8.tar.gz 557539 RMD160 ae653949812c0b248515837d08e0dd8f28a4e5d1 SHA1 6eb19679f3b5cdc566a4caa459811121a78ac0d9 SHA256 b79e6eb1654ba9a831163f3a3057bd573765cbe1ae84be841d19f487d2fe25bd +EBUILD libopenraw-0.0.8-r1.ebuild 1019 RMD160 dd06ea1b21088c07e828d979eec1e3168105c0cb SHA1 3d4d14e6b742e7a083915b99866a4922c49885dd SHA256 edba4270ba8a6e8d1dd3a0b294ae356ad7c04632946ba9ab16eb69cebdcb428f EBUILD libopenraw-0.0.8.ebuild 943 RMD160 944fee36d80b36845ceecf280808f9e06125de3c SHA1 8adfc9681283769b49848626fa31877808a47737 SHA256 c0a156474c532d6901018d238fdb1f14410c91abb9d5eabae3978c15c37d481e -MISC ChangeLog 6072 RMD160 bfc62bba0953650281cfd298ecc28ec1f57768ea SHA1 2ba02ce7c4c9bc7399a911334e334b9d872f7ed1 SHA256 346ca4d52137300ad99af37ebd72d2061e4bd1596928945a1f0c89120e82c840 +MISC ChangeLog 6295 RMD160 5618c1815705a11d353926f5d9ae0a29bcc83ae6 SHA1 ae1eff4cc43cc8eaf7d060ad04bcabdcf2f61b5f SHA256 5d856d179295979c930207ccf3f480fc7765ba492f6a5b9b001da1d81bbc72eb MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5x1/8ACgkQXkR9YqOcLPHaJwD8Cy40eerdBCvwirNKckExRI5K +kma0JAUVMPDLiQVcUfgA/2WlG+zaGlbmGRfG4TrmixIPnsraXEMDVm3GSljxomwr +=WUwY +-----END PGP SIGNATURE----- diff --git a/media-libs/libopenraw/files/libopenraw-0.0.8-fix_gdk-pixbuf_path.patch b/media-libs/libopenraw/files/libopenraw-0.0.8-fix_gdk-pixbuf_path.patch new file mode 100644 index 000000000000..82557875a7f6 --- /dev/null +++ b/media-libs/libopenraw/files/libopenraw-0.0.8-fix_gdk-pixbuf_path.patch @@ -0,0 +1,35 @@ +From 252cd9b20d7857091c0529955998b86d7a90e6c5 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere +Date: Thu, 22 Jul 2010 07:04:54 +0000 +Subject: Install the GdkPixbuf in the right place. (Closes #29208) (Vincent Untz) + +--- +diff --git a/configure.in b/configure.in +index 1d44b9c..c16a20c 100644 +--- a/configure.in ++++ b/configure.in +@@ -137,8 +137,7 @@ if test x$enable_gnome = xyes ; then + if test x$HAVE_LIBGLIB = xyes ; then + PKG_CHECK_MODULES(LIBGDKPIXBUF, gdk-pixbuf-2.0 >= $LIBGDKPIXBUF_REQUIRED, + [AC_DEFINE(HAVE_LIBGDKPIXBUF, 1, [Define to 1 to enable libgdkpixbuf support]) +- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" ++ GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0` + AC_SUBST(GDK_PIXBUF_DIR) + HAVE_LIBGDKPIXBUF=yes], + [HAVE_LIBGDKPIXBUF=no]) +diff --git a/gnome/Makefile.am b/gnome/Makefile.am +index ecfe27d..2c0bca5 100644 +--- a/gnome/Makefile.am ++++ b/gnome/Makefile.am +@@ -16,7 +16,7 @@ pkgconfig_DATA = $(PKG_CONFIG_FILES) + + lib_LTLIBRARIES = $(GNOME_TARGETS) + +-loaderdir = $(libdir)/$(GDK_PIXBUF_DIR) ++loaderdir = $(GDK_PIXBUF_DIR) + loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN) + + libopenrawgnome_la_LDFLAGS = \ +-- +cgit v0.9.0.2-2-gbebe diff --git a/media-libs/libopenraw/libopenraw-0.0.8-r1.ebuild b/media-libs/libopenraw/libopenraw-0.0.8-r1.ebuild new file mode 100644 index 000000000000..eaa852d32278 --- /dev/null +++ b/media-libs/libopenraw/libopenraw-0.0.8-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libopenraw/libopenraw-0.0.8-r1.ebuild,v 1.1 2011/09/15 10:47:35 ssuominen Exp $ + +EAPI=4 +inherit autotools eutils + +DESCRIPTION="A decoding library for RAW image formats" +HOMEPAGE="http://libopenraw.freedesktop.org" +SRC_URI="http://${PN}.freedesktop.org/download/${P}.tar.gz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="gtk static-libs test" + +RDEPEND="virtual/jpeg + dev-libs/libxml2 + gtk? ( >=x11-libs/gdk-pixbuf-2.24.0:2 )" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.35 + dev-util/pkgconfig + test? ( net-misc/curl )" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-fix_gdk-pixbuf_path.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable gtk gnome) +} + +src_install() { + default + find "${D}" -name '*.la' -exec rm -f {} + +}