libimagequant: updated to 2.12.1

version 2.12
- new liq_histogram_add_fixed_color()
- faster for large/complex images
- workarounds for Microsoft's outdated C compiler

4 files changed, 30 insertions, 40 deletions

diff --git a/graphics/libimagequant/Makefile b/graphics/libimagequant/Makefile
index 0bd7bc3d01f..3a4088b5637 100644
--- a/graphics/libimagequant/Makefile
+++ b/graphics/libimagequant/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2018/03/12 16:47:35 adam Exp $
+# $NetBSD: Makefile,v 1.14 2018/06/12 10:15:03 adam Exp $
 
-DISTNAME=	libimagequant-2.11.10
+DISTNAME=	libimagequant-2.12.1
 CATEGORIES=	graphics
 MASTER_SITES+=	${MASTER_SITE_GITHUB:=ImageOptim/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
diff --git a/graphics/libimagequant/distinfo b/graphics/libimagequant/distinfo
index 394c166407a..d664ad8db3e 100644
--- a/graphics/libimagequant/distinfo
+++ b/graphics/libimagequant/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2018/03/12 16:47:35 adam Exp $
+$NetBSD: distinfo,v 1.16 2018/06/12 10:15:03 adam Exp $
 
-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
+SHA1 (libimagequant-2.12.1.tar.gz) = 3860b4fa2427b29d6c47050594c53a3186661eae
+RMD160 (libimagequant-2.12.1.tar.gz) = 92536ae6666e8d2a64a625548e4bc2a0a363e1e2
+SHA512 (libimagequant-2.12.1.tar.gz) = 2e65d1ccae4e885e200446756496c2446696f0d4c7057d85e40c9ab4d524fed5505584f21f240ce3a7c589b9156ccb117cf5b1562b4851f3fbf14bf11fed0f13
+Size (libimagequant-2.12.1.tar.gz) = 75631 bytes
+SHA1 (patch-Makefile) = e75e9fea798efed44e25b840d5d433f16e18522a
+SHA1 (patch-configure) = 7baac92db07ffb6fd58e41949407f339ee52622f
diff --git a/graphics/libimagequant/patches/patch-Makefile b/graphics/libimagequant/patches/patch-Makefile
index 71a93c18f6a..6e8409f6984 100644
--- a/graphics/libimagequant/patches/patch-Makefile
+++ b/graphics/libimagequant/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.4 2018/03/12 16:47:35 adam Exp $
+$NetBSD: patch-Makefile,v 1.5 2018/06/12 10:15:03 adam Exp $
 
 Libtoolize.
 
---- Makefile.orig	2018-03-10 12:31:19.000000000 +0000
+--- Makefile.orig	2018-06-03 19:46:28.000000000 +0000
 +++ Makefile
 @@ -1,7 +1,7 @@
  -include config.mk
@@ -11,9 +11,9 @@ Libtoolize.
 -SHAREDLIB=libimagequant.$(SOLIBSUFFIX)
 +SHAREDLIB=libimagequant.la
  SOVER=0
- 
- JNILIB=libimagequant.jnilib
-@@ -45,13 +45,13 @@ $(STATICLIB): $(OBJS)
+ ifeq ($(SOLIBSUFFIX),dylib)
+ 	SHAREDLIBVER=libimagequant.$(SOVER).$(SOLIBSUFFIX)
+@@ -52,15 +52,11 @@ $(STATICLIB): $(OBJS)
  	$(AR) $(ARFLAGS) $@ $^
  
  $(SHAREDOBJS):
@@ -21,15 +21,15 @@ Libtoolize.
 +	${LIBTOOL} --mode=compile $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@
  
 -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)
+-	$(CC) -shared -Wl,-soname,$(SHAREDLIBVER) -o $(SHAREDLIBVER) $^ $(LDFLAGS)
+-	ln -fs $(SHAREDLIBVER) $(SHAREDLIB)
+-
+-libimagequant.dylib: $(SHAREDOBJS)
+-	$(CC) -shared -o $(SHAREDLIBVER) $^ $(LDFLAGS)
+-	ln -fs $(SHAREDLIBVER) $(SHAREDLIB)
 +$(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)
+ $(OBJS): $(wildcard *.h) config.mk
+ 
diff --git a/graphics/libimagequant/patches/patch-configure b/graphics/libimagequant/patches/patch-configure
index 6c170d3dd7c..6839001bf23 100644
--- a/graphics/libimagequant/patches/patch-configure
+++ b/graphics/libimagequant/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.7 2018/03/12 16:47:35 adam Exp $
+$NetBSD: patch-configure,v 1.8 2018/06/12 10:15:03 adam Exp $
 
 Remove unwanted compiler flags.
 Avoid leaving scratch files in /tmp.
 
---- configure.orig	2018-03-10 12:31:19.000000000 +0000
+--- configure.orig	2018-06-03 19:46:28.000000000 +0000
 +++ configure
 @@ -5,7 +5,7 @@ PREFIX="/usr/local"
  LIBDIR="$PREFIX/lib"
@@ -14,17 +14,7 @@ Avoid leaving scratch files in /tmp.
  
  DEBUG=
  QUIET=0
-@@ -143,7 +143,8 @@ if [ "$QUIET" -ne 1 ]; then
- fi
- 
- # /tmp, because mingw has problems opening /dev/null and gives false negative
--if ! echo "int main(){}" | "$CC" -xc -std=c99 -o /tmp/gcccheck - > /dev/null; then
-+# not /tmp, because that's not safe
-+if ! echo "int main(){}" | "$CC" -xc -std=c99 -o ./tmp-gcccheck - > /dev/null; then
-     error "Compiler" "$CC failed to compile anything (make sure it's installed and supports C99)"
- fi
- 
-@@ -155,7 +156,7 @@ cflags "-std=c99 -I."
+@@ -157,7 +157,7 @@ cflags "-std=c99 -I."
  
  # DEBUG
  if [ -z "$DEBUG" ]; then
@@ -33,7 +23,7 @@ Avoid leaving scratch files in /tmp.
      status "Debug" "no"
  else
      cflags "-O1 -g"
-@@ -193,15 +194,9 @@ if [ -n "$OPENMP" ]; then
+@@ -195,15 +195,9 @@ if [ -n "$OPENMP" ]; then
      else
          OPENMPFLAGS="-fopenmp"
      fi
@@ -49,16 +39,16 @@ Avoid leaving scratch files in /tmp.
  else
      # silence warnings about omp pragmas
      cflags "-Wno-unknown-pragmas"
-@@ -209,20 +204,10 @@ else
+@@ -211,20 +205,9 @@ else
      status "OpenMP" "no"
  fi
  
 -# Cocoa
 -if [[ "$OSTYPE" =~ "darwin" ]]; then
--    cflags "-mmacosx-version-min=10.6"
--    lflags "-mmacosx-version-min=10.6"
+-    cflags "-mmacosx-version-min=10.7"
+-    lflags "-mmacosx-version-min=10.7"
 -fi
- 
+-
  if [[ "$OSTYPE" =~ "darwin" ]]; then
      SOLIBSUFFIX=dylib