Accepting request 30747 from graphics

Copy from graphics/gegl based on submit request 30747 from user coolo

OBS-URL: https://build.opensuse.org/request/show/30747
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gegl?expand=0&rev=9

gegl-new-babl.patch

@@ -0,0 +1,29 @@
+--- gegl/process/gegl-eval-visitor.c	2009-06-21 12:48:02.000000000 -0400
++++ gegl/process/gegl-eval-visitor.c.new	2010-01-24 20:57:51.928143015 -0500
+@@ -56,8 +56,6 @@
+ {
+ }
+ 
+-extern long babl_total_usecs;
+-
+ /* this is the visitor that does the real computations for GEGL */
+ static void
+ gegl_eval_visitor_visit_pad (GeglVisitor *self,
+@@ -83,17 +81,14 @@
+       else
+         {
+           glong time      = gegl_ticks ();
+-          glong babl_time = babl_total_usecs;
+ 
+           /* Make the operation do it's actual processing */
+           GEGL_NOTE (GEGL_DEBUG_PROCESS, "Processing pad '%s' on \"%s\"", gegl_pad_get_name (pad), gegl_node_get_debug_name (node));
+           gegl_operation_process (operation, context, gegl_pad_get_name (pad),
+                                   &context->result_rect);
+-          babl_time = babl_total_usecs - babl_time;
+           time      = gegl_ticks () - time;
+ 
+           gegl_instrument ("process", gegl_node_get_operation (node), time);
+-          gegl_instrument (gegl_node_get_operation (node), "babl", babl_time);
+         }
+     }
+   else if (gegl_pad_is_input (pad))

gegl.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 28 15:31:28 CET 2010 - vuntz@opensuse.org
+
+- Add gegl-new-babl.patch to fix build with babl 0.1.2.
+
 -------------------------------------------------------------------
 Mon Jul 20 13:24:19 CEST 2009 - vuntz@novell.com
 

gegl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gegl (Version 0.1.0)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,11 +42,13 @@ Provides:       patched_subset
 %endif
 Url:            http://gegl.org/
 Version:        0.1.0
-Release:        1
+Release:        2
-License:        GPL v3 or later ; LGPL v3 or later
+License:        GPLv3+ ; LGPLv3+
 Group:          System/Libraries
 Summary:        Generic Graphics Library
 Source:         ftp://ftp.gimp.org/pub/gegl/v0.0/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gegl-new-babl.patch vuntz@opensuse.org -- Fix build with latest babl, taken from Fedora
+Patch0:         gegl-new-babl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires libgegl-0_0-0 = %{version}-%{release}
 
@@ -95,7 +97,7 @@ Authors:
     Jakub Steiner
 
 %package 0_0
-License:        GPL v3 or later ; LGPL v3 or later
+License:        GPLv3+ ; LGPLv3+
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 
@@ -147,7 +149,7 @@ Authors:
 %if 0%{?BUILD_ORIG_ADDON}
 
 %package 0_0-orig-addon
-License:        GPL v3 or later ; LGPL v3 or later
+License:        GPLv3+ ; LGPLv3+
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 Supplements:    packageand(%{name}-0_0:%(cd %{_libdir} ; rpm -qf --queryformat=%%{NAME} `readlink %{_libdir}/libavcodec.so` ))
@@ -200,7 +202,7 @@ Authors:
 %endif
 
 %package -n libgegl-0_0-0
-License:        GPL v3 or later ; LGPL v3 or later
+License:        GPLv3+ ; LGPLv3+
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 Recommends:     %{name}-0_0 >= %{version}
@@ -250,7 +252,7 @@ Authors:
     Jakub Steiner
 
 %package devel
-License:        GPL v3 or later ; LGPL v3 or later
+License:        GPLv3+ ; LGPLv3+
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 Requires:       libgegl-0_0-0 = %{version} babl-devel glib2-devel glibc-devel pcre-devel
@@ -300,7 +302,7 @@ Authors:
     Jakub Steiner
 
 %package doc
-License:        GPL v3 or later ; LGPL v3 or later
+License:        GPLv3+ ; LGPLv3+
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 Requires:       libgegl-0_0-0 = %{version}
@@ -351,6 +353,7 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure\