diff --git a/gegl-0.1.0.tar.bz2 b/gegl-0.1.0.tar.bz2 deleted file mode 100644 index c73a1b4..0000000 --- a/gegl-0.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:430a79400041209d8bc42576c4d9f0c0a6e7564fdfe95ccd83f33ab7eaf238d5 -size 1342198 diff --git a/gegl-0.1.2.tar.bz2 b/gegl-0.1.2.tar.bz2 new file mode 100644 index 0000000..e227938 --- /dev/null +++ b/gegl-0.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b64e619b460c4f4a746596b219d0bcb722068e3c4a00a30cc03201ca2118e113 +size 3128704 diff --git a/gegl-fix-build.patch b/gegl-fix-build.patch new file mode 100644 index 0000000..0f06e73 --- /dev/null +++ b/gegl-fix-build.patch @@ -0,0 +1,13 @@ +Index: gegl-0.1.2/operations/workshop/mirrors.c +=================================================================== +--- gegl-0.1.2.orig/operations/workshop/mirrors.c ++++ gegl-0.1.2/operations/workshop/mirrors.c +@@ -232,8 +232,6 @@ apply_mirror (double mirror_angle, + + + +- printf ("> mirror marker 3: src: (%f,%f)-> (%d,%d)\n", cx, cy, col,row); +- + #ifndef DO_NOT_USE_BUFFER_SAMPLE + gegl_buffer_sample (src, cx, cy, 1.0, &dst_buf[(row * roi->width + col) * 4], format, GEGL_INTERPOLATION_LINEAR); + #endif diff --git a/gegl-new-babl.patch b/gegl-new-babl.patch deleted file mode 100644 index 837f9bb..0000000 --- a/gegl-new-babl.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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)) diff --git a/gegl.changes b/gegl.changes index 5e313f2..a3c4d52 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed Feb 10 23:42:49 CET 2010 - vuntz@opensuse.org + +- Update to version 0.1.2: + + GeglLookup, configurable floating point lookup tables for lazy + computation. + + Use GFileIOStream in GeglTileBackendFile. + + Optimizations: in-place processing for point filters/composers, + SIMD version of gegl:opacity, avoid making unneccesary + sub-buffers, removed some manual instrumentation from critical + paths, improved speed of samplers. + + Added xml composition/reference image based regression tests. + + Added performance tracking framework. + + Syntactic sugar using varargs for constructing gegl graphs from + C. + + Build fixes on cygwin. + + Gegl# fixes. + + Initial, but unstable code towards multithreading. + + Improvements to lua op in workshop. + + Added new resamplers upsize, upsharp, upsmooth, downsize, + downsharp and downsmooth. + + Removed gegl:tonemap and gegl:normal ops. +- Drop gegl-new-babl.patch: fixed upstream. +- Add gegl-fix-build.patch: remove printf that breaks build because + of missing include. +- Rename package from gegl-0_0 and libgegl-0_0-0 to gegl-0_1 and + libgegl-0_1-0 following soname bump. + ------------------------------------------------------------------- Thu Jan 28 15:31:28 CET 2010 - vuntz@opensuse.org diff --git a/gegl.spec b/gegl.spec index 37ab8af..a5ac1bc 100644 --- a/gegl.spec +++ b/gegl.spec @@ -1,5 +1,5 @@ # -# spec file for package gegl (Version 0.1.0) +# spec file for package gegl (Version 0.1.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,16 +41,16 @@ Obsoletes: %{name}-orig-addon Provides: patched_subset %endif Url: http://gegl.org/ -Version: 0.1.0 -Release: 2 +Version: 0.1.2 +Release: 1 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 +# PATCH-FIX-UPSTREAM gegl-fix-build.patch bgo609706 vuntz@opensuse.org -- Remove unneeded printf, which fixes build +Patch0: gegl-fix-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define debug_package_requires libgegl-0_0-0 = %{version}-%{release} +%define debug_package_requires libgegl-0_1-0 = %{version}-%{release} %description GEGL provides infratructure to do demand based cached non destructive @@ -58,204 +58,52 @@ image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output. - - -Authors: --------- - Calvin Williamson - Caroline Dahloff - Manish Singh - Jay Cox Daniel Rogers - Sven Neumann - Michael Natterer - Øyvind Kolås - Philip Lafleur - Dominik Ernst - Richard Kralovic - Kevin Cozens - Victor Bogado - Martin Nordholts - Geert Jordaens - Michael Schumacher - John Marshall - Étienne Bersac - Mark Probst - Håkon Hitland - Tor Lillqvist - Hans Breuer - Deji Akingunola - Bradley Broom - Hans Petter Jansson - Jan Heller - dmacks@netscpace.org - Sven Anders - Hubert Figuiere - Garry R. Osgood - Øyvind Kolås - Kevin Cozens - Shlomi Fish - Jakub Steiner - -%package 0_0 +%package 0_1 License: GPLv3+ ; LGPLv3+ Summary: Generic Graphics Library Group: System/Libraries -%description 0_0 +%description 0_1 GEGL provides infratructure to do demand based cached non destructive image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output. - - -Authors: --------- - Calvin Williamson - Caroline Dahloff - Manish Singh - Jay Cox Daniel Rogers - Sven Neumann - Michael Natterer - Øyvind Kolås - Philip Lafleur - Dominik Ernst - Richard Kralovic - Kevin Cozens - Victor Bogado - Martin Nordholts - Geert Jordaens - Michael Schumacher - John Marshall - Étienne Bersac - Mark Probst - Håkon Hitland - Tor Lillqvist - Hans Breuer - Deji Akingunola - Bradley Broom - Hans Petter Jansson - Jan Heller - dmacks@netscpace.org - Sven Anders - Hubert Figuiere - Garry R. Osgood - Øyvind Kolås - Kevin Cozens - Shlomi Fish - Jakub Steiner - %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} -%package 0_0-orig-addon +%package 0_1-orig-addon 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` )) +Supplements: packageand(%{name}-0_1:%(cd %{_libdir} ; rpm -qf --queryformat=%%{NAME} `readlink %{_libdir}/libavcodec.so` )) -%description 0_0-orig-addon +%description 0_1-orig-addon GEGL provides infratructure to do demand based cached non destructive image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output. - - -Authors: --------- - Calvin Williamson - Caroline Dahloff - Manish Singh - Jay Cox Daniel Rogers - Sven Neumann - Michael Natterer - Øyvind Kolås - Philip Lafleur - Dominik Ernst - Richard Kralovic - Kevin Cozens - Victor Bogado - Martin Nordholts - Geert Jordaens - Michael Schumacher - John Marshall - Étienne Bersac - Mark Probst - Håkon Hitland - Tor Lillqvist - Hans Breuer - Deji Akingunola - Bradley Broom - Hans Petter Jansson - Jan Heller - dmacks@netscpace.org - Sven Anders - Hubert Figuiere - Garry R. Osgood - Øyvind Kolås - Kevin Cozens - Shlomi Fish - Jakub Steiner - %endif %endif -%package -n libgegl-0_0-0 +%package -n libgegl-0_1-0 License: GPLv3+ ; LGPLv3+ Summary: Generic Graphics Library Group: System/Libraries -Recommends: %{name}-0_0 >= %{version} +Recommends: %{name}-0_1 >= %{version} -%description -n libgegl-0_0-0 +%description -n libgegl-0_1-0 GEGL provides infratructure to do demand based cached non destructive image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output. - - -Authors: --------- - Calvin Williamson - Caroline Dahloff - Manish Singh - Jay Cox Daniel Rogers - Sven Neumann - Michael Natterer - Øyvind Kolås - Philip Lafleur - Dominik Ernst - Richard Kralovic - Kevin Cozens - Victor Bogado - Martin Nordholts - Geert Jordaens - Michael Schumacher - John Marshall - Étienne Bersac - Mark Probst - Håkon Hitland - Tor Lillqvist - Hans Breuer - Deji Akingunola - Bradley Broom - Hans Petter Jansson - Jan Heller - dmacks@netscpace.org - Sven Anders - Hubert Figuiere - Garry R. Osgood - Øyvind Kolås - Kevin Cozens - Shlomi Fish - Jakub Steiner - %package devel License: GPLv3+ ; LGPLv3+ Summary: Generic Graphics Library Group: System/Libraries -Requires: libgegl-0_0-0 = %{version} babl-devel glib2-devel glibc-devel pcre-devel +Requires: libgegl-0_1-0 = %{version} babl-devel glib2-devel glibc-devel pcre-devel %description devel GEGL provides infratructure to do demand based cached non destructive @@ -263,49 +111,11 @@ image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output. - - -Authors: --------- - Calvin Williamson - Caroline Dahloff - Manish Singh - Jay Cox Daniel Rogers - Sven Neumann - Michael Natterer - Øyvind Kolås - Philip Lafleur - Dominik Ernst - Richard Kralovic - Kevin Cozens - Victor Bogado - Martin Nordholts - Geert Jordaens - Michael Schumacher - John Marshall - Étienne Bersac - Mark Probst - Håkon Hitland - Tor Lillqvist - Hans Breuer - Deji Akingunola - Bradley Broom - Hans Petter Jansson - Jan Heller - dmacks@netscpace.org - Sven Anders - Hubert Figuiere - Garry R. Osgood - Øyvind Kolås - Kevin Cozens - Shlomi Fish - Jakub Steiner - %package doc License: GPLv3+ ; LGPLv3+ Summary: Generic Graphics Library Group: System/Libraries -Requires: libgegl-0_0-0 = %{version} +Requires: libgegl-0_1-0 = %{version} %description doc GEGL provides infratructure to do demand based cached non destructive @@ -313,47 +123,9 @@ image editing on larger than RAM buffers. Through babl it provides support for a wide range of color models and pixel storage formats for input and output. - - -Authors: --------- - Calvin Williamson - Caroline Dahloff - Manish Singh - Jay Cox Daniel Rogers - Sven Neumann - Michael Natterer - Øyvind Kolås - Philip Lafleur - Dominik Ernst - Richard Kralovic - Kevin Cozens - Victor Bogado - Martin Nordholts - Geert Jordaens - Michael Schumacher - John Marshall - Étienne Bersac - Mark Probst - Håkon Hitland - Tor Lillqvist - Hans Breuer - Deji Akingunola - Bradley Broom - Hans Petter Jansson - Jan Heller - dmacks@netscpace.org - Sven Anders - Hubert Figuiere - Garry R. Osgood - Øyvind Kolås - Kevin Cozens - Shlomi Fish - Jakub Steiner - %prep %setup -q -%patch0 -p0 +%patch0 -p1 %build %configure\ @@ -365,7 +137,7 @@ make %{?jobs:-j%jobs} %makeinstall %if ! 0%{?BUILD_ORIG} for MODULE in \ -%{_libdir}/gegl-0.0/ff-load.so \ +%{_libdir}/gegl-0.1/ff-load.so \ ; do rm -f $RPM_BUILD_ROOT$MODULE done @@ -373,9 +145,9 @@ done find %{buildroot} -type f -name "*.la" -delete -print chmod -x $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gegl/*.* -%post -n libgegl-0_0-0 -p /sbin/ldconfig +%post -n libgegl-0_1-0 -p /sbin/ldconfig -%postun -n libgegl-0_0-0 -p /sbin/ldconfig +%postun -n libgegl-0_1-0 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -384,21 +156,21 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/* -%files 0_0 +%files 0_1 %defattr(-,root,root) -%dir %{_libdir}/gegl-0.0 -%{_libdir}/gegl-0.0/*.so +%dir %{_libdir}/gegl-0.1 +%{_libdir}/gegl-0.1/*.so %if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG_ADDON} -%exclude %{_libdir}/gegl-0.0/ff-load.so +%exclude %{_libdir}/gegl-0.1/ff-load.so -%files 0_0-orig-addon +%files 0_1-orig-addon %defattr(-,root,root) -%{_libdir}/gegl-0.0/ff-load.so +%{_libdir}/gegl-0.1/ff-load.so %endif %endif -%files -n libgegl-0_0-0 +%files -n libgegl-0_1-0 %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LESSER ChangeLog NEWS README %{_libdir}/*.so.*