CVS commit: pkgsrc/graphics/libimagequant

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Mar 12 16:47:35 UTC 2018

Modified Files:
        pkgsrc/graphics/libimagequant: Makefile distinfo
        pkgsrc/graphics/libimagequant/patches: patch-Makefile patch-configure

Log Message:
libimagequant: updated to 2.11.10

2.11.10:
Bug fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/libimagequant/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/libimagequant/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libimagequant/patches/patch-Makefile
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/graphics/libimagequant/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/libimagequant/Makefile
diff -u pkgsrc/graphics/libimagequant/Makefile:1.12 pkgsrc/graphics/libimagequant/Makefile:1.13
--- pkgsrc/graphics/libimagequant/Makefile:1.12 Tue Feb  6 10:02:32 2018
+++ pkgsrc/graphics/libimagequant/Makefile      Mon Mar 12 16:47:35 2018
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2018/02/06 10:02:32 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/12 16:47:35 adam Exp $
 
-DISTNAME=      libimagequant-2.11.9
+DISTNAME=      libimagequant-2.11.10
 CATEGORIES=    graphics
 MASTER_SITES+= ${MASTER_SITE_GITHUB:=ImageOptim/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      https://pngquant.org/lib/
 COMMENT=       High-quality conversion of RGBA images to 8-bit indexed-color
 LICENSE=       gnu-gpl-v3
 
-GITHUB_TAG=    ${PKGVERSION_NOREV}
-
 USE_LIBTOOL=           yes
 USE_TOOLS+=            bash gmake
 HAS_CONFIGURE=         yes

Index: pkgsrc/graphics/libimagequant/distinfo
diff -u pkgsrc/graphics/libimagequant/distinfo:1.14 pkgsrc/graphics/libimagequant/distinfo:1.15
--- pkgsrc/graphics/libimagequant/distinfo:1.14 Tue Feb  6 10:02:32 2018
+++ pkgsrc/graphics/libimagequant/distinfo      Mon Mar 12 16:47:35 2018
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2018/02/06 10:02:32 adam Exp $
+$NetBSD: distinfo,v 1.15 2018/03/12 16:47:35 adam Exp $
 
-SHA1 (libimagequant-2.11.9.tar.gz) = 92d362224b70e2cb91642a365b65d7f5bdc279c9
-RMD160 (libimagequant-2.11.9.tar.gz) = e84a48bcdd7ee5a528c18e8c0fbb13cf324dab74
-SHA512 (libimagequant-2.11.9.tar.gz) = 6017a9a3671b2445ddfac73be205a1d32964d56a3d22cf7bfadffbaa9b380cae1d19f1aff727c374d3dba21e32418b87c51bb891396222b0c04b2616d8f6958e
-Size (libimagequant-2.11.9.tar.gz) = 74336 bytes
-SHA1 (patch-Makefile) = 78a77b6348c3a254164cbbb2c8e2c3d000c10d10
-SHA1 (patch-configure) = 4425589a1956f4c4303370baceb605308f07edf0
+SHA1 (libimagequant-2.11.10.tar.gz) = beb2a0497fd8df1e8151b653f3b804b286cc6989
+RMD160 (libimagequant-2.11.10.tar.gz) = 9ed37406be9a5473eb33bfa8a883667ff157f28a
+SHA512 (libimagequant-2.11.10.tar.gz) = ac59ecd04d6a3a688cc4f9f77c063a59da8dc6f3ddd05bdc3b15b9809d057462fe5b712fdbfb38e975d633a1bd5179b8ae6b2aee765f5dd9dcfef107f5eb22c0
+Size (libimagequant-2.11.10.tar.gz) = 74886 bytes
+SHA1 (patch-Makefile) = 9ac0719c2c8096874a584c3bedb8b925a9d2dc30
+SHA1 (patch-configure) = 086d0bdf0f0d8b37c135a5a854ad85ab812b4d68

Index: pkgsrc/graphics/libimagequant/patches/patch-Makefile
diff -u pkgsrc/graphics/libimagequant/patches/patch-Makefile:1.3 pkgsrc/graphics/libimagequant/patches/patch-Makefile:1.4
--- pkgsrc/graphics/libimagequant/patches/patch-Makefile:1.3    Tue Nov 28 10:35:27 2017
+++ pkgsrc/graphics/libimagequant/patches/patch-Makefile        Mon Mar 12 16:47:35 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.3 2017/11/28 10:35:27 adam Exp $
+$NetBSD: patch-Makefile,v 1.4 2018/03/12 16:47:35 adam Exp $
 
 Libtoolize.
 
---- Makefile.orig      2017-04-05 16:21:29.000000000 +0000
+--- Makefile.orig      2018-03-10 12:31:19.000000000 +0000
 +++ Makefile
 @@ -1,7 +1,7 @@
  -include config.mk
@@ -13,7 +13,7 @@ Libtoolize.
  SOVER=0
  
  JNILIB=libimagequant.jnilib
-@@ -44,11 +44,11 @@ $(STATICLIB): $(OBJS)
+@@ -45,13 +45,13 @@ $(STATICLIB): $(OBJS)
        $(AR) $(ARFLAGS) $@ $^
  
  $(SHAREDOBJS):
@@ -23,9 +23,13 @@ Libtoolize.
 -libimagequant.so: $(SHAREDOBJS)
 -      $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) -o $(SHAREDLIB).$(SOVER) $^ $(LDFLAGS)
 -      ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB)
