[weasel-commit] Source: gimp=2.6.8-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Wed, 09 Jun 2010 09:52:44 -0400
================================
gimp:source=2.6.8-1
cvc rdiff gimp -1 /weasel.rpath.org@wgl:3-devel/2.6.8-1
================================
2.6.8-1 Filip Brcic (brcha@xxxxxxxxxxxx) Wed Jun 9 09:36:42 2010
gimp 2.6.8
gimp-2.6.8-libpng-1.4.patch: new
--- /dev/null
+++ gimp-2.6.8-libpng-1.4.patch
@@ -0,0 +39 @@
+From b22eb0a8271a99257fe214cbf0adda29cf9a39dd Mon Sep 17 00:00:00 2001
+From: Michael Natterer <mitch@xxxxxxxx>
+Date: Sun, 31 Jan 2010 11:28:02 +0000
+Subject: Bug 607242 - GIMP 2.7.0 fails to build against libpng 1.4.0
+
+Use png_set_expand_gray_1_2_4_to_8() instead of the deprecated
+png_set_gray_1_2_4_to_8() if libpng is at least 1.2.27 (which is in
+debian stable), so plug-ins built against old versions contine to work
+when libpng 1.4 gets installed.
+---
+diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
+index 79512ae..4d894be 100644
+--- a/plug-ins/file-ico/ico-load.c
++++ b/plug-ins/file-ico/ico-load.c
+@@ -287,14 +287,22 @@ ico_read_png (FILE *fp,
+ switch (color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
++#if PNG_LIBPNG_VER < 10227
+ png_set_gray_1_2_4_to_8 (png_ptr);
++#else
++ png_set_expand_gray_1_2_4_to_8 (png_ptr);
++#endif
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
+ png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
++#if PNG_LIBPNG_VER < 10227
+ png_set_gray_1_2_4_to_8 (png_ptr);
++#else
++ png_set_expand_gray_1_2_4_to_8 (png_ptr);
++#endif
+ if ( bit_depth == 16 )
+ png_set_strip_16 (png_ptr);
+ png_set_gray_to_rgb (png_ptr);
+--
+cgit v0.8.3.1
gimp-2.6.8.tar.bz2: new
gimp.recipe: new
--- /dev/null
+++ gimp.recipe
@@ -0,0 +85 @@
+#
+# Copyright (c) 2010 Weasel GNU/Linux [Filip Brcic (brcha@xxxxxxxxxxxx)]
+# Distributed under the terms of the GNU General Public License v3
+#
+
+loadSuperClass('gnomepackage')
+class Gimp(GnomePackageRecipe):
+ name = 'gimp'
+ version = '2.6.8'
+
+ buildRequires = [
+ 'glib:devel', 'gtk:devel', 'pango:devel', 'freetype:devel',
+ 'fontconfig:devel', 'zlib:devel', 'libxml2:devel',
+ 'libxslt:devel', 'xdg-utils:runtime',
+ 'hicolor-icon-theme:data', 'gegl:devel', 'aalib:devel',
+ 'alsa-lib:devel', 'curl:devel', 'dbus-glib:devel',
+ 'hal:devel', 'gvfs:devel', 'webkit-gtk:devel',
+ 'libjpeg:devel', 'libexif:devel', 'lcms:devel',
+ 'libmng:devel', 'poppler:devel', 'libpng:devel',
+ 'python:devel', 'pygtk:devel', 'libtiff:devel',
+ 'librsvg:devel', 'libwmf:devel', 'pkg-config:devel',
+ 'intltool:runtime', 'perl-XML-Parser:perl', 'gettext:runtime',
+ 'dbus-glib:runtime', 'desktop-file-utils:runtime',
+ 'libXmu:devel', 'libXpm:devel', 'nbsmtp:runtime',
+ 'iso-codes:devellib', 'libX11:devel', 'libXcomposite:devel',
+ 'libXcursor:devel', 'libXdamage:devel', 'libXext:devel',
+ 'libXfixes:devel', 'libXi:devel', 'libXinerama:devel',
+ 'libXrandr:devel', 'libXrender:devel', 'xextproto:devel',
+ 'zlib:devel', 'gnutls:devel', 'shared-mime-info:devellib',
+ 'shared-mime-info:runtime',
+ ]
+
+ shortDesc = 'GNU Image Manipulation Program'
+ longDesc = """
+GIMP is the GNU Image Manipulation Program. It is a freely distributed
+piece of software for such tasks as photo retouching, image
+composition and image authoring. It works on many operating systems,
+in many languages.
+"""
+ url = 'http://www.gimp.org/'
+ licenses = [ 'GPL-2' ]
+ categories = [ 'Media/Graphics' ]
+
+ archConfig = ''
+
+ if Arch.x86.mmx or Arch.x86_64:
+ archConfig += ' --enable-mmx'
+ else:
+ archConfig += ' --disable-mmx'
+ if Arch.x86.sse or Arch.x86_64:
+ archConfig += ' --enable-sse'
+ else:
+ archConfig += ' --disable-sse'
+
+ extraConfig = (
+ ' --enable-default-binary'
+ ' --with-x'
+ ' --with-aa'
+ ' --with-alsa'
+ ' --disable-altivec'
+ ' --with-libcurl'
+ ' --with-dbus'
+ ' --with-hal'
+ ' --with-gvfs'
+ ' --without-gnomevfs'
+ ' --with-webkit'
+ ' --with-libjpeg'
+ ' --with-libexif'
+ ' --with-lcms'
+ ' --with-libmng'
+ ' --with-poppler'
+ ' --with-libpng'
+ ' --enable-python'
+ ' --with-librsvg'
+ ' --with-libtiff'
+ ' --with-wmf'
+ ' --enable-mp' # TODO: send to archConfig once I find smp use flag
+ + archConfig
+ )
+
+ def unpack(r):
+ r.macros.majorminor = '.'.join(r.version.split('.')[0:2])
+ r.addArchive('mirror://gimp/v%(majorminor)s/')
+
+ r.addPatch('gimp-2.6.8-libpng-1.4.patch')
Committed by: brcha
Other related posts:
