[pkgsrc/trunk]: pkgsrc/graphics/giflib giflib: Stop installing a broken libgi...

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/giflib giflib: Stop installing a broken libgi...
From: jperkin <jperkin%pkgsrc.org@localhost>
Date: Fri, 05 Jun 2020 13:43:23 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a34c226e209
branches:  trunk
changeset: 433601:1a34c226e209
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jun 05 12:15:16 2020 +0000

description:
giflib: Stop installing a broken libgifutil.

The release of giflib 5.1.9 removed GifQuantizeBuffer from its API as it was
undocumented.  Unfortunately a number of third party programs were relying on
this function, and no longer built without it.

The original attempt to fix this was to build and install the libgifutil.so
library that now contains it, but this was done incorrectly (the SONAME was
broken) and required modifying those third party programs anyway to pull in
libgifutil (see e.g. multimedia/mplayer-share), which feels like completely
missing the point.

It is a lot simpler and less error-prone to simply revert the upstream decision
and put GifQuantizeBuffer back into the main library.  This is the approach
that other upstreams (e.g. Fedora) have taken, and so we now do the same.

Bump PKGREVISION.

diffstat:

 graphics/giflib/Makefile               |  10 ++++----
 graphics/giflib/Makefile.common        |   4 +-
 graphics/giflib/PLIST                  |   4 +--
 graphics/giflib/distinfo               |   4 +-
 graphics/giflib/patches/patch-Makefile |  40 +++++++++++++++++-----------------
 5 files changed, 30 insertions(+), 32 deletions(-)

diffs (191 lines):

diff -r 76afd6e0408f -r 1a34c226e209 graphics/giflib/Makefile
--- a/graphics/giflib/Makefile  Fri Jun 05 11:42:00 2020 +0000
+++ b/graphics/giflib/Makefile  Fri Jun 05 12:15:16 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2020/04/25 11:27:35 js Exp $
+# $NetBSD: Makefile,v 1.55 2020/06/05 12:15:16 jperkin Exp $
 
 .include "Makefile.common"
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       GIF image format library
 
@@ -11,8 +11,8 @@
 # clang: error: no such file or directory: 'egif_lib.o'
 MAKE_JOBS_SAFE=                no
 
-INSTALL_TARGET=        install-include
-INSTALL_TARGET+=       install-lib
+INSTALL_TARGET=                install-include
+INSTALL_TARGET+=       install-lib
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -20,7 +20,7 @@
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
 fix-darwin-install-name:
-.  for lib in libgif.7.2.0.dylib libgifutil.dylib
+.  for lib in libgif.7.2.0.dylib
        install_name_tool -id ${PREFIX}/lib/${lib} ${DESTDIR}${PREFIX}/lib/${lib}
 .  endfor
 .endif
diff -r 76afd6e0408f -r 1a34c226e209 graphics/giflib/Makefile.common
--- a/graphics/giflib/Makefile.common   Fri Jun 05 11:42:00 2020 +0000
+++ b/graphics/giflib/Makefile.common   Fri Jun 05 12:15:16 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2020/03/17 21:53:12 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2020/06/05 12:15:16 jperkin Exp $
 # used by graphics/giflib/Makefile
 # used by graphics/giflib-util/Makefile
 
@@ -15,4 +15,4 @@
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake
diff -r 76afd6e0408f -r 1a34c226e209 graphics/giflib/PLIST
--- a/graphics/giflib/PLIST     Fri Jun 05 11:42:00 2020 +0000
+++ b/graphics/giflib/PLIST     Fri Jun 05 12:15:16 2020 +0000
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2020/01/09 15:56:11 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/06/05 12:15:16 jperkin Exp $
 include/gif_lib.h
 lib/libgif.a
 lib/libgif.so
 lib/libgif.so.7
 lib/libgif.so.7.2.0
-lib/libgifutil.a
-lib/libgifutil.so
diff -r 76afd6e0408f -r 1a34c226e209 graphics/giflib/distinfo
--- a/graphics/giflib/distinfo  Fri Jun 05 11:42:00 2020 +0000
+++ b/graphics/giflib/distinfo  Fri Jun 05 12:15:16 2020 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2020/03/19 23:58:33 joerg Exp $
+$NetBSD: distinfo,v 1.23 2020/06/05 12:15:16 jperkin Exp $
 
 SHA1 (giflib-5.2.1.tar.gz) = c3f774dcbdf26afded7788979c8081d33c6426dc
 RMD160 (giflib-5.2.1.tar.gz) = bc4be3ddaef877e4fd546b1240fe94dec8ef3e27
 SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
 Size (giflib-5.2.1.tar.gz) = 444187 bytes
-SHA1 (patch-Makefile) = 056d12c235600ea3e3f29c1707ecac904dc0e049
+SHA1 (patch-Makefile) = fcc937f5d0aebc9fd36895322f1b9518a775635e
diff -r 76afd6e0408f -r 1a34c226e209 graphics/giflib/patches/patch-Makefile
--- a/graphics/giflib/patches/patch-Makefile    Fri Jun 05 11:42:00 2020 +0000
+++ b/graphics/giflib/patches/patch-Makefile    Fri Jun 05 12:15:16 2020 +0000
@@ -1,9 +1,10 @@
-$NetBSD: patch-Makefile,v 1.4 2020/03/19 23:58:34 joerg Exp $
+$NetBSD: patch-Makefile,v 1.5 2020/06/05 12:15:16 jperkin Exp $
 
 - Inherit the PREFIX rather than hard-coding it.
 - Adjust location where manuals are installed.
 - Apply <https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/>
   to fix Darwin build
+- Move quantize.c back into libgif.so to fix various library users.
 
 --- Makefile.orig      2019-06-24 16:08:57.000000000 +0000
 +++ Makefile
@@ -21,7 +22,17 @@
  
  # No user-serviceable parts below this line
  
-@@ -37,6 +37,8 @@ USOURCES = qprintf.c quantize.c getarg.c
+@@ -29,14 +29,16 @@ 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)
  
@@ -30,7 +41,7 @@
  # Some utilities are installed
  INSTALLABLE = \
        gif2rgb \
-@@ -61,27 +63,48 @@ UTILS = $(INSTALLABLE) \
+@@ -61,27 +63,38 @@ UTILS = $(INSTALLABLE) \
  
  LDLIBS=libgif.a -lm
  
@@ -40,17 +51,14 @@
 +SOEXTENSION   = dylib
 +LIBGIFSOMAJOR   = libgif.$(LIBMAJOR).$(SOEXTENSION)
 +LIBGIFSOVER   = libgif.$(LIBVER).$(SOEXTENSION)
-+LIBUTILSOMAJOR        = libutil.$(LIBMAJOR).$(SOEXTENSION)
 +else
 +SOEXTENSION   = so
 +LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
 +LIBGIFSOVER   = libgif.$(SOEXTENSION).$(LIBVER)
-+LIBUTILSOMAJOR        = libutil.$(SOEXTENSION).$(LIBMAJOR)
 +endif
 +LIBGIFSO        = libgif.$(SOEXTENSION)
-+LIBUTILSO     = libutil.$(SOEXTENSION)
 +
-+all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS)
++all: $(LIBGIFSO) libgif.a libutil.a $(UTILS)
  
  $(UTILS):: libgif.a libutil.a
  
@@ -68,13 +76,7 @@
  
 -libutil.so: $(UOBJECTS) $(UHEADERS)
 -      $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libutil.so.$(LIBMAJOR) -o libutil.so $(UOBJECTS)
-+$(LIBUTILSO): $(UOBJECTS) $(UHEADERS)
-+ifeq ($(UNAME), Darwin)
-+      $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO)
-+else
-+      $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS)
-+endif
- 
+-
  libutil.a: $(UOBJECTS) $(UHEADERS)
        $(AR) rcs libutil.a $(UOBJECTS)
  
@@ -82,13 +84,13 @@
 -      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 $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o
++      rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a *.o
 +      rm -f $(LIBGIFSOVER)
 +      rm -f $(LIBGIFSOMAJOR)
        rm -fr doc/*.1 *.html doc/staging
  
  check: all
-@@ -89,7 +112,8 @@ check: all
+@@ -89,7 +102,8 @@ check: all
  
  # Installation/uninstallation
  
@@ -98,7 +100,7 @@
  install-bin: $(INSTALLABLE)
        $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
        $(INSTALL) $^ "$(DESTDIR)$(BINDIR)"
-@@ -99,9 +123,12 @@ install-include:
+@@ -99,9 +113,10 @@ install-include:
  install-lib:
        $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
        $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a"
@@ -108,13 +110,11 @@
 +      $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)"
 +      ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
 +      ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
-+      $(INSTALL) -m 644 libutil.a "$(DESTDIR)$(LIBDIR)/libgifutil.a"
-+      $(INSTALL) -m 755 $(LIBUTILSO) "$(DESTDIR)$(LIBDIR)/libgifutil.$(SOEXTENSION)"
 +
  install-man:
        $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
        $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1"
-@@ -112,7 +139,7 @@ uninstall-include:
+@@ -112,7 +127,7 @@ uninstall-include:
        rm -f "$(DESTDIR)$(INCDIR)/gif_lib.h"
  uninstall-lib:
        cd "$(DESTDIR)$(LIBDIR)" && \
Prev by Date: [src/trunk]: src/lib/libc/net Remove more bogus tests for 64-bit i386 and Sup...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated graphics/giflib to 5.2.1nb3
Previous by Thread: [src/trunk]: src/lib/libc/net Remove more bogus tests for 64-bit i386 and Sup...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated graphics/giflib to 5.2.1nb3
Indexes:
Home | Main Index | Thread Index | Old Index