giflib:ver.bump

2019-09-30 21:52:32 +03:00
parent 9fec0d9e43
commit 13e642eca8
4 changed files with 110 additions and 11 deletions
@@ -7,21 +7,34 @@
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import libtools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get

-def setup():
-    libtools.libtoolize("--force --install")
-    autotools.autoreconf("-fi")
-    
-    autotools.configure("--disable-static")

-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+def setup():
+    shelltools.copytree("../giflib-%s" % (get.srcVERSION().replace("_", "~")), "../giflib-%s-32" % get.srcVERSION())
+    #libtools.libtoolize("--force --install")
+    #autotools.autoreconf("-fi")
+    
+    #autotools.configure("--disable-static")
+
+    #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")

 def build():
    autotools.make("-j1")
+    shelltools.cd("../giflib-%s-32" % get.srcVERSION())
+    shelltools.export("CC", "gcc -m32")
+    shelltools.export("CXX", "g++ -m32")
+    autotools.make("-j1")

 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    autotools.rawInstall("PREFIX=/usr DESTDIR=%s" % get.installDIR())
+    shelltools.cd("../giflib-%s-32" % get.srcVERSION())
+    autotools.rawInstall("PREFIX=/usr LIBDIR=/usr/lib32 BINDIR=/usr/emul32 DESTDIR=%s" % get.installDIR())
+    
+    pisitools.removeDir("/usr/emul32")
+    pisitools.remove("/usr/lib/libgif.a")
+    pisitools.remove("/usr/lib32/libgif.a")

    pisitools.dohtml("doc/")
-    pisitools.dodoc("AUTHORS","BUGS","ChangeLog","NEWS","doc/*.txt")
+    pisitools.dodoc("ChangeLog","NEWS")
@@ -0,0 +1,32 @@
+From ff8d9a59e79b79657e64430730c35835a84db619 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Tue, 2 Apr 2019 11:46:18 +0200
+Subject: [PATCH] fix missing quantize API symbols
+
+GifQuantizeBuffer is required by many libs and applications
+like mplayer, libgdiplus (mono) and others.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4ded69..17d0a5c 100644
+--- a/Makefile
+++ b/Makefile
+@@ -29,11 +29,11 @@ LIBPOINT=0
+ LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
+ 
+ SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \
+-	gif_hash.c openbsd-reallocarray.c
+	gif_hash.c openbsd-reallocarray.c quantize.c
+ HEADERS = gif_hash.h  gif_lib.h  gif_lib_private.h
+ OBJECTS = $(SOURCES:.c=.o)
+ 
+-USOURCES = qprintf.c quantize.c getarg.c 
+USOURCES = qprintf.c getarg.c
+ UHEADERS = getarg.h
+ UOBJECTS = $(USOURCES:.c=.o)
+ 
+-- 
+2.21.0
+
@@ -0,0 +1,43 @@
+From 788a52c399f4731ac1fb27a49db48626f3e140e1 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Tue, 2 Apr 2019 14:53:28 +0200
+Subject: [PATCH] respect existence of distro CFLAGS and CPPFLAGS
+
+- append CFLAGS instead of set to honor default distro CFLAGS
+- add CPPFLAGS that are defined by distros
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e4ded69..7fef84a 100644
+--- a/Makefile
+++ b/Makefile
+@@ -8,7 +8,7 @@
+ #
+ OFLAGS = -O0 -g
+ OFLAGS  = -O2
+-CFLAGS  = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
+CFLAGS  += -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
+ 
+ SHELL = /bin/sh
+ TAR = tar
+@@ -68,13 +68,13 @@ all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
+ $(UTILS):: libgif.a libutil.a
+ 
+ libgif.so: $(OBJECTS) $(HEADERS)
+-	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+ 
+ libgif.a: $(OBJECTS) $(HEADERS)
+ 	$(AR) rcs libgif.a $(OBJECTS)
+ 
+ libutil.so: $(UOBJECTS) $(UHEADERS)
+-	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS)
+ 
+ libutil.a: $(UOBJECTS) $(UHEADERS)
+ 	$(AR) rcs libutil.a $(UOBJECTS)
+-- 
+2.21.0
+
@@ -12,12 +12,16 @@
        <IsA>library</IsA>
        <Summary>Library to handle, display and manipulate GIF images</Summary>
        <Description>The giflib package contains a shared library of functions for loading and saving GIF format image files. It is API and ABI compatible with libungif, the library which supported uncompressed GIFs while the Unisys LZW patent was in effect.</Description>
-        <Archive sha1sum="5f1157cfc377916280849e247b8e34fa0446513f" type="tarbz2">mirrors://sourceforge/giflib/giflib-5.1.4.tar.bz2</Archive>
+        <Archive sha1sum="c3f774dcbdf26afded7788979c8081d33c6426dc" type="targz">mirrors://sourceforge/giflib/giflib-5.2.1.tar.gz</Archive>
        <BuildDependencies>
            <!--<Dependency>libXt-devel</Dependency>
            <Dependency>libSM-devel</Dependency>
            <Dependency>libICE-devel</Dependency>-->
        </BuildDependencies>
+        <Patches>
+            <Patch level="1">giflib-5.1.9-fix-missing-quantize-API-symbols.patch</Patch>
+            <Patch level="1">giflib-5.1.9-make-flags.patch</Patch>
+        </Patches>
    </Source>

    <Package>
@@ -43,9 +47,9 @@

    <Package>
        <Name>giflib-32bit</Name>
-        <PartOf>emul32</PartOf>
+<!--         <PartOf>emul32</PartOf> -->
        <Summary>32-bit shared libraries for giflib</Summary>
-        <BuildType>emul32</BuildType>
+<!--         <BuildType>emul32</BuildType> -->
        <BuildDependencies>
            <!--<Dependency>libXt-32bit</Dependency>
            <Dependency>libSM-32bit</Dependency>
@@ -60,6 +64,13 @@
    </Package>

    <History>
+        <Update release="6">
+            <Date>2019-09-30</Date>
+            <Version>5.2.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
        <Update release="5">
            <Date>2018-07-28</Date>
            <Version>5.1.4</Version>