+-      sed -i "s#^prefix=.*#prefix=$(PREFIX)#" $(PKGCONFIG)
+-      sed -i "s#^Version:.*#Version: $(VERSION)#" $(PKGCONFIG)
 +$(SHAREDLIB): $(SHAREDOBJS)
 +      ${LIBTOOL} --mode=link $(CC) -o $(SHAREDLIB) $^ $(LDFLAGS) \
 +              -rpath ${PREFIX}/lib -version-info $(subst .,:,$(basename $(VERSION)))
++      sed -e "s#^prefix=.*#prefix=$(PREFIX)#" $(PKGCONFIG) > $(PKGCONFIG).new
++      sed -e "s#^Version:.*#Version: $(VERSION)#" $(PKGCONFIG).new > $(PKGCONFIG)
  
  libimagequant.dylib: $(SHAREDOBJS)
        $(CC) -shared -o $(SHAREDLIB).$(SOVER) $^ $(LDFLAGS)

Index: pkgsrc/graphics/libimagequant/patches/patch-configure
diff -u pkgsrc/graphics/libimagequant/patches/patch-configure:1.6 pkgsrc/graphics/libimagequant/patches/patch-configure:1.7
--- pkgsrc/graphics/libimagequant/patches/patch-configure:1.6   Wed Dec 20 11:52:23 2017
+++ pkgsrc/graphics/libimagequant/patches/patch-configure       Mon Mar 12 16:47:35 2018
@@ -1,20 +1,20 @@
-$NetBSD: patch-configure,v 1.6 2017/12/20 11:52:23 dholland Exp $
+$NetBSD: patch-configure,v 1.7 2018/03/12 16:47:35 adam Exp $
 
 Remove unwanted compiler flags.
 Avoid leaving scratch files in /tmp.
 
---- configure.orig     2017-11-27 15:38:43.000000000 +0000
+--- configure.orig     2018-03-10 12:31:19.000000000 +0000
 +++ configure
-@@ -2,7 +2,7 @@
- 
- CONFIG="config.mk"
- PREFIX="/usr/local"
+@@ -5,7 +5,7 @@ PREFIX="/usr/local"
+ LIBDIR="$PREFIX/lib"
+ INCLUDEDIR="$PREFIX/include"
+ PKGCONFIGDIR="$LIBDIR/pkgconfig"
 -VERSION=$(grep LIQ_VERSION_STRING libimagequant.h | grep -Eo "2\.[0-9.]+")
 +VERSION=$(awk -F\" '/LIQ_VERSION_STRING/ {print $2}' libimagequant.h)
  
  DEBUG=
  QUIET=0
-@@ -124,7 +124,8 @@ if [ "$QUIET" -ne 1 ]; then
+@@ -143,7 +143,8 @@ if [ "$QUIET" -ne 1 ]; then
  fi
  
  # /tmp, because mingw has problems opening /dev/null and gives false negative
@@ -24,7 +24,7 @@ Avoid leaving scratch files in /tmp.
      error "Compiler" "$CC failed to compile anything (make sure it's installed and supports C99)"
  fi
  
-@@ -136,7 +137,7 @@ cflags "-std=c99 -I."
+@@ -155,7 +156,7 @@ cflags "-std=c99 -I."
  
  # DEBUG
  if [ -z "$DEBUG" ]; then
@@ -33,7 +33,7 @@ Avoid leaving scratch files in /tmp.
      status "Debug" "no"
  else
      cflags "-O1 -g"
-@@ -174,15 +175,9 @@ if [ -n "$OPENMP" ]; then
+@@ -193,15 +194,9 @@ if [ -n "$OPENMP" ]; then
      else
          OPENMPFLAGS="-fopenmp"
      fi
@@ -49,7 +49,7 @@ Avoid leaving scratch files in /tmp.
  else
      # silence warnings about omp pragmas
      cflags "-Wno-unknown-pragmas"
-@@ -190,20 +185,10 @@ else
+@@ -209,20 +204,10 @@ else
      status "OpenMP" "no"
  fi