diff options
author | adam <adam> | 2017-06-19 20:14:45 +0000 |
---|---|---|
committer | adam <adam> | 2017-06-19 20:14:45 +0000 |
commit | e1d9ecdd241de5fae4880f408d2803d0404f1042 (patch) | |
tree | 16185bd92d08e71337e1e308dd06fff98b5e3720 | |
parent | 8e000f434dd97575238ecf010042cac4ed31b229 (diff) | |
download | pkgsrc-e1d9ecdd241de5fae4880f408d2803d0404f1042.tar.gz |
Changes 2.9.1:
Bug fixes.
-rw-r--r-- | graphics/libimagequant/Makefile | 7 | ||||
-rw-r--r-- | graphics/libimagequant/distinfo | 14 | ||||
-rw-r--r-- | graphics/libimagequant/patches/patch-Makefile | 13 | ||||
-rw-r--r-- | graphics/libimagequant/patches/patch-configure | 19 |
4 files changed, 28 insertions, 25 deletions
diff --git a/graphics/libimagequant/Makefile b/graphics/libimagequant/Makefile index b70ad863fef..2deb149eda4 100644 --- a/graphics/libimagequant/Makefile +++ b/graphics/libimagequant/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2017/03/22 02:13:05 adam Exp $ +# $NetBSD: Makefile,v 1.3 2017/06/19 20:14:45 adam Exp $ -DISTNAME= libimagequant-2.9.0 +DISTNAME= libimagequant-2.9.1 CATEGORIES= graphics MASTER_SITES+= ${MASTER_SITE_GITHUB:=ImageOptim/} @@ -14,7 +14,6 @@ GITHUB_TAG= ${PKGVERSION_NOREV} USE_LIBTOOL= yes USE_TOOLS+= gmake HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-sse CONFIGURE_ARGS+= --prefix="${PREFIX}" CONFIGURE_ARGS+= --without-openmp BUILD_TARGET= shared @@ -26,6 +25,8 @@ REPLACE_SH= configure .if ${MACHINE_ARCH} == "x86_64" CONFIGURE_ARGS+= --enable-sse +.else +CONFIGURE_ARGS+= --disable-sse .endif do-install: diff --git a/graphics/libimagequant/distinfo b/graphics/libimagequant/distinfo index 463bfc546bc..7b2547bbd08 100644 --- a/graphics/libimagequant/distinfo +++ b/graphics/libimagequant/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2017/03/27 13:14:49 jperkin Exp $ +$NetBSD: distinfo,v 1.4 2017/06/19 20:14:45 adam Exp $ -SHA1 (libimagequant-2.9.0.tar.gz) = 3ee01906a5d1660364c23cc2d3d2eb2458f5da8b -RMD160 (libimagequant-2.9.0.tar.gz) = 7c2f5ea0d5faae2d5737bc58873be88706e3f536 -SHA512 (libimagequant-2.9.0.tar.gz) = dcd6009acfbf8af56121d636dc6bf65f34024452425323dc7e03454a2e39fa66448b864693bbaf2e2513bdf200ae51877e68ba12017bfd413e8ff18f21ecf2ac -Size (libimagequant-2.9.0.tar.gz) = 63765 bytes -SHA1 (patch-Makefile) = e1bd81385c268e104c9bf8c119c28831ba023d08 -SHA1 (patch-configure) = 361a1be4c617485d3cb1cac96b5f6f28b4b653a7 +SHA1 (libimagequant-2.9.1.tar.gz) = 4373a0bbef653dcf49a6672bd6d2ac6de07d837e +RMD160 (libimagequant-2.9.1.tar.gz) = 3289187153c0933549ffac7d1cf3ea8cfcce6f56 +SHA512 (libimagequant-2.9.1.tar.gz) = d852a992062204f1f365804c6908a107c78c20eca5a28ca9b6074b7f49d166cce0112017059e529c3730def04e9e2707272b542b98fc2d96dd985d76bc2f7d34 +Size (libimagequant-2.9.1.tar.gz) = 63892 bytes +SHA1 (patch-Makefile) = de68691e7c72ada2dd71624e1b11c47a91e8234a +SHA1 (patch-configure) = 8965ca3bf8989f8e78d7b635286eb4164a8d5460 diff --git a/graphics/libimagequant/patches/patch-Makefile b/graphics/libimagequant/patches/patch-Makefile index 3a5b8d84612..5f77a4a4ced 100644 --- a/graphics/libimagequant/patches/patch-Makefile +++ b/graphics/libimagequant/patches/patch-Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-Makefile,v 1.1 2017/01/29 11:57:03 adam Exp $ +$NetBSD: patch-Makefile,v 1.2 2017/06/19 20:14:45 adam Exp $ Libtoolize. ---- Makefile.orig 2017-01-29 09:14:56.000000000 +0000 +--- Makefile.orig 2017-04-05 16:21:29.000000000 +0000 +++ Makefile @@ -1,7 +1,7 @@ -include config.mk @@ -13,18 +13,19 @@ Libtoolize. SOVER=0 JNILIB=libimagequant.jnilib -@@ -38,11 +38,11 @@ $(STATICLIB): $(OBJS) +@@ -44,11 +44,11 @@ $(STATICLIB): $(OBJS) $(AR) $(ARFLAGS) $@ $^ $(SHAREDOBJS): - $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@ + ${LIBTOOL} --mode=compile $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@ - $(SHAREDLIB): $(SHAREDOBJS) +-libimagequant.so: $(SHAREDOBJS) - $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) -o $(SHAREDLIB).$(SOVER) $^ $(LDFLAGS) - ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB) ++$(SHAREDLIB): $(SHAREDOBJS) + ${LIBTOOL} --mode=link $(CC) -o $(SHAREDLIB) $^ $(LDFLAGS) \ + -rpath ${PREFIX}/lib -version-info $(subst .,:,$(VERSION)) - $(OBJS): $(wildcard *.h) config.mk - + libimagequant.dylib: $(SHAREDOBJS) + $(CC) -shared -o $(SHAREDLIB).$(SOVER) $^ $(LDFLAGS) diff --git a/graphics/libimagequant/patches/patch-configure b/graphics/libimagequant/patches/patch-configure index 26068cbe3d9..f1de4e36257 100644 --- a/graphics/libimagequant/patches/patch-configure +++ b/graphics/libimagequant/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.3 2017/03/27 13:14:49 jperkin Exp $ +$NetBSD: patch-configure,v 1.4 2017/06/19 20:14:45 adam Exp $ Remove unwanted compiler flags. ---- configure.orig 2017-03-02 01:07:29.000000000 +0000 +--- configure.orig 2017-04-05 16:21:29.000000000 +0000 +++ configure @@ -2,7 +2,7 @@ @@ -13,7 +13,7 @@ Remove unwanted compiler flags. DEBUG= SSE=auto -@@ -128,7 +128,7 @@ cflags "-std=c99 -I." +@@ -125,7 +125,7 @@ cflags "-std=c99 -I." # DEBUG if [ -z "$DEBUG" ]; then @@ -22,7 +22,7 @@ Remove unwanted compiler flags. status "Debug" "no" else cflags "-O1 -g" -@@ -166,15 +166,9 @@ if [ -n "$OPENMP" ]; then +@@ -163,15 +163,9 @@ if [ -n "$OPENMP" ]; then else OPENMPFLAGS="-fopenmp" fi @@ -38,10 +38,11 @@ Remove unwanted compiler flags. else # silence warnings about omp pragmas cflags "-Wno-unknown-pragmas" -@@ -183,19 +177,9 @@ else +@@ -179,20 +173,10 @@ else + status "OpenMP" "no" fi - # Cocoa +-# Cocoa -if [[ "$OSTYPE" =~ "darwin" ]]; then - cflags "-mmacosx-version-min=10.6" - lflags "-mmacosx-version-min=10.6" @@ -49,12 +50,12 @@ Remove unwanted compiler flags. if [[ "$OSTYPE" =~ "darwin" ]]; then SOLIBSUFFIX=dylib -- + - # Search Developer SDK paths, since Apple seems to have dropped the standard Unixy ones - XCODE_CMD="xcode-select" - XCODE_PATH=$($XCODE_CMD -p) - DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/lib") - DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib") + elif [[ "$OSTYPE" =~ "msys" ]]; then + SOLIBSUFFIX=dll else - SOLIBSUFFIX=so - fi |