rpms/gegl/devel gegl-babl-instrumentation.patch, NONE, 1.1 gegl.spec, 1.23, 1.24

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/gegl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13635

Modified Files:
	gegl.spec 
Added Files:
	gegl-babl-instrumentation.patch 
Log Message:
Add patch to allow build with newer babl


gegl-babl-instrumentation.patch:
 gegl-eval-visitor.c |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE gegl-babl-instrumentation.patch ---
--- 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))


Index: gegl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gegl/devel/gegl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- gegl.spec	23 Jan 2010 11:16:02 -0000	1.23
+++ gegl.spec	25 Jan 2010 02:49:54 -0000	1.24
@@ -12,6 +12,7 @@ Source0:	ftp://ftp.gtk.org/pub/gegl/0.1/
 Patch0:		gegl-0.1.0-cflags.patch
 # don't run autoreconf while building
 Patch1:		gegl-0.1.0-autoreconf.patch.bz2
+Patch2:		gegl-babl-instrumentation.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc
 BuildRequires:	babl-devel >= 0.1.0
@@ -56,6 +57,7 @@ developing with %{name}.
 chmod -x operations/external/ff-load.c operations/common/perlin/perlin.*
 %patch0 -p1 -b .cflags
 %patch1 -p1 -b .autoreconf
+%patch2 -p0 -b .babl
 
 %build
 %configure				\
@@ -108,8 +110,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
-* Sat Jan 23 2010 Deji Akingunola <dakingun at gmail.com> - 0.6.2-4
+* Sat Jan 23 2010 Deji Akingunola <dakingun at gmail.com> - 0.1.0-3
 - Rebuild for babl-0.1.2
+- Backport upstream patch that removed babl processing time instrumentation
 
 * Wed Jan 20 2010 Nils Philippsen <nils at redhat.com>
 - use tabs consistently to appease rpmdiff