Import upstream patch to fix building wrt #298671, thanks to Kacper Kowalik and Diego E. 'Flameeyes' Pettenò.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 71 insertions, 7 deletions

diff --git a/media-libs/vips/ChangeLog b/media-libs/vips/ChangeLog
index b77750a691d7..bfa0e750cb83 100644
--- 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/files/vips-7.20.7-build.patch b/media-libs/vips/files/vips-7.20.7-build.patch
new file mode 100644
index 000000000000..7e1fe93fa1e4
--- /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 dec735dba4ce..febc7d86aa41 100644
--- 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
 }