Received: by mail.netbsd.org (Postfix, from userid 605) id 5D43A84E99; Wed, 27 Jul 2022 18:32:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 95B6584E93 for ; Wed, 27 Jul 2022 18:32:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id l3Xp3761iGKZ for ; Wed, 27 Jul 2022 18:32:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E9EEF84D10 for ; Wed, 27 Jul 2022 18:32:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E31B4FB1A; Wed, 27 Jul 2022 18:32:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1658946731230930" MIME-Version: 1.0 Date: Wed, 27 Jul 2022 18:32:11 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/geography/gdal-lib To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220727183211.E31B4FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1658946731230930 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Jul 27 18:32:11 UTC 2022 Modified Files: pkgsrc/geography/gdal-lib: Makefile distinfo Added Files: pkgsrc/geography/gdal-lib/patches: patch-configure Log Message: gdal-lib: use pkgsrc png library name This should probably use pkg-config instead. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 pkgsrc/geography/gdal-lib/Makefile cvs rdiff -u -r1.57 -r1.58 pkgsrc/geography/gdal-lib/distinfo cvs rdiff -u -r0 -r1.5 pkgsrc/geography/gdal-lib/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1658946731230930 Content-Disposition: inline Content-Length: 3558 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/gdal-lib/Makefile diff -u pkgsrc/geography/gdal-lib/Makefile:1.147 pkgsrc/geography/gdal-lib/Makefile:1.148 --- pkgsrc/geography/gdal-lib/Makefile:1.147 Sun May 8 12:47:20 2022 +++ pkgsrc/geography/gdal-lib/Makefile Wed Jul 27 18:32:11 2022 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.147 2022/05/08 12:47:20 gdt Exp $ +# $NetBSD: Makefile,v 1.148 2022/07/27 18:32:11 wiz Exp $ .include "../../geography/gdal-lib/Makefile.common" PKGNAME= ${DISTNAME:S/gdal/gdal-lib/} -#PKGREVISION= 0 +PKGREVISION= 1 COMMENT= Translator library for raster geospatial data formats Index: pkgsrc/geography/gdal-lib/distinfo diff -u pkgsrc/geography/gdal-lib/distinfo:1.57 pkgsrc/geography/gdal-lib/distinfo:1.58 --- pkgsrc/geography/gdal-lib/distinfo:1.57 Fri Jul 8 13:22:57 2022 +++ pkgsrc/geography/gdal-lib/distinfo Wed Jul 27 18:32:11 2022 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.57 2022/07/08 13:22:57 gdt Exp $ +$NetBSD: distinfo,v 1.58 2022/07/27 18:32:11 wiz Exp $ BLAKE2s (gdal-3.5.1.tar.xz) = c84b17844c99ee83fe1946b5dced2f0e15763775f577ba3d36a86d5ebdf80e99 SHA512 (gdal-3.5.1.tar.xz) = d731b2b2bd5d300786e2e0eca296d302fda8bc9c76b41d7e78b728f82bb857c55a0d0ba65ae0ccd3b03c6b5812d0afee07940e4133b4b2c852a384c9fe00a8bc Size (gdal-3.5.1.tar.xz) = 8844808 bytes +SHA1 (patch-configure) = 86eae1d146161752ba9468d0aca7f2bb7f3b121b SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5 Added files: Index: pkgsrc/geography/gdal-lib/patches/patch-configure diff -u /dev/null pkgsrc/geography/gdal-lib/patches/patch-configure:1.5 --- /dev/null Wed Jul 27 18:32:11 2022 +++ pkgsrc/geography/gdal-lib/patches/patch-configure Wed Jul 27 18:32:11 2022 @@ -0,0 +1,50 @@ +$NetBSD: patch-configure,v 1.5 2022/07/27 18:32:11 wiz Exp $ + +Fix png library name. + +--- configure.orig 2022-06-30 09:26:31.000000000 +0000 ++++ configure +@@ -29988,13 +29988,13 @@ if test "$with_png" = "no" ; then + + elif test "$with_png" = "yes" -o "$with_png" = "" ; then + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_IHDR in -lpng" >&5 +-$as_echo_n "checking for png_set_IHDR in -lpng... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_IHDR in -lpng16" >&5 ++$as_echo_n "checking for png_set_IHDR in -lpng16... " >&6; } + if ${ac_cv_lib_png_png_set_IHDR+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpng $LIBS $LIBS" ++LIBS="-lpng16 $LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -30047,7 +30047,7 @@ done + PNG_SETTING=internal + fi + if test "$PNG_SETTING" = "external" ; then +- LIBS="-lpng $LIBS" ++ LIBS="-lpng16 $LIBS" + echo "using pre-installed libpng." + else + echo "using internal png code." +@@ -30062,7 +30062,7 @@ elif test "$with_png" = "internal" ; the + else + + PNG_SETTING=external +- LIBS="-L$with_png -L$with_png/lib -lpng $LIBS" ++ LIBS="-L$with_png -L$with_png/lib -lpng16 $LIBS" + EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES" + + echo "using libpng from $with_png." +@@ -39039,7 +39039,7 @@ if test "$with_pdfium" != "no" -a "$with + PDFIUM_LIB="-L$with_pdfium/lib -lpdfium" + fi + +- PDFIUM_LIB="$PDFIUM_LIB -lopenjp2 -ljpeg -lpng -lz -llcms2 -lpthread -lm -lstdc++" ++ PDFIUM_LIB="$PDFIUM_LIB -lopenjp2 -ljpeg -lpng16 -lz -llcms2 -lpthread -lm -lstdc++" + + if test ! -z "`uname | grep Darwin`" ; then + PDFIUM_LIB="-stdlib=libstdc++ $PDFIUM_LIB" --_----------=_1658946731230930--