Port to babl/gegl-0.1.0

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

4 files changed, 105 insertions, 20 deletions

diff --git a/media-gfx/gnome-scan/ChangeLog b/media-gfx/gnome-scan/ChangeLog
index 71635bd1fe5b..a48db1f9d9de 100644
--- a/media-gfx/gnome-scan/ChangeLog
+++ b/media-gfx/gnome-scan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gnome-scan
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-scan/ChangeLog,v 1.5 2011/04/01 10:39:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-scan/ChangeLog,v 1.6 2011/04/01 10:47:22 nirbheek Exp $
+
+  01 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-scan-0.7.2.ebuild, +files/gnome-scan-0.7.2-babl-0.1.0-port.patch:
+  Port to babl/gegl-0.1.0
 
 *gnome-scan-0.7.2 (01 Apr 2011)
 
diff --git a/media-gfx/gnome-scan/Manifest b/media-gfx/gnome-scan/Manifest
index 5d35cce9964f..a284dfc10fe4 100644
--- a/media-gfx/gnome-scan/Manifest
+++ b/media-gfx/gnome-scan/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnome-scan-0.7.2-babl-0.1.0-port.patch 3152 RMD160 acdf47a5c9f383b8a3df597d1ec23c0420245d53 SHA1 edd56dec30916149ad420ec06f761ff529f4585b SHA256 a98e83adcf4d726a265c9213b7328b2e00524ac3fb027b992092e73edbe8c0af
 DIST gnome-scan-0.6.2.tar.bz2 496726 RMD160 d7902c096b0e894bf5c9d8556eac087ea60ce1cc SHA1 ab1b77d9efa57294c57482c5f667175c2ccd1f78 SHA256 b7f5c616b70757eb238acbc9ca181db735491882abecedceab6316f842e2c1a7
 DIST gnome-scan-0.7.2.tar.bz2 509241 RMD160 6bd99742fce1ec27756fb24f980ed1520d1f931f SHA1 7aae0aea20cf96d435897f4f97dc7f3141e411e1 SHA256 f2db44ecb657660ba44fda0912fd17caa67ce40ee8518705b22839e97d7ce853
 EBUILD gnome-scan-0.6.2.ebuild 856 RMD160 317317268855ea38bc7e48e939999e43cc09eb07 SHA1 21e47d3c0d5fb77bd16d4b1eeda9031fa6a5979a SHA256 a5fcadaa18ccf8c451d2ef496063fc0913f48346a6a6deaab114c586ccbdb980
-EBUILD gnome-scan-0.7.2.ebuild 1105 RMD160 08b7312a5c5e39c5955ea3376d47e32b20a4ea16 SHA1 3c6ac6f79c361db1944d6ff38c855d4e7984daa5 SHA256 825c55ef068cc3043b77d6fd5ceddf506a279170ad02d2bed760f2ec3b67a7f8
-MISC ChangeLog 1141 RMD160 304419b1c39e15d7eeac4b9bf64b3c21d4f882bc SHA1 f9762860bf1e2129854f1055c943be8200c134d2 SHA256 edd4d3b640f79661cf898f0cbd9afa024cbcfe53439c274b9b14ee282ca79119
+EBUILD gnome-scan-0.7.2.ebuild 1199 RMD160 eeac845526fbdb3c46138aeb2695a2e1d6f19356 SHA1 933e1c175083a66b32121d026730c366dcbfa0fc SHA256 5eee8506ccbff65c0510547efef58cd878cf8ca0f288ccbc9c69bb992b90c8f2
+MISC ChangeLog 1296 RMD160 46fd5b848299f0fb6426e17011f73a13a166e6af SHA1 e0381806f67c4b1910427f81630c9bb5b1a9d6b7 SHA256 a174be024e132e54f3dfbe81e3830e3b7a1b17a08642bc94f3e0a294ff0b4704
 MISC metadata.xml 224 RMD160 7b0809e3b624a55423fd5d601889dac4180f136c SHA1 8b85ce553299479e14a1f7c3ea19252e2a9a0aab SHA256 bf038e36d4fafe671c27c7294e4fb2ba5e87fe3ee8383f024c06d70a77a572d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNlauDAAoJEO/kOhxWD91kgbAP/2FNxtC5SExu0Mn4QF4YZt1X
