Stephan Kulow 2011-11-21 14:45:12 +00:00 committed by Git OBS Bridge
commit 0c80f6bc14
7 changed files with 46 additions and 58 deletions

11
docs-build-fix.diff Normal file
View File

@ -0,0 +1,11 @@
--- gegl-0.1.6/docs/Makefile.in.orig 2011-02-13 19:15:29.000000000 +0100
+++ gegl-0.1.6/docs/Makefile.in 2011-06-19 20:43:33.052542851 +0200
@@ -345,7 +345,7 @@ SUBDIRS = gallery
# The patterns used for html creation in the gegl build system
# is very small, and should probably be documented in a tutorial.
#
-gtkdochtmldir = $(DESTDIR)$(datadir)/gtk-doc/html/gegl
+gtkdochtmldir = $(datadir)/gtk-doc/html/gegl
HTML_FILES = operations.html class-hierarchy.html $(am__append_1) \
$(am__append_3) $(am__append_5)
GTKDOC_FILES = operations.html gegl.css gegl.devhelp $(am__append_2) \

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b64e619b460c4f4a746596b219d0bcb722068e3c4a00a30cc03201ca2118e113
size 3128704

3
gegl-0.1.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1
size 4118465

View File

@ -1,13 +0,0 @@
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

View File

@ -1,26 +0,0 @@
From 66d2ae5782d1d13224294ecf20e6f63680903550 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Mon, 22 Feb 2010 12:57:00 +0100
Subject: [PATCH] Use memcpy instead of strcpy to avoid buffer overflow
https://bugzilla.gnome.org/show_bug.cgi?id=610680
---
gegl/buffer/gegl-buffer-save.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gegl/buffer/gegl-buffer-save.c b/gegl/buffer/gegl-buffer-save.c
index 85c7894..aff175c 100644
--- a/gegl/buffer/gegl-buffer-save.c
+++ b/gegl/buffer/gegl-buffer-save.c
@@ -196,7 +196,7 @@ gegl_buffer_header_init (GeglBufferHeader *header,
gint bpp,
Babl* format)
{
- strcpy (header->magic, "GEGL");
+ memcpy (header->magic, "GEGL", 4);
header->flags = GEGL_FLAG_HEADER;
header->tile_width = tile_width;
--
1.6.6.1

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Mon Jun 20 09:42:30 UTC 2011 - jw@novell.com
- update to 0.1.6 (see NEWS)
• New operations: max-rgb, pixelise, motion blur.
• Fixed a bugs in matting-levin that made GEGL halt due to errors
detected by babl sanity code, this made 0.1.4 be unusable if you had
all dependendency when building.
• build/test improvements.
• Buffer:
Added API to use external tile backends, allowing to plug-in alien
tilebackends, for GIMP/Krita/OSM or similar.
- remove upstreamed patches bgo609706 bgo610680 (thanks, Vincent)
-------------------------------------------------------------------
Thu May 5 13:46:33 UTC 2011 - dimstar@opensuse.org

View File

@ -41,21 +41,18 @@ Obsoletes: %{name}-orig-addon
Provides: patched_subset
%endif
Url: http://gegl.org/
Version: 0.1.2
Version: 0.1.6
Release: 10
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-fix-build.patch bgo609706 vuntz@opensuse.org -- Remove unneeded printf, which fixes build
Patch0: gegl-fix-build.patch
# PATCH-FIX-UPSTREAM gegl-fix-overflow.patch bgo610680 vuntz@opensuse.org -- Fix overflow found by gcc 4.5
Patch1: gegl-fix-overflow.patch
Source: ftp://ftp.gimp.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
Patch2: docs-build-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libgegl-0_1-0 = %{version}-%{release}
%description
GEGL provides infratructure to do demand based cached non destructive
GEGL provides infrastructure 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.
@ -66,7 +63,7 @@ Summary: Generic Graphics Library
Group: System/Libraries
%description 0_1
GEGL provides infratructure to do demand based cached non destructive
GEGL provides infrastructure 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.
@ -81,7 +78,7 @@ Group: System/Libraries
Supplements: packageand(%{name}-0_1:%(cd %{_libdir} ; rpm -qf --queryformat=%%{NAME} `readlink %{_libdir}/libavcodec.so` ))
%description 0_1-orig-addon
GEGL provides infratructure to do demand based cached non destructive
GEGL provides infrastructure 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.
@ -96,7 +93,7 @@ Group: System/Libraries
Recommends: %{name}-0_1 >= %{version}
%description -n libgegl-0_1-0
GEGL provides infratructure to do demand based cached non destructive
GEGL provides infrastructure 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.
@ -120,20 +117,24 @@ Group: System/Libraries
Requires: libgegl-0_1-0 = %{version}
%description doc
GEGL provides infratructure to do demand based cached non destructive
GEGL provides infrastructure 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.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# docs-build-fix.diff
%patch2 -p1
%build
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
## do not use autogen.sh, it intentionally fails, if there is no ruby.
## so why use autogen, when you do not want portability?
# ./autogen.sh
%configure\
--enable-workshop=yes\
--disable-static
--disable-static --disable-silent-rules
make %{?jobs:-j%jobs}
%install
@ -146,7 +147,6 @@ for MODULE in \
done
%endif
find %{buildroot} -type f -name "*.la" -delete -print
chmod -x $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gegl/*.*
%post -n libgegl-0_1-0 -p /sbin/ldconfig
@ -186,6 +186,7 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root)
%{_datadir}/gtk-doc/html/gegl
%dir %{_datadir}/gtk-doc/html/gegl
%{_datadir}/gtk-doc/html/gegl/*
%changelog