[weasel-commit] Source: giflib=4.1.6-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Thu, 14 Jan 2010 17:29:01 -0500
================================
giflib:source=4.1.6-2 (previous: 4.1.6-1)
cvc rdiff giflib -1 /weasel.rpath.org@wgl:3-devel/4.1.6-2
================================
4.1.6-2 Filip Brcic (brcha@xxxxxxx) Thu Jan 14 17:28:52 2010
fixed recipe + metadata
giflib-4.1.6-giffix-null-Extension-fix.patch: new
--- /dev/null
+++ giflib-4.1.6-giffix-null-Extension-fix.patch
@@ -0,0 +15 @@
+diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c
+--- giflib-4.1.6/util/giffix.c 2005-10-09 23:22:23.000000000 -0700
++++ giflib-4.1.6.new/util/giffix.c 2008-09-04 14:00:41.000000000 -0700
+@@ -181,8 +181,8 @@
+ /* Skip any extension blocks in file: */
+ if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) ==
GIF_ERROR)
+ QuitGifError(GifFileIn, GifFileOut);
+- if (EGifPutExtension(GifFileOut, ExtCode, Extension[0],
+- Extension) == GIF_ERROR)
++ if (Extension && EGifPutExtension(GifFileOut, ExtCode,
++ Extension[0], Extension) == GIF_ERROR)
+ QuitGifError(GifFileIn, GifFileOut);
+
+ /* No support to more than one extension blocks, so discard: */
+
giflib.recipe: changed
Index: giflib.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- giflib.recipe /weasel.rpath.org@wgl:3-devel/4.1.6-1
+++ giflib.recipe /weasel.rpath.org@wgl:3-devel/4.1.6-2
@@ -1,10 +1,9 @@
#
-# Copyright (c) 2004-2006 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
-class GifLib(AutoPackageRecipe):
+class Giflib(AutoPackageRecipe):
name = 'giflib'
version = '4.1.6'
@@ -12,15 +11,19 @@
'libICE:devel', 'libSM:devel', 'libX11:devel',
]
+ shortDesc = 'GIF format library'
+ longDesc = 'Library to handle, display and manipulate GIF images'
+ url = 'http://sourceforge.net/projects/giflib/'
+ licenses = [ 'MIT' ]
+ categories = [ 'Media/Libraries' ]
+
def unpack(r):
r.addArchive('mirror://sourceforge/giflib/')
+ r.addPatch('giflib-4.1.6-gif2rle.patch')
+ r.addPatch('giflib-4.1.6-giffix-null-Extension-fix.patch')
- if Arch.x86_64:
- # First build 32bit library
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
- r.Configure(objDir='build32', overrideMacros=macros32)
- r.Make(dir='build32', overrideMacros=macros32)
- r.MakeInstall(dir='build32', overrideMacros=macros32)
+ def configure(r):
+ r.Configure(
+ ' --disable-gl --enable-x11'
+ ' --disable-rle' # reenable once urt is built
+ )
giflib-4.1.6-gif2rle.patch: new
--- /dev/null
+++ giflib-4.1.6-gif2rle.patch
@@ -0,0 +18 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304
+
+--- giflib/util/gif2rle.c
++++ giflib/util/gif2rle.c
+@@ -222,11 +222,8 @@
+ ColorMap = (GifFile->Image.ColorMap ?
+ GifFile->Image.ColorMap->Colors :
+ GifFile->SColorMap->Colors);
+- if (ColorMap == NULL) {
+- fprintf(stderr, "Gif Image does not have a colormap\n");
+- exit(EXIT_FAILURE);
+- }
+- ColorMapSize = 1 << ColorMap->BitsPerPixel;
++ ColorMapSize = 1 << (GifFile->Image.ColorMap ?
GifFile->Image.ColorMap->BitsPerPixel :
++
GifFile->SColorMap->BitsPerPixel);
+ DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
+
+ if (DGifCloseFile(GifFile) == GIF_ERROR) {
Committed by: brcha
Other related posts:
