update to giflib-5.2.1
take a patch used in Fedora and Debian to reinstate GifQuantizeBuffer to the public api, which fixes a build issue in xplanet, and possible runtime issue in mono otherwise seen with giflib-5.2+
This commit is contained in:
sthen
parent
8fe4a45ba6
commit
dfe1fa3d41
|
|
@ -1,13 +1,9 @@
|
|||
COMMENT= tools and library routines for working with GIF images
|
||||
|
||||
DISTNAME= giflib-5.1.6
|
||||
SHARED_LIBS += gif 8.0 # 7.1
|
||||
DISTNAME= giflib-5.2.1
|
||||
SHARED_LIBS += gif 9.0 # 7.1
|
||||
CATEGORIES= graphics
|
||||
|
||||
# XXX broken tar.gz, symlinks to self - gtar copes
|
||||
TAR= ${LOCALBASE}/bin/gtar
|
||||
BUILD_DEPENDS= archivers/gtar
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=giflib/}
|
||||
|
||||
HOMEPAGE= http://giflib.sourceforge.net/
|
||||
|
|
@ -20,7 +16,7 @@ WANTLIB += c m
|
|||
USE_GMAKE= Yes
|
||||
CFLAGS+= -DHAVE_REALLOCARRAY
|
||||
MAKE_FLAGS= CC="${CC}" OFLAGS="${CFLAGS}" LIBVER="${LIBgif_VERSION}"
|
||||
FAKE_FLAGS= MANDIR="${PREFIX}/man/man1" LIBVER="${LIBgif_VERSION}"
|
||||
FAKE_FLAGS= MANDIR="${PREFIX}/man" LIBVER="${LIBgif_VERSION}"
|
||||
|
||||
BUILD_DEPENDS+= textproc/xmlto
|
||||
TEST_DEPENDS= sysutils/coreutils
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (giflib-5.1.6.tar.gz) = U5aPbTm7S5n1fMKYh6CaPKUA4ztp+yWe2vT2piLItXg=
|
||||
SIZE (giflib-5.1.6.tar.gz) = 391894
|
||||
SHA256 (giflib-5.2.1.tar.gz) = MdpVYvRMXxXWM0Cgmk/WK0jEViDNMC93ptms8Ad4eb0=
|
||||
SIZE (giflib-5.2.1.tar.gz) = 444187
|
||||
|
|
|
|||
|
|
@ -1,33 +1,56 @@
|
|||
hunk 1, disable -Wno-format-truncation, not available on some compilers?
|
||||
|
||||
hunk 2, move quantize.c back to exported library, it was in the public
|
||||
API prior to 5.2 and is used by various downstream users
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935088
|
||||
https://src.fedoraproject.org/rpms/giflib/c/109bf038d703a471b857aba44af673be103d7079?branch=master
|
||||
|
||||
hunk 3-4, library naming
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -9,7 +9,7 @@
|
||||
CC = gcc
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
OFLAGS = -O0 -g
|
||||
#OFLAGS = -O2 -fwhole-program
|
||||
OFLAGS = -O2
|
||||
-CFLAGS = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
|
||||
+CFLAGS = -std=gnu99 -fPIC -Wall $(OFLAGS)
|
||||
LDFLAGS = -g
|
||||
|
||||
SHELL = /bin/sh
|
||||
@@ -60,13 +60,13 @@ UTILS = $(INSTALLABLE) \
|
||||
TAR = tar
|
||||
@@ -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)
|
||||
|
||||
@@ -61,13 +61,13 @@ UTILS = $(INSTALLABLE) \
|
||||
|
||||
LDLIBS=libgif.a -lm
|
||||
|
||||
-all: libgif.so libgif.a $(UTILS)
|
||||
+all: libgif.so.$(LIBVER) libgif.a $(UTILS)
|
||||
-all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
|
||||
+all: libgif.so.${LIBVER} libgif.a libutil.so libutil.a $(UTILS)
|
||||
$(MAKE) -C doc
|
||||
|
||||
$(UTILS):: libgif.a
|
||||
$(UTILS):: libgif.a libutil.a
|
||||
|
||||
-libgif.so: $(OBJECTS) $(HEADERS)
|
||||
- $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so $(OBJECTS)
|
||||
- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
|
||||
+libgif.so.$(LIBVER): $(OBJECTS) $(HEADERS)
|
||||
+ $(CC) $(CFLAGS) -shared $(OFLAGS) -o libgif.so.$(LIBVER) $(OBJECTS)
|
||||
|
||||
libgif.a: $(OBJECTS) $(HEADERS)
|
||||
ar rcs libgif.a $(OBJECTS)
|
||||
@@ -92,9 +92,7 @@ install-include:
|
||||
$(AR) rcs libgif.a $(OBJECTS)
|
||||
@@ -99,9 +99,7 @@ install-include:
|
||||
install-lib:
|
||||
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
|
||||
$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
|
||||
|
|
@ -36,5 +59,5 @@ Index: Makefile
|
|||
- ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
|
||||
+ $(INSTALL) -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
|
||||
install-man:
|
||||
$(INSTALL) -d "$(DESTDIR)$(MANDIR)"
|
||||
$(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)"
|
||||
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
|
||||
$(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Index: tests/makefile
|
|||
do \
|
||||
stem=`basename $${test} | sed -e "s/.gif$$//"`; \
|
||||
if echo "Testing RGB rendering of $${test}" >&2; \
|
||||
@@ -103,10 +103,10 @@ giffilter-regress:
|
||||
@@ -104,10 +104,10 @@ giffilter-regress:
|
||||
|
||||
giffix-rebuild:
|
||||
@echo "Rebuilding giffix test."
|
||||
|
|
|
|||
|
|
@ -3,15 +3,11 @@
|
|||
@bin bin/gif2rgb
|
||||
@bin bin/gifbuild
|
||||
@bin bin/gifclrmp
|
||||
@bin bin/gifecho
|
||||
@bin bin/giffilter
|
||||
@bin bin/giffix
|
||||
@bin bin/gifinto
|
||||
@bin bin/gifsponge
|
||||
@bin bin/giftext
|
||||
@bin bin/giftool
|
||||
include/gif_lib.h
|
||||
lib/libgif.a
|
||||
@static-lib lib/libgif.a
|
||||
@lib lib/libgif.so.${LIBgif_VERSION}
|
||||
@man man/man1/gif2rgb.1
|
||||
@man man/man1/gifbg.1
|
||||
|
|
|
|||
Loading…
Reference in New Issue