Port to babl/gegl-0.1.0

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 89 insertions, 5 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/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
 }