Import upstream patch to fix building wrt #298671, thanks to Kacper Kowalik and Diego...

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

diff --git a/media-libs/vips/ChangeLog b/media-libs/vips/ChangeLog
index b77750a691d738ff88116810f8e147e050b85ebd..bfa0e750cb83cfff5e7d8a83fe0ae3e5363a28c3 100644 (file)
--- a/media-libs/vips/ChangeLog
+++ b/media-libs/vips/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/vips
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.21 2010/03/06 13:26:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/ChangeLog,v 1.22 2010/03/06 17:52:54 ssuominen Exp $
+
+  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vips-7.20.7.ebuild,
+  +files/vips-7.20.7-build.patch:
+  Import upstream patch to fix building wrt #298671, thanks to Kacper
+  Kowalik and Diego E. 'Flameeyes' Pettenò.
 
   06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vips-7.18.2.ebuild:
   Revert back to ~amd64 wrt #304787.

diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index 9a0758e22fa5012e3098aca69e5510cef561227f..652593ed387cdb3bf26b657cff0efc46f34f04a5 100644 (file)
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,8 +1,9 @@
+AUX vips-7.20.7-build.patch 1530 RMD160 ee1fee0007f55afc35bc68b2639677da0e985f76 SHA1 47eef2a75b34b53148bc7baa65efe8663e4bde4c SHA256 5e33c1c5f2419e2436fac28af98fcf28a38c411efaa43908609c81cac187dbae
 DIST vips-7.18.2.tar.gz 3165250 RMD160 bfd31349cbc8b78fa06a4d9eee7d9fb539b60515 SHA1 69c3e7163ff216d06e306e3251937a6743b52eb9 SHA256 bd6ebfb96eefe694fcb2cf519e9a464b20e50a95932dfc8cc44b6fdd1032ebca
 DIST vips-7.20.6.tar.gz 3076271 RMD160 bb8bfe6112e776c9ed38eca4a565e524c5d37761 SHA1 35b225208875ef453012f66cac7726850b38d1c2 SHA256 f25764cadf0b34a874e9c24df263ed49c65b5e9a5a9e07c4e4b039f9ab9242dd
 DIST vips-7.20.7.tar.gz 3082797 RMD160 cddd6175307030bc6aacd02a56253e45e884d2db SHA1 48566a8bdeaf2a060ddd40a71c69813b6aef8c5e SHA256 3738ed5efac6676862c1ff310cc5baa63f2401b5bc931fb3671b29ddc1b1a899
 EBUILD vips-7.18.2.ebuild 1504 RMD160 002940f56c7f035f02054885502123fae09e823e SHA1 1211ab418117f4ce9ab4eea0926003e154b2d1fd SHA256 a38d95a48eaef4e4e2c8ca2f12118dcf1135ab96a17cda5b28a2ece0679a312b
 EBUILD vips-7.20.6.ebuild 1485 RMD160 b2f5d2e3fa6576110859a5eb0e1ff559417edb50 SHA1 fd4019b925a1e11b10b7533ccc8955159e9093bb SHA256 440ba045f21682e1be72054d4eed75f45f87eaefec795efb4e1fdb91549efe34
-EBUILD vips-7.20.7.ebuild 1485 RMD160 31cd827c225ec16dfb244b785ef3700060db8852 SHA1 0bc904c301ed11bd8964d1fcec1d2e19a0749d78 SHA256 a17ac10486339edfadd5604a43d58977c255172b7f21ffa796fb48fdfd367e55
-MISC ChangeLog 2881 RMD160 1adecaf1be2a8ebc08ccef5df48196d56829f178 SHA1 22f6f0a71065905a823d79230ec909d6bb00af88 SHA256 124bb999a9af34c630e3c4bc87b0557a0c01a58eddee9b5eb9b6bf8853db7728
+EBUILD vips-7.20.7.ebuild 1532 RMD160 20ce5e4b4733019089484c20f8b766ee93b4b8d8 SHA1 e43585ae8436f74f28621092b7395cf8f6695a9d SHA256 02ee6cd9250ce699c03042b05454aecb7750f49e3865629a072d8b27c2edd5a5
+MISC ChangeLog 3105 RMD160 9d712494f5ae4b5e97b768d29cb2f18300909f91 SHA1 b8519cde5f4d13dfa60a86e560c7e03e1559f307 SHA256 8ffcd89ac8dc996c4e3fea3c8ae57f5b9a182a3f67dd6bed1532e78838423f55
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2

