Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=e2b49c51f9beb2d25cfc50c221978a67657db3eb
commit e2b49c51f9beb2d25cfc50c221978a67657db3eb
Author: bouleetbil <bouleet...@frogdev.info>
Date: Thu Apr 1 14:14:27 2010 +0200
gnome-scan-0.6.2-1-x86_64
*devel->stable
diff --git a/source/gnome-extra/gnome-scan/FrugalBuild
b/source/gnome-extra/gnome-scan/FrugalBuild
index d313ba6..5337327 100644
--- a/source/gnome-extra/gnome-scan/FrugalBuild
+++ b/source/gnome-extra/gnome-scan/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=gnome-scan
-pkgver=0.7.2
+pkgver=0.6.2
pkgrel=1
pkgdesc="Tools for scan easy in Gnome"
depends=('sane-backends' 'gconf>=2.28.0' 'gdk-pixbuf' 'gtk+2>=2.20.0'
'gegl>=0.0.22-2' 'libglade>=2.6.4-2'\
@@ -14,24 +14,23 @@ _F_gnome_desktop="y"
_F_gnome_iconcache="y"
Finclude gnome gnome-scriptlet
source=($source babl.diff)
-sha1sums=('7aae0aea20cf96d435897f4f97dc7f3141e411e1' \
- '9b0a6a0c3ffb7a749ac320fbb4c11740ead38f70')
-replaces=("gnome-scan-gimp")
+sha1sums=('ab1b77d9efa57294c57482c5f667175c2ccd1f78' \
+ '60c8b7148d29fac480551c620813af9153f5fa4b')
-#subpkgs=("gnome-scan-gimp")
-#subdescs=("$pkgname gimp integration")
-#subdepends=("gimp")
-#subrodepends=("gnome-scan")
-#subgroups=('gnome-extra')
-#subarchs=('i686 x86_64')
+subpkgs=("gnome-scan-gimp")
+subdescs=("$pkgname gimp integration")
+subdepends=("gimp")
+subrodepends=("gnome-scan")
+subgroups=('gnome-extra')
+subarchs=('i686 x86_64')
build() {
Fpatchall
Fautoreconf
Fmake
Fmakeinstall
- #Fsplit gnome-scan-gimp
usr/share/icons/hicolor/scalable/apps/flegita-gimp.svg
- #Fsplit gnome-scan-gimp usr/lib/gimp
+ Fsplit gnome-scan-gimp
usr/share/icons/hicolor/scalable/apps/flegita-gimp.svg
+ Fsplit gnome-scan-gimp usr/lib/gimp
Fbuild_gnome_scriptlet
}
diff --git a/source/gnome-extra/gnome-scan/babl.diff
b/source/gnome-extra/gnome-scan/babl.diff
index e8da52a..d3c5981 100644
--- a/source/gnome-extra/gnome-scan/babl.diff
+++ b/source/gnome-extra/gnome-scan/babl.diff
@@ -1,78 +1,80 @@
-From 72bdbb12db5ca5284767d3011b1144bf142758e0 Mon Sep 17 00:00:00 2001
-From: Manuel Osdoba <manuel.osd...@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)
+--- src/flegita-gimp-sink.c 2009-01-31 11:18:50.000000000 -0500
++++ src/flegita-gimp-sink.c.new 2010-01-15 09:20:56.300741963 -0500
+@@ -46,7 +46,7 @@
+ const GeglRectangle *extent;
+ GeglRectangle actual_extent;
+ gdouble res;
+- BablFormat *format;
++ Babl *format;
+ guint image_type;
+ GimpPixelRgn rgn;
+ gpointer iter;
+@@ -136,13 +136,13 @@
+ fgs_create_image(FlegitaGimpSink *sink)
+ {
+ FlegitaGimpSinkPrivate *priv = GET_PRIVATE (sink);
+- BablFormat *format = NULL;
++ Babl *format = NULL;
+ guint image_type = 0;
+ guint image_base_type = 0;
-+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)
+ g_object_get (priv->buffer, "format", &format, NULL);
-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>
+- switch (format->components) {
++ switch (babl_format_get_n_components(format)) {
+ case 1:
+ image_type = GIMP_GRAY_IMAGE;
+ image_base_type = GIMP_GRAY;
+@@ -164,17 +164,19 @@
- typedef void (*GSaneProcessorFunc) (GSaneProcessor *self, guchar *buf, guint
buf_len);
+ /* Compute babl format and update layer type according to image type
+ (not incomming gegl buffer type) */
+-static BablFormat*
++static Babl*
+ fgs_compute_babl_format(FlegitaGimpSink *sink)
+ {
+ FlegitaGimpSinkPrivate *priv = GET_PRIVATE (sink);
+- BablFormat *format = NULL;
++ Babl *format = NULL;
+ gchar*format_name = NULL;
+ gint i;
+ gint bps;
-@@ -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);
+ g_object_get (priv->buffer, "format", &format, NULL);
+- bps = format->type[0]->bits;
++ bps = 8;
++ if (babl_format_get_type (format, 0) != babl_type ("u8"))
++ bps = 16;
+
+ switch (gimp_image_base_type(sink->image_ID)) {
+ case GIMP_GRAY:
+@@ -187,16 +189,15 @@
+ break;
+ }
+
+- for (i = 0; i < format->components; i++) {
+- g_debug (G_STRLOC ": component %i:%s use %i bits",i,
+- format->type[i]->instance.name,
+- format->type[i]->bits);
++ for (i = 0; i < babl_format_get_n_components(format); i++) {
++ g_debug (G_STRLOC ": component %i:%s",i,
++ babl_get_name(babl_format_get_type(format,
i)));
}
-@@ -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);
+ format_name = g_strdup_printf ("%s u%i", format_name, bps > 8 ? 16 :
bps);
+
+ g_debug("Format is %s", format_name);
+
+- return (BablFormat*) babl_format (format_name);
++ return (Babl*) babl_format (format_name);
+ }
+
-+#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);
+@@ -278,7 +279,7 @@
+ FlegitaGimpSinkPrivate *priv = GET_PRIVATE (plugin);
+ GimpPixelRgn *rgn = &priv->rgn;
- self->priv->buffer = gegl_buffer_new(&extent, self->priv->format);
---
-cgit v0.8.3.1
-
+- gint chunk_size = rgn->w * rgn->h * priv->format->bytes_per_pixel;
++ gint chunk_size = rgn->w * rgn->h *
babl_format_get_bytes_per_pixel(priv->format);
+ GeglRectangle rect = {
+ .x = rgn->x + priv->extent->x,
+ .y = rgn->y + priv->extent->y,
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
