summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch43
-rw-r--r--001-mingw-build.patch83
-rw-r--r--PKGBUILD19
-rw-r--r--giflib-5.1.9-fix-missing-quantize-API-symbols.patch32
-rw-r--r--giflib_quantize.patch17
6 files changed, 77 insertions, 135 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 78ed82d4ca46..ab1571f7cdd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,24 @@
pkgbase = mingw-w64-giflib
pkgdesc = A library for reading and writing gif images (mingw-w64)
- pkgver = 5.2.1
- pkgrel = 5
+ pkgver = 5.2.2
+ pkgrel = 1
url = http://sourceforge.net/projects/giflib/
arch = any
license = MIT
makedepends = xmlto
makedepends = docbook-xsl
+ makedepends = imagemagick
makedepends = mingw-w64-make
depends = mingw-w64-crt
options = staticlibs
options = !strip
options = !buildflags
options = !makeflags
- source = https://downloads.sourceforge.net/project/giflib/giflib-5.2.1.tar.gz
- source = giflib-5.1.9-fix-missing-quantize-API-symbols.patch
+ source = https://downloads.sourceforge.net/project/giflib/giflib-5.2.2.tar.gz
source = 001-mingw-build.patch
- source = 0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch
- sha512sums = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
- sha512sums = 5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3
- sha512sums = 3b5d5937162d9a3c1076cdc58a803a8881b264c65aa8d33e9592c43dc1686724fce280e8b56ed2751a6bf8a5c75ed9d887c31a042bc9e0a15c1697ea0b2fedc9
- sha512sums = 2b0eb1a5d1a3ff8270018f7cfbe87d902bca3e2105315c4169f4c7859dd37aac0c34dc27008ee2dc2acaa52375ffda260d5318a5c065b1ba51e7aed9f4ca3356
+ source = giflib_quantize.patch
+ sha512sums = 0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f
+ sha512sums = a2b0e76039c38cdc2006548f2249ff0274bc6d4b1b8f35f89b3eeba5244893624f73fab17e77de13f3b8d86ddb2a077355ce2211bd5643087591b80c0df0796b
+ sha512sums = 7e3e200e7e42e8c4622db2b28c29b623171d72f417230a28614ef01f1a2b0cc49c5e8ba06229c3d84fe4fe2a2f5303cd4af2f722dceef3540d099d05c46b2169
pkgname = mingw-w64-giflib
-
diff --git a/0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch b/0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch
deleted file mode 100644
index 1414b6cf8641..000000000000
--- a/0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 8dffb43..74d5b61 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
-@@ -67,13 +67,13 @@ all: libgif-$(LIBMAJOR).dll libgif.a libutil-$(LIBMAJOR).dll libutil.a $(UTILS)
- $(UTILS):: libgif.a libutil.a
-
- libgif-$(LIBMAJOR).dll: $(OBJECTS) $(HEADERS)
-- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libgif.dll.a -o libgif-$(LIBMAJOR).dll $(OBJECTS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libgif.dll.a -o libgif-$(LIBMAJOR).dll $(OBJECTS)
-
- libgif.a: $(OBJECTS) $(HEADERS)
- $(AR) rcs libgif.a $(OBJECTS)
-
- libutil-$(LIBMAJOR).dll: $(UOBJECTS) $(UHEADERS)
-- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libutil.dll.a -o libutil-$(LIBMAJOR).dll $(UOBJECTS) -L. -lgif
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libutil.dll.a -o libutil-$(LIBMAJOR).dll $(UOBJECTS) -L. -lgif
-
- libutil.a: $(UOBJECTS) $(UHEADERS)
- $(AR) rcs libutil.a $(UOBJECTS)
---
-2.22.0
-
diff --git a/001-mingw-build.patch b/001-mingw-build.patch
index 412c4b4ce2b4..109434a6394a 100644
--- a/001-mingw-build.patch
+++ b/001-mingw-build.patch
@@ -1,57 +1,62 @@
---- giflib-5.1.9/Makefile.orig 2019-06-10 11:06:10.797407400 +0300
-+++ giflib-5.1.9/Makefile 2019-06-10 11:10:11.917745000 +0300
-@@ -62,27 +62,25 @@
-
- LDLIBS=libgif.a -lm
-
--all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
-+all: libgif-$(LIBMAJOR).dll libgif.a libutil-$(LIBMAJOR).dll libutil.a $(UTILS)
- $(MAKE) -C doc
-
- $(UTILS):: libgif.a libutil.a
-
--libgif.so: $(OBJECTS) $(HEADERS)
-- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
-+libgif-$(LIBMAJOR).dll: $(OBJECTS) $(HEADERS)
-+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libgif.dll.a -o libgif-$(LIBMAJOR).dll $(OBJECTS)
+--- giflib-5.2.2/Makefile.orig 2024-02-19 02:01:50.000000000 +0100
++++ giflib-5.2.2/Makefile 2024-02-20 23:05:57.574482400 +0100
+@@ -86,6 +86,12 @@
+ LIBUTILSO = libutil.$(SOEXTENSION)
+ LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION)
+ endif
++SOEXTENSION = dll
++LIBGIFSO = libgif-$(LIBMAJOR).$(SOEXTENSION)
++LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
++LIBGIFSOVER = libgif.$(SOEXTENSION).$(LIBVER)
++LIBUTILSO = libutil-$(LIBMAJOR).$(SOEXTENSION)
++LIBUTILSOMAJOR = libutil.$(SOEXTENSION).$(LIBMAJOR)
+
+ all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS)
+ ifeq ($(UNAME), Darwin)
+@@ -99,7 +105,7 @@
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBGIFSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libgif.$(SOEXTENSION).a -o $(LIBGIFSO) $(OBJECTS)
+ endif
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)
-+libutil-$(LIBMAJOR).dll: $(UOBJECTS) $(UHEADERS)
-+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libutil.dll.a -o libutil-$(LIBMAJOR).dll $(UOBJECTS) -L. -lgif
+@@ -109,7 +115,7 @@
+ ifeq ($(UNAME), Darwin)
+ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
+ else
+- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,--out-implib,libutil.$(SOEXTENSION).a -o $(LIBUTILSO) $(UOBJECTS) -L. -lgif
+ endif
libutil.a: $(UOBJECTS) $(UHEADERS)
- $(AR) rcs libutil.a $(UOBJECTS)
-
- clean:
-- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o
-- rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT)
-- rm -f libgif.so.$(LIBMAJOR)
-+ rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif-$(LIBMAJOR).dll libgif.dll.a libutil.a libutil-$(LIBMAJOR).dll libutil.dll.a *.o
+@@ -119,6 +125,7 @@
+ rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o
+ rm -f $(LIBGIFSOVER)
+ rm -f $(LIBGIFSOMAJOR)
++ rm -f libgif.$(SOEXTENSION).a libutil.$(SOEXTENSION).a
rm -fr doc/*.1 *.html doc/staging
check: all
-@@ -100,9 +98,8 @@
+@@ -144,9 +151,8 @@
install-lib:
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
-- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
-- ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
-- ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
+- $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
+- ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
+- ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
+ $(INSTALL) -m 644 libgif.dll.a "$(DESTDIR)$(LIBDIR)/libgif.dll.a"
-+ $(INSTALL) -m 755 libgif-$(LIBMAJOR).dll "$(DESTDIR)$(BINDIR)/libgif-$(LIBMAJOR).dll"
++ $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(BINDIR)/$(LIBGIFSO)"
install-man:
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
- $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"
-@@ -113,7 +110,7 @@
+ $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
+@@ -157,7 +163,7 @@
rm -f "$(DESTDIR)$(INCDIR)/gif_lib.h"
uninstall-lib:
cd "$(DESTDIR)$(LIBDIR)" && \
-- rm -f libgif.a libgif.so libgif.so.$(LIBMAJOR) libgif.so.$(LIBVER)
-+ rm -f libgif.a libgif-$(LIBMAJOR).dll libgif.dll.a
+- rm -f libgif.a $(LIBGIFSO) $(LIBGIFSOMAJOR) $(LIBGIFSOVER)
++ rm -f libgif.a libgif.dll.a $(LIBGIFSO)
uninstall-man:
cd "$(DESTDIR)$(MANDIR)/man1" && rm -f $(shell cd doc >/dev/null && echo *.1)
-
+ cd "$(DESTDIR)$(MANDIR)/man7" && rm -f $(shell cd doc >/dev/null && echo *.7)
diff --git a/PKGBUILD b/PKGBUILD
index de374d6e8975..b691f75ee6c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,27 @@
# Maintainer: drakkan <nicola.murino at gmail dot com>
pkgname=mingw-w64-giflib
-pkgver=5.2.1
-pkgrel=5
+pkgver=5.2.2
+pkgrel=1
pkgdesc="A library for reading and writing gif images (mingw-w64)"
arch=(any)
url="http://sourceforge.net/projects/giflib/"
license=("MIT")
-makedepends=('xmlto' 'docbook-xsl' 'mingw-w64-make')
+makedepends=('xmlto' 'docbook-xsl' 'imagemagick' 'mingw-w64-make')
depends=('mingw-w64-crt')
options=(staticlibs !strip !buildflags !makeflags)
source=("https://downloads.sourceforge.net/project/giflib/${pkgname#mingw-w64-}-${pkgver}.tar.gz"
- "giflib-5.1.9-fix-missing-quantize-API-symbols.patch"
"001-mingw-build.patch"
- "0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch")
-sha512sums=('4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736'
- '5de1e8724f5221fa3637b4e6a482f650f7608673e2c9200233290018ec8a0bf1beea049b3979b5f57dbf2b2a5fda409324e636e9af10582fd01c71d92d4de3b3'
- '3b5d5937162d9a3c1076cdc58a803a8881b264c65aa8d33e9592c43dc1686724fce280e8b56ed2751a6bf8a5c75ed9d887c31a042bc9e0a15c1697ea0b2fedc9'
- '2b0eb1a5d1a3ff8270018f7cfbe87d902bca3e2105315c4169f4c7859dd37aac0c34dc27008ee2dc2acaa52375ffda260d5318a5c065b1ba51e7aed9f4ca3356')
+ "giflib_quantize.patch")
+sha512sums=('0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f'
+ 'a2b0e76039c38cdc2006548f2249ff0274bc6d4b1b8f35f89b3eeba5244893624f73fab17e77de13f3b8d86ddb2a077355ce2211bd5643087591b80c0df0796b'
+ '7e3e200e7e42e8c4622db2b28c29b623171d72f417230a28614ef01f1a2b0cc49c5e8ba06229c3d84fe4fe2a2f5303cd4af2f722dceef3540d099d05c46b2169')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
prepare() {
cd giflib-$pkgver
- patch -Np1 < ../giflib-5.1.9-fix-missing-quantize-API-symbols.patch
patch -Np1 < ../001-mingw-build.patch
- patch -Np1 < ../0001-respect-existence-of-distro-CFLAGS-and-CPPFLAGS.patch
+ patch -Np1 < ../giflib_quantize.patch
}
build() {
diff --git a/giflib-5.1.9-fix-missing-quantize-API-symbols.patch b/giflib-5.1.9-fix-missing-quantize-API-symbols.patch
deleted file mode 100644
index 5948f4546858..000000000000
--- a/giflib-5.1.9-fix-missing-quantize-API-symbols.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
-
diff --git a/giflib_quantize.patch b/giflib_quantize.patch
new file mode 100644
index 000000000000..ce1f22ceb15d
--- /dev/null
+++ b/giflib_quantize.patch
@@ -0,0 +1,17 @@
+diff -rupN giflib-5.2.1/Makefile giflib-5.2.1-new/Makefile
+--- giflib-5.2.1/Makefile 2019-06-24 18:08:57.000000000 +0200
++++ giflib-5.2.1-new/Makefile 2019-10-01 13:02:33.227952230 +0200
+@@ -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)
+