pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics/libimagequant



Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  7 16:55:21 UTC 2023

Modified Files:
        pkgsrc/graphics/libimagequant: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/libimagequant/patches: patch-Makefile patch-configure
Removed Files:
        pkgsrc/graphics/libimagequant: cargo-depends.mk

Log Message:
libimagequant: downgrade to 2.18

4.x only provides a static library but graphviz needs a shared gd library
PR 57395 and https://github.com/ImageOptim/libimagequant/issues/109


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/libimagequant/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libimagequant/PLIST \
    pkgsrc/graphics/libimagequant/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/libimagequant/cargo-depends.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/libimagequant/distinfo
cvs rdiff -u -r0 -r1.8 pkgsrc/graphics/libimagequant/patches/patch-Makefile
cvs rdiff -u -r0 -r1.12 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.28 pkgsrc/graphics/libimagequant/Makefile:1.29
--- pkgsrc/graphics/libimagequant/Makefile:1.28 Sun May  7 12:24:08 2023
+++ pkgsrc/graphics/libimagequant/Makefile      Sun May  7 16:55:20 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2023/05/07 12:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2023/05/07 16:55:20 wiz Exp $
 
-DISTNAME=      libimagequant-4.2.0
+DISTNAME=      libimagequant-2.18.0
 CATEGORIES=    graphics
 MASTER_SITES+= ${MASTER_SITE_GITHUB:=ImageOptim/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -10,23 +10,28 @@ HOMEPAGE=   https://pngquant.org/lib/
 COMMENT=       High-quality conversion of RGBA images to 8-bit indexed-color
 LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/imagequant-sys
-
-.include "cargo-depends.mk"
-
-INSTALLATION_DIRS=     include lib/pkg-config
-
-post-build:
-       cd ${WRKSRC} && \
-        ${SED} 's|@PREFIX@|${PREFIX}|;s|@VERSION@|${VERSION}|' < imagequant.pc.in > imagequant.pc
+USE_LIBTOOL=           yes
+USE_TOOLS+=            bash gmake
+HAS_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --prefix="${PREFIX}"
+BUILD_TARGET=          shared
+
+CONFIG_SHELL=          ${BASH}
+INSTALLATION_DIRS=     include lib
+REPLACE_BASH=          configure
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "x86_64"
+CONFIGURE_ARGS+=       --enable-sse
+.else
+CONFIGURE_ARGS+=       --disable-sse
+.endif
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/libimagequant.h \
-               ${DESTDIR}${PREFIX}/include
-       ${INSTALL_DATA} ${WRKSRC}/imagequant.pc \
-               ${DESTDIR}${PREFIX}/lib/pkg-config
-       ${INSTALL_LIB} ${WRKSRC}/../target/release/libimagequant_sys.a \
-               ${DESTDIR}${PREFIX}/lib/libimagequant.a
+               ${DESTDIR}${PREFIX}/include/libimagequant.h
+       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+               ${WRKSRC}/libimagequant.la ${DESTDIR}${PREFIX}/lib
 
-.include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/libimagequant/PLIST
diff -u pkgsrc/graphics/libimagequant/PLIST:1.2 pkgsrc/graphics/libimagequant/PLIST:1.3
--- pkgsrc/graphics/libimagequant/PLIST:1.2     Sun May  7 12:24:08 2023
+++ pkgsrc/graphics/libimagequant/PLIST Sun May  7 16:55:20 2023
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2023/05/07 12:24:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/05/07 16:55:20 wiz Exp $
 include/libimagequant.h
-lib/libimagequant.a
-lib/pkg-config/imagequant.pc
+lib/libimagequant.la
Index: pkgsrc/graphics/libimagequant/buildlink3.mk
diff -u pkgsrc/graphics/libimagequant/buildlink3.mk:1.2 pkgsrc/graphics/libimagequant/buildlink3.mk:1.3
--- pkgsrc/graphics/libimagequant/buildlink3.mk:1.2     Sun May  7 12:24:08 2023
+++ pkgsrc/graphics/libimagequant/buildlink3.mk Sun May  7 16:55:20 2023
@@ -1,13 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2023/05/07 12:24:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2023/05/07 16:55:20 wiz Exp $
 
 BUILDLINK_TREE+=       libimagequant
 
 .if !defined(LIBIMAGEQUANT_BUILDLINK3_MK)
 LIBIMAGEQUANT_BUILDLINK3_MK:=
 
-BUILDLINK_DEPMETHOD.libimagequant?=    build
-
-BUILDLINK_API_DEPENDS.libimagequant+=  libimagequant>=4.2.0
+BUILDLINK_API_DEPENDS.libimagequant+=  libimagequant>=2.8.2<4
 BUILDLINK_PKGSRCDIR.libimagequant?=    ../../graphics/libimagequant
 .endif # LIBIMAGEQUANT_BUILDLINK3_MK
 

Index: pkgsrc/graphics/libimagequant/distinfo
diff -u pkgsrc/graphics/libimagequant/distinfo:1.31 pkgsrc/graphics/libimagequant/distinfo:1.32
--- pkgsrc/graphics/libimagequant/distinfo:1.31 Sun May  7 12:24:08 2023
+++ pkgsrc/graphics/libimagequant/distinfo      Sun May  7 16:55:20 2023
@@ -1,95 +1,7 @@
-$NetBSD: distinfo,v 1.31 2023/05/07 12:24:08 wiz Exp $
+$NetBSD: distinfo,v 1.32 2023/05/07 16:55:20 wiz Exp $
 
-BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
-SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-Size (adler-1.0.2.crate) = 12778 bytes
-BLAKE2s (ahash-0.8.3.crate) = 463c4e49539eb24c885915c860ed4fc060bc31e8d50069c2a3539c755ebc3f51
-SHA512 (ahash-0.8.3.crate) = cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
-Size (ahash-0.8.3.crate) = 42416 bytes
-BLAKE2s (arrayvec-0.7.2.crate) = 8aa10ad047a554cd7b40494bc9e022c75feb413f61b978dca46c1459ac913163
-SHA512 (arrayvec-0.7.2.crate) = 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
-Size (arrayvec-0.7.2.crate) = 29341 bytes
-BLAKE2s (autocfg-1.1.0.crate) = dd57bc2348994ace592664469f4b2389f230343402c627a9981eb582f10b0060
-SHA512 (autocfg-1.1.0.crate) = df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-Size (autocfg-1.1.0.crate) = 13272 bytes
-BLAKE2s (bitflags-1.3.2.crate) = e3a3b45a4403823875a03dbda329ca16068fa8f847cef81987c6b780101f2415
-SHA512 (bitflags-1.3.2.crate) = 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-Size (bitflags-1.3.2.crate) = 23021 bytes
-BLAKE2s (bytemuck-1.13.1.crate) = 2b3bc6492e16448601108eac8200825f1248c6214594f02fcd516f952fe7e796
-SHA512 (bytemuck-1.13.1.crate) = eb0a7e423a3f903fb831369e0c6d1e5fbffd7eff1b56bb7d1ffe4e5e18850cdfb9a7f9bdcfd53ce10b1c659dff11c59190b7b85ad89ca60485878548621f01c0
-Size (bytemuck-1.13.1.crate) = 42309 bytes
-BLAKE2s (cc-1.0.79.crate) = 17938b742da494c871322dd29eb6948f35a47beac2b647ef27ec595a33b8de91
-SHA512 (cc-1.0.79.crate) = cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
-Size (cc-1.0.79.crate) = 62624 bytes
-BLAKE2s (cfg-if-1.0.0.crate) = fbb02f63b24cc224b045ff2aac3aefd0a77cf7b578df4d5f9da9517a59aaf9bb
-SHA512 (cfg-if-1.0.0.crate) = 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-Size (cfg-if-1.0.0.crate) = 7934 bytes
-BLAKE2s (crc32fast-1.3.2.crate) = c60cd89cc50c52d5bedb1e7ce6c6299196d26700152f85282218c6fe15ec2a8b
-SHA512 (crc32fast-1.3.2.crate) = a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
-Size (crc32fast-1.3.2.crate) = 38661 bytes
-BLAKE2s (crossbeam-channel-0.5.8.crate) = f52230ed84b89bc15c117f5251f9575cf7c8672c7f44d589e9443a6a6c3e457c
-SHA512 (crossbeam-channel-0.5.8.crate) = 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
-Size (crossbeam-channel-0.5.8.crate) = 90455 bytes
-BLAKE2s (crossbeam-deque-0.8.3.crate) = 7cbeb24b31b979d705dd7aad84ebd1b3f25d939955c4c70dd3d8ad7cf26158eb
-SHA512 (crossbeam-deque-0.8.3.crate) = f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
-Size (crossbeam-deque-0.8.3.crate) = 21746 bytes
-BLAKE2s (crossbeam-epoch-0.9.14.crate) = f8dd3e189663f0a000109977fb35e4f0f4b931253da261fc4324c5fe82ca626a
-SHA512 (crossbeam-epoch-0.9.14.crate) = 543cb60cff7c0823733f6ace191b137a04025a2b40fe4fea5eb273772009627fb705aecf742bc59e01367d4c15a14aca73aa2caf7f4b509f4b25947e14fd1e19
-Size (crossbeam-epoch-0.9.14.crate) = 48524 bytes
-BLAKE2s (crossbeam-utils-0.8.15.crate) = e895a9fbc03fec8e54eae3634734ea34c740dd58c284575df9fa33bdff99cba4
-SHA512 (crossbeam-utils-0.8.15.crate) = adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
-Size (crossbeam-utils-0.8.15.crate) = 42326 bytes
-BLAKE2s (either-1.8.1.crate) = 337587245b86cc5cc5b8b9eac3cef2032d9c47569392c1816c218c59a2a37d67
-SHA512 (either-1.8.1.crate) = 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
-Size (either-1.8.1.crate) = 16027 bytes
-BLAKE2s (fallible_collections-0.4.7.crate) = d4eeea2918856295fb74258fe5e6700cc9113a4b8b3e5aadd64072d9fea5e2e7
-SHA512 (fallible_collections-0.4.7.crate) = cd20f266c5f544fc05307d782216f95140e17422097f57791a8f6124b6012bf0c6e90fe569957f55d6e0bb9585eb644370acbcd6f9763f20b714f76d0af31e68
-Size (fallible_collections-0.4.7.crate) = 49549 bytes
-BLAKE2s (flate2-1.0.26.crate) = 193e7c56b2d7808a79e4e8166aef689259715bf8011052313cf351d75319ac85
-SHA512 (flate2-1.0.26.crate) = a9f7b9e4adfd0a22fbf66e1cbcfe377cc03ec248c7fb7113097b839922b569cc96bf080089b8c800b35ec6f81b3f602a5860de55963b85f27ee6d75a9df88f3d
-Size (flate2-1.0.26.crate) = 70832 bytes
-BLAKE2s (hashbrown-0.13.2.crate) = 64d541f665f43ca787fd3f7a14c558df897bcb9372d9bd76ae2385dc0d967edf
-SHA512 (hashbrown-0.13.2.crate) = 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70
-Size (hashbrown-0.13.2.crate) = 105265 bytes
-BLAKE2s (hermit-abi-0.2.6.crate) = 37cb3bae542888f7efb0a48c9fed34fa42d9de604cf6dc0543dcc37d6fb78f51
-SHA512 (hermit-abi-0.2.6.crate) = bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
-Size (hermit-abi-0.2.6.crate) = 13027 bytes
-BLAKE2s (libc-0.2.142.crate) = 2506428fb94bfff22500073865dac34827aabd7dd4026b2303bf6b07d04e3fa9
-SHA512 (libc-0.2.142.crate) = 8eb465fea8bfa865aa592185ea2dd89a6d89252b0e44fb7398ae82c9fa031d501fc3a1c37e50d1971be528c6e1a4ca416da224ba82e5a8766ec598464593afdd
-Size (libc-0.2.142.crate) = 679343 bytes
-BLAKE2s (libimagequant-4.2.0.tar.gz) = a41fcbbae72b4b8308bfcc4e3f312dd312c8f4d23cd5c54e2c597920b9b306de
-SHA512 (libimagequant-4.2.0.tar.gz) = 3b023368c33990f72926036b8aa890104630e3a51aef85d3ef0a938961e7bad30c0662c5230df42c612fb3013e08c8cabea0e0e10855f2920601cdc981fe4033
-Size (libimagequant-4.2.0.tar.gz) = 87288 bytes
-BLAKE2s (lodepng-3.7.2.crate) = b4bb43ad9e696c17751d8cc9cf2db8ba158763a061ac90ebfd9e243f94250b97
-SHA512 (lodepng-3.7.2.crate) = f8a9a7e9d7583881c933404dbabc341943485131b25dd778f235a89f27ae1d613ce5b45d825f546ea1919b3599f80641f8479a216c801da27d2feddd59e8847c
-Size (lodepng-3.7.2.crate) = 48504 bytes
-BLAKE2s (memoffset-0.8.0.crate) = 2576a1ac2b4fcc3b66aac9f174d0c69f1ed224a00c7a9003054b3713e8b5b6bf
-SHA512 (memoffset-0.8.0.crate) = 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
-Size (memoffset-0.8.0.crate) = 8912 bytes
-BLAKE2s (miniz_oxide-0.7.1.crate) = 8828f41da010ee5dff26a15deb1e0973dca6c69b22521812b366e0977103416d
-SHA512 (miniz_oxide-0.7.1.crate) = 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
-Size (miniz_oxide-0.7.1.crate) = 55194 bytes
-BLAKE2s (num_cpus-1.15.0.crate) = 18e6ac6517f0d84c6852f63a3e99e261c0fd3cfece6080eaefec72a9ea0411b4
-SHA512 (num_cpus-1.15.0.crate) = fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
-Size (num_cpus-1.15.0.crate) = 15680 bytes
-BLAKE2s (once_cell-1.17.1.crate) = 4e7e4583b148b41c5ee92bcdab4b1ba6891d8f21f80b3f9c5c84e23a90dc6c8b
-SHA512 (once_cell-1.17.1.crate) = 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
-Size (once_cell-1.17.1.crate) = 32856 bytes
-BLAKE2s (rayon-1.7.0.crate) = b50186fe0ad931c3728cd6558535ee566c51f5b50b8da6128d7c72372be0f33c
-SHA512 (rayon-1.7.0.crate) = d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
-Size (rayon-1.7.0.crate) = 169488 bytes
-BLAKE2s (rayon-core-1.11.0.crate) = a2e17d5e4876a34a8f1661d85121c4c6195e5ec65f907d37108ea97118d8bb7a
-SHA512 (rayon-core-1.11.0.crate) = 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
-Size (rayon-core-1.11.0.crate) = 73118 bytes
-BLAKE2s (rgb-0.8.36.crate) = 6831cd101da349266349eef33c21ffda353262f78b31f33376afcc427c07e3d4
-SHA512 (rgb-0.8.36.crate) = e1e812b04e3c6b0ab93f7a10161eef808fe11888a5c1fc0060cd91fa90129c31491d5c64de0cec989acfcf66ce481bd61d9cdcdcb54e5bf2556da0e5c3bb7612
-Size (rgb-0.8.36.crate) = 16576 bytes
-BLAKE2s (scopeguard-1.1.0.crate) = d3884942354d25131c602303463c5686e520bd94daf216a810679acabf59b82e
-SHA512 (scopeguard-1.1.0.crate) = 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-Size (scopeguard-1.1.0.crate) = 11470 bytes
-BLAKE2s (thread_local-1.1.7.crate) = 30ffa86ff25796622be75de4031e817bf2c927f9c0f1c2331d511abe811a3fe8
-SHA512 (thread_local-1.1.7.crate) = 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31
-Size (thread_local-1.1.7.crate) = 13585 bytes
-BLAKE2s (version_check-0.9.4.crate) = a26f24d5e2c5e631462ebe434aa239957f5102009d3824d5dff2bc90d3c79fb0
-SHA512 (version_check-0.9.4.crate) = b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
-Size (version_check-0.9.4.crate) = 14895 bytes
+BLAKE2s (libimagequant-2.18.0.tar.gz) = 17a3a23927f5fc2e05401a5cb21430c026d040a2b6182a8d1696573d804af96b
+SHA512 (libimagequant-2.18.0.tar.gz) = ff2d4c2b901108525f403567ed2cc81dcda6e3600c58661de6324abb191ec04d954987e23b9c4d0e02cbec64ab905d717e3a0e1aecc6e1399ecc6126e889a356
+Size (libimagequant-2.18.0.tar.gz) = 382092 bytes
+SHA1 (patch-Makefile) = 979f07975806619b8bff6a7868c948903f8697db
+SHA1 (patch-configure) = 89e4a07015ba59e6688eeee35e30289d24ac5307

Added files:

Index: pkgsrc/graphics/libimagequant/patches/patch-Makefile
diff -u /dev/null pkgsrc/graphics/libimagequant/patches/patch-Makefile:1.8
--- /dev/null   Sun May  7 16:55:21 2023
+++ pkgsrc/graphics/libimagequant/patches/patch-Makefile        Sun May  7 16:55:21 2023
@@ -0,0 +1,35 @@
+$NetBSD: patch-Makefile,v 1.8 2023/05/07 16:55:21 wiz Exp $
+
+Libtoolize.
+
+--- Makefile.orig      2018-06-03 19:46:28.000000000 +0000
++++ Makefile
+@@ -1,7 +1,7 @@
+ -include config.mk
+ 
+ STATICLIB=libimagequant.a
+-SHAREDLIB=libimagequant.$(SOLIBSUFFIX)
++SHAREDLIB=libimagequant.la
+ SOVER=0
+ ifeq ($(SOLIBSUFFIX),dylib)
+       SHAREDLIBVER=libimagequant.$(SOVER).$(SOLIBSUFFIX)
+@@ -52,15 +52,11 @@ $(STATICLIB): $(OBJS)
+       $(AR) $(ARFLAGS) $@ $^
+ 
+ $(SHAREDOBJS):
+-      $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@
++      ${LIBTOOL} --mode=compile --tag=CC $(CC) -fPIC $(CFLAGS) -c $(@:.lo=.c) -o $@
+ 
+-libimagequant.so: $(SHAREDOBJS)
+-      $(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 --tag=CC $(CC) -o $(SHAREDLIB) $^ $(LDFLAGS) \
++              -rpath ${PREFIX}/lib -version-info $(subst .,:,$(basename $(VERSION)))
+ 
+ $(OBJS): $(wildcard *.h) config.mk
+ 

Index: pkgsrc/graphics/libimagequant/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/libimagequant/patches/patch-configure:1.12
--- /dev/null   Sun May  7 16:55:21 2023
+++ pkgsrc/graphics/libimagequant/patches/patch-configure       Sun May  7 16:55:21 2023
@@ -0,0 +1,53 @@
+$NetBSD: patch-configure,v 1.12 2023/05/07 16:55:21 wiz Exp $
+
+Remove unwanted compiler flags.
+Avoid leaving scratch files in /tmp.
+Do not look for Xcode.
+
+--- configure.orig     2020-11-22 13:18:54.000000000 +0000
++++ configure
+@@ -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
+@@ -157,7 +157,7 @@ cflags "-std=c99 -I."
+ 
+ # DEBUG
+ if [ -z "$DEBUG" ]; then
+-    cflags "-O3 -DNDEBUG"
++    cflags "-DNDEBUG"
+     status "Debug" "no"
+ else
+     cflags "-O1 -g -DDEBUG"
+@@ -195,15 +195,9 @@ if [ -n "$OPENMP" ]; then
+     else
+         OPENMPFLAGS="-fopenmp"
+     fi
+-    if [[ "$("$CC" -xc -E $OPENMPFLAGS <(echo "#ifdef _OPENMP
+-           #include <omp.h>
+-           #endif") 2>&1)" =~ "omp_get_thread_num" ]]; then
+         cflags "$OPENMPFLAGS"
+         lflags "$OPENMPFLAGS"
+         status "OpenMP" "yes"
+-    else
+-        error "OpenMP" "not supported by compiler (please install a compiler that supports OpenMP (e.g. gcc) and specify it with the CC= argument)"
+-    fi
+ else
+     # silence warnings about omp pragmas
+     cflags "-Wno-unknown-pragmas"
+@@ -223,10 +217,6 @@ 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/MacOSX.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib")
+-    DIRS+=("$XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include $XCODE_PATH/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/lib")
+ elif [[ "$OSTYPE" =~ "msys" ]]; then
+     SOLIBSUFFIX=dll
+ else



Home | Main Index | Thread Index | Old Index