-ovCluzhbfVz24R77RzraBIRrw6ByzTnsbVZc1pr1WZLBdQvim6NOe3nYhCoNHfjQ
-8nb5uxn4eLP0ibknOvtdHFZ1BJ5CO/J4RphlYDAWpj2A8qsjKXRA7dRl9e6enPb+
-862f6L6t2CsqME6p0eSoeKhhNDtd1yhwlDGNsR0yl0elgK66rqlo7DWLYYD/DKL3
-7dlZqMMY/i6ZyInlHuZfhgBAdU+WM7ffZ4RjPa69GmMWcxm2hwUautUcAnTiWRvY
-g8WCynslg+cVC2VZL+kRxK4fPtM48BwhVWJUWaudi697/cSVvNIGVVBoV+EK3se6
-TDP9KNQshl+tL2cDvZkDLvKPEdOCdDaZVp8n/uq7evhyhYRPnOEjgLmfsrFDrQZP
-dKNm3F3JVbKzYAMBjY/A6ivP8xi9pm5VhtMgBXEr0YjHru5ns09xL/0bV5CroVc+
-IkZmJ+G6qLtU29QGD+NIyaPyGudzrKm9ZhnCHatXKz6fc84r+i7AobhR4fLOyhnq
-O4kG+DT6zkg8Ck3rjupceDQC/3DnI1cdKN+2z0tBASiLDJ4hU34chmbi1xSqWBmr
-wSpJSg/uoo0evbdyXvvWSS6gYjsnkhcjdWuAXDCfcMCjFdfTkde//6FzErXyBcCC
-l/5RHckw1JWIqps3eA7C
-=smxA
+iQIcBAEBAgAGBQJNla1AAAoJEO/kOhxWD91kbFgQAI/OEOS++fpahD0TOOTlgU2h
+7Zy7XubfYrmA2NhiW6yHVet7BIOLBggGJdih7/jiacNCzRpAiUxPk19By36YrRyK
+da1uAM2kdKO8o8kk/8Gi9jd35XKEpsQWYUZp5+yjvPuEnoHU6aJXCkado+S7ZooR
+KVhEvLHddQG7A4Ld2wv+a3KKcKV/6C6cOIiLyYflRr/4qcR+EDbda92WiFuYtxYX
+PaUFnFVGKbPef/XpUH+szOMmtmRV+IrJ8jv5dH+EC9mKU03bSWTmDbZd0PAd/nEu
+Yqtiw/8iiVgM+BYypsrtC+HTeQSJG4U2+fTUhyyCEqmLwtkmjTMMZlBkpFpCbytG
+fU3QeDvPdrPBXUXS3DzddF/gsaSIt8OSPMlmf/r+d+NfNa4F8RtSmFUXiX2AGXnY
+hEzO7UU81TxntOEPppBqYav0AdRL6pRgBJgZ+oQ7osiiOwpHEh2VMBeGjJCUBCCX
+MC0yod0H7ClTRm8v1nVsBYMQsz1lRzEmP5Ekf6uk27jnC6jQZdayMSxjaV5NUJXp
+maCVhtJPReQnxeu8YWLRrvw1pyrpjTIKkT9nxCDqU1CZ7A67AKpC1X7OWFajj2I+
+yeVSCRUWbVcwqQgL+jVWdr15esARUPr6uqZt8fYwy05QfVRSTIvF58AKeuMDbH3d
+mM8Cap6zSgfBJCgNGZVg
+=W2ZK
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gnome-scan/files/gnome-scan-0.7.2-babl-0.1.0-port.patch b/media-gfx/gnome-scan/files/gnome-scan-0.7.2-babl-0.1.0-port.patch
new file mode 100644
index 000000000000..29f0fc683242
--- /dev/null
+++ b/media-gfx/gnome-scan/files/gnome-scan-0.7.2-babl-0.1.0-port.patch
@@ -0,0 +1,77 @@
+From 72bdbb12db5ca5284767d3011b1144bf142758e0 Mon Sep 17 00:00:00 2001
+From: Manuel Osdoba <manuel.osdoba@tu-ilmenau.de>
+Date: Sun, 21 Mar 2010 11:00:22 +0000
+Subject: Support Babl 0.1.0 as well
+
+---
+diff --git a/configure.ac b/configure.ac
+index 9880a0d..3b6cb4f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,6 +63,16 @@ PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 gobject-2.0 > 2.14 gtk+-2
+ AC_SUBST(GNOME_SCAN_CFLAGS)
+ AC_SUBST(GNOME_SCAN_LIBS)
+ 
++AC_MSG_CHECKING([gegl version >= 0.1.0])
++if pkg-config --modversion "gegl >= 0.1.0" > /dev/null 2>&1; then
++    AC_DEFINE(ENABLE_GEGL_010, 1, [Defined to 1 if we use GEGL version 0.1.0 or above.])
++    AC_MSG_RESULT([yes])
++else
++    AC_DEFINE(ENABLE_GEGL_010, 0, [Defined to 0 if we do not use GEGL version 0.1.0 or above.])
++    AC_MSG_RESULT([no])
++fi
++
++
+ MODULE_DIR=[${libdir}/${PACKAGE_NAME}-${API_VERSION}]
+ AC_SUBST(MODULE_DIR)
+ 
+diff --git a/modules/gsane/gsane-processor.c b/modules/gsane/gsane-processor.c
+index cb3526c..c129d18 100644
+--- a/modules/gsane/gsane-processor.c
++++ b/modules/gsane/gsane-processor.c
+@@ -22,6 +22,7 @@
+ #include "gsane-processor.h"
+ #include <string.h>
+ #include <math.h>
++#include <config.h>
+ 
+ typedef void (*GSaneProcessorFunc) (GSaneProcessor *self, guchar *buf, guint buf_len);
+ 
+@@ -118,7 +119,11 @@ gsane_processor_process_nbit(GSaneProcessor *self, guchar *buf, guint buf_len)
+ 				   operation */
+ 	guint src_pos;
+ 	guint offset;
++#if !ENABLE_GEGL_010	
+ 	guchar *src, *dest, *buf8 = g_new0(guchar, self->priv->pixels_in_buf * self->priv->format->format.bytes_per_pixel);
++#else
++	guchar *src, *dest, *buf8 = g_new0(guchar, self->priv->pixels_in_buf * babl_format_get_bytes_per_pixel(self->priv->format));
++#endif
+ 	guint samples_in_buf = self->priv->pixels_in_buf * self->priv->sample_count;
+ 	for (i = 0 ; i < samples_in_buf ; i++) {
+ 		/* compute the address of the first byte container sample value */
+@@ -180,7 +185,11 @@ gsane_processor_process_three_pass_8bit(GSaneProcessor *self, guchar *buf, guint
+ 		/* pos of pixel i in buf */
+ 		src_pos = i * self->priv->bytes_per_pixel;
+ 		/* pos of pixel i in buf3 */
++#if !ENABLE_GEGL_010
+ 		dest_pos = i * self->priv->format->format.bytes_per_pixel + self->priv->sample_offset;
++#else
++		dest_pos = i * babl_format_get_bytes_per_pixel(self->priv->format) + self->priv->sample_offset;
++#endif
+ 		/* save */
+ 		memcpy(buf3+dest_pos, buf+src_pos, self->priv->bytes_per_pixel);
+ 	}
+@@ -368,7 +377,11 @@ gsane_processor_prepare_image(GSaneProcessor *self, SANE_Parameters* params, gui
+ 	self->priv->format = gsane_processor_get_babl_format(self);
+ 	g_return_val_if_fail(self->priv->format, NULL);
+ 
++#if !ENABLE_GEGL_010
+ 	self->priv->sample_stride	= self->priv->format->format.bytes_per_pixel / MAX(self->priv->sample_count, self->priv->frame_count);
++#else
++	self->priv->sample_stride       = babl_format_get_bytes_per_pixel(self->priv->format) / MAX(self->priv->sample_count, self->priv->frame_count);
++#endif
+ 	self->priv->max_target_sample_value= (0xFFFFFFFF) >> (32 - self->priv->sample_stride * 8);
+ 
+ 	self->priv->buffer = gegl_buffer_new(&extent, self->priv->format);
+--
+cgit v0.9
diff --git a/media-gfx/gnome-scan/gnome-scan-0.7.2.ebuild b/media-gfx/gnome-scan/gnome-scan-0.7.2.ebuild
index e2b4b0417d32..a6090bda89f1 100644
--- a/media-gfx/gnome-scan/gnome-scan-0.7.2.ebuild
+++ b/media-gfx/gnome-scan/gnome-scan-0.7.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-scan/gnome-scan-0.7.2.ebuild,v 1.1 2011/04/01 10:39:56 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnome-scan/gnome-scan-0.7.2.ebuild,v 1.2 2011/04/01 10:47:22 nirbheek Exp $
 
 EAPI="3"
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="The Gnome Scan project aim to provide scan features every where in the desktop like print is."
 HOMEPAGE="http://www.gnome.org/projects/gnome-scan/index"
@@ -16,8 +16,8 @@ IUSE="debug doc"
 
 RDEPEND=">=x11-libs/gtk+-2.12:2
 	media-gfx/sane-backends
-	~media-libs/gegl-0.0.22
-	~media-libs/babl-0.0.22
+	>=media-libs/gegl-0.1.0
+	>=media-libs/babl-0.1.0
 	>=media-gfx/gimp-2.3
 	gnome-base/gconf:2"
 DEPEND="${RDEPEND}
@@ -36,6 +36,9 @@ pkg_setup() {
 src_prepare() {
 	sed -e 's/\(options_LDADD = $(LIBS)\)/\1 -lglib-2.0/g' \
 		-i lib/tests/Makefile.* || die
+	# Port to babl-0.1.0
+	epatch "${FILESDIR}/${P}-babl-0.1.0-port.patch"
+	eautoreconf
 	gnome2_src_prepare
 }