diff --git a/media-libs/vips/files/vips-7.20.7-build.patch b/media-libs/vips/files/vips-7.20.7-build.patch
new file mode 100644 (file)
index 0000000..7e1fe93
--- /dev/null
+++ b/media-libs/vips/files/vips-7.20.7-build.patch
@@ -0,0 +1,57 @@
+http://bugs.gentoo.org/show_bug.cgi?id=298671
+
+--- libvips/colour/im_icc_transform.c
++++ libvips/colour/im_icc_transform.c
+@@ -63,7 +63,7 @@
+ im_icc_transform( IMAGE *in, IMAGE *out, 
+       const char *input_profile_filename,
+       const char *output_profile_filename,
+-      int intent )
++      VipsIntent intent )
+ {
+       im_error( "im_icc_transform", "%s",
+               _( "lcms library not linked to this VIPS" ) );
+@@ -73,7 +73,7 @@
+ 
+ int
+ im_icc_import( IMAGE *in, IMAGE *out, 
+-      const char *input_profile_filename, int intent )
++      const char *input_profile_filename, VipsIntent intent )
+ {
+       im_error( "im_icc_import", "%s",
+               _( "lmcs library not linked to this VIPS" ) );
+@@ -82,7 +82,7 @@
+ }
+ 
+ int
+-im_icc_import_embedded( IMAGE *in, IMAGE *out, int intent )
++im_icc_import_embedded( IMAGE *in, IMAGE *out, VipsIntent intent )
+ {
+       im_error( "im_icc_import", "%s",
+               _( "lmcs library not linked to this VIPS" ) );
+@@ -92,7 +92,7 @@
+ 
+ int
+ im_icc_export_depth( IMAGE *in, IMAGE *out, int depth,
+-      const char *output_profile_filename, int intent )
++      const char *output_profile_filename, VipsIntent intent )
+ {
+       im_error( "im_icc_export_depth", "%s", 
+               _( "lmcs library not linked to this VIPS" ) );
+@@ -101,16 +101,6 @@
+ }
+ 
+ int
+-im_icc_export( IMAGE *in, IMAGE *out, 
+-      const char *output_profile_filename, int intent )
+-{
+-      im_error( "im_icc_export", "%s", 
+-              _( "lmcs library not linked to this VIPS" ) );
+-
+-      return( -1 );
+-}
+-
+-int
+ im_icc_ac2rc( IMAGE *in, IMAGE *out, const char *profile_filename )
+ {
+       im_error( "im_icc_ac2rc", "%s", 

diff --git a/media-libs/vips/vips-7.20.7.ebuild b/media-libs/vips/vips-7.20.7.ebuild
index dec735dba4ce0634a6d6d25d9439783037d17bba..febc7d86aa410d9825279f2664fa7acc641cf74d 100644 (file)
--- a/media-libs/vips/vips-7.20.7.ebuild
+++ b/media-libs/vips/vips-7.20.7.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.20.7.ebuild,v 1.1 2010/01/21 14:57:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vips/vips-7.20.7.ebuild,v 1.2 2010/03/06 17:52:54 ssuominen Exp $
 
 EAPI=2
-
-inherit versionator
+inherit eutils versionator
 
 # TODO:
 # matio? ( sci-libs/matio ) - in sunrise
@@ -19,8 +18,7 @@ SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="exif fftw imagemagick jpeg lcms openexr png python tiff v4l"
 
-RDEPEND="
-       >=dev-libs/glib-2.6:2
+RDEPEND=">=dev-libs/glib-2.6:2
        >=dev-libs/liboil-0.3
        dev-libs/libxml2
        sys-libs/zlib
@@ -37,6 +35,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
        dev-util/gtk-doc-am"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-build.patch
+}
+
 src_configure() {
        econf \
                $(use_with fftw fftw3) \
@@ -52,6 +54,6 @@ src_configure() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install || die
        dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
 }