graphics/giflib: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2024-05-03 14:02:46 +02:00
parent 114703fe65
commit cf5f3edfc2
6 changed files with 59 additions and 76 deletions

View file

@ -1,6 +1,5 @@
PORTNAME= giflib
PORTVERSION= 5.2.1
PORTREVISION= 1
PORTVERSION= 5.2.2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}
@ -14,19 +13,29 @@ LICENSE_FILE= ${WRKSRC}/COPYING
TEST_DEPENDS= ghead:sysutils/coreutils
USES= cpe gmake
USE_LDCONFIG= yes
CFLAGS+= -DHAVE_REALLOCARRAY
MAKE_ARGS= CC=${CC} LDFLAGS="${LDFLAGS}" MANDIR=${PREFIX}/share/man OFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
CPE_VENDOR= giflib_project
USE_LDCONFIG= yes
MAKE_ARGS= CC=${CC} \
LDFLAGS="${LDFLAGS}" \
OFLAGS="${CFLAGS}" \
PREFIX="${PREFIX}"
TEST_TARGET= check
CFLAGS+= -DHAVE_REALLOCARRAY
CONFLICTS_INSTALL= giftool
OPTIONS_DEFINE= DOCS
TEST_TARGET= check
do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! ( -name Makefile -o -name *\.1 -o -name *\.in -o -name *\.xml )"
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
"! ( -name Makefile -o -name *\.[17] -o -name *\.xml )"
${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html
pre-build:
${CP} ${FILESDIR}/giflib-logo.gif ${WRKSRC}/doc
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1573114002
SHA256 (giflib-5.2.1.tar.gz) = 31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd
SIZE (giflib-5.2.1.tar.gz) = 444187
TIMESTAMP = 1714225271
SHA256 (giflib-5.2.2.tar.gz) = be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb
SIZE (giflib-5.2.2.tar.gz) = 447175

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -1,46 +1,33 @@
--- Makefile.orig 2019-06-24 16:08:57 UTC
--- Makefile.orig 2024-02-19 01:01:50 UTC
+++ Makefile
@@ -8,7 +8,7 @@
#
OFLAGS = -O0 -g
OFLAGS = -O2
-CFLAGS = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS)
+CFLAGS = -std=gnu99 -fPIC -Wall $(OFLAGS)
@@ -64,13 +64,14 @@ MANUAL_PAGES = \
LDLIBS=libgif.a -lm
SHELL = /bin/sh
TAR = tar
@@ -59,15 +59,21 @@ UTILS = $(INSTALLABLE) \
gifsponge \
gifwedge
MANUAL_PAGES = \
- doc/gif2rgb.xml \
- doc/gifbuild.xml \
- doc/gifclrmp.xml \
- doc/giffix.xml \
- doc/giflib.xml \
- doc/giftext.xml \
- doc/giftool.xml
+ doc/gif2rgb.1 \
+ doc/gifbuild.1 \
+ doc/gifclrmp.1 \
+ doc/giffix.1 \
+ doc/giftext.1 \
+ doc/giftool.1
+MAN7_PAGES= \
+ doc/giflib.7
-LDLIBS=libgif.a -lm
+LDLIBS=-Wl,-rpath -Wl,$(LIBDIR) -lm
all: libgif.so libgif.a libutil.so libutil.a $(UTILS)
$(MAKE) -C doc
-$(UTILS):: libgif.a libutil.a
+$(UTILS):: libgif.so libutil.a
-libgif.so: $(OBJECTS) $(HEADERS)
- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+libgif.so.$(LIBVER): $(OBJECTS) $(HEADERS)
+ $(CC) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o $@ $(OBJECTS)
+
+libgif.so.$(LIBMAJOR): libgif.so.$(LIBVER)
+ ln -s $< $@
+
+libgif.so: libgif.so.$(LIBMAJOR)
+ ln -s $< $@
libgif.a: $(OBJECTS) $(HEADERS)
$(AR) rcs libgif.a $(OBJECTS)
@@ -99,7 +105,7 @@ install-include:
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)"
+ $(INSTALL) -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)"
ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)"
ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so"
SOEXTENSION = so
LIBGIFSO = libgif.$(SOEXTENSION)
@@ -150,6 +151,8 @@ install-man:
install-man:
$(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
$(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man7"
+ $(INSTALL) -m 644 $(MAN7_PAGES) "$(DESTDIR)$(MANDIR)/man7"
uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
uninstall-bin:
cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)

View file

@ -1,14 +1,5 @@
--- tests/makefile.orig 2019-03-28 17:05:25 UTC
+++ tests/makefile
@@ -3,6 +3,8 @@
.SUFFIXES: .gif .rgb
+export LD_LIBRARY_PATH=$(CURDIR)/..
+
# This is what to do by default
test: render-regress \
gifbuild-regress \
@@ -104,10 +106,10 @@ giffilter-regress:
giffix-rebuild:

View file

@ -9,19 +9,6 @@ lib/libgif.a
lib/libgif.so
lib/libgif.so.7
lib/libgif.so.7.2.0
share/man/man1/gif2rgb.1.gz
share/man/man1/gifbg.1.gz
share/man/man1/gifbuild.1.gz
share/man/man1/gifclrmp.1.gz
share/man/man1/gifcolor.1.gz
share/man/man1/gifecho.1.gz
share/man/man1/giffix.1.gz
share/man/man1/gifhisto.1.gz
share/man/man1/gifinto.1.gz
share/man/man1/giflib.1.gz
share/man/man1/giftext.1.gz
share/man/man1/giftool.1.gz
share/man/man1/gifwedge.1.gz
%%PORTDOCS%%%%DOCSDIR%%/00README
%%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html
%%PORTDOCS%%%%DOCSDIR%%/gif_lib.html
@ -30,10 +17,13 @@ share/man/man1/gifwedge.1.gz
%%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html
%%PORTDOCS%%%%DOCSDIR%%/gifcolor.html
%%PORTDOCS%%%%DOCSDIR%%/gifecho.html
%%PORTDOCS%%%%DOCSDIR%%/giffilter.html
%%PORTDOCS%%%%DOCSDIR%%/giffix.html
%%PORTDOCS%%%%DOCSDIR%%/gifhisto.html
%%PORTDOCS%%%%DOCSDIR%%/gifinto.html
%%PORTDOCS%%%%DOCSDIR%%/giflib-logo.gif
%%PORTDOCS%%%%DOCSDIR%%/giflib.html
%%PORTDOCS%%%%DOCSDIR%%/gifsponge.html
%%PORTDOCS%%%%DOCSDIR%%/gifstandard/GIF89a.html
%%PORTDOCS%%%%DOCSDIR%%/gifstandard/LZW-and-GIF-explained.html
%%PORTDOCS%%%%DOCSDIR%%/gifstandard/gif-1over100.png
@ -56,8 +46,6 @@ share/man/man1/gifwedge.1.gz
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/global_color_table.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/graphic_control_ext.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/header_block.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/highlight_green.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/highlight_purple.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/image_data_block.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/image_descriptor_block.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/index.html
@ -71,6 +59,7 @@ share/man/man1/gifwedge.1.gz
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_trans.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_trans_blue.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_trans_red.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_green.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_red.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_yellow.gif
@ -78,3 +67,10 @@ share/man/man1/gifwedge.1.gz
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_green_yellow_diff.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_yellow_large.gif
%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/trailer_block.gif
share/man/man1/gif2rgb.1.gz
share/man/man1/gifbuild.1.gz
share/man/man1/gifclrmp.1.gz
share/man/man1/giffix.1.gz
share/man/man1/giftext.1.gz
share/man/man1/giftool.1.gz
share/man/man7/giflib.7.gz