[pkgsrc/trunk]: pkgsrc/geography/gdal-lib gdal-lib: Force the use of openjpeg...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/14217b10a1ce
branches:  trunk
changeset: 398336:14217b10a1ce
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jul 16 21:24:47 2019 +0000

description:
gdal-lib: Force the use of openjpeg over jasper for JPEG 2000 support

Add pkg-config to USE_TOOLS to ensure openjpeg gets detected properly.

See https://github.com/mdadams/jasper/issues/208

bump PKGREVISION

diffstat:

 geography/gdal-lib/Makefile        |  5 ++---
 geography/gdal-lib/Makefile.common |  8 ++++++--
 geography/gdal-lib/buildlink3.mk   |  3 +--
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 446730c4de58 -r 14217b10a1ce geography/gdal-lib/Makefile
--- a/geography/gdal-lib/Makefile       Tue Jul 16 21:19:19 2019 +0000
+++ b/geography/gdal-lib/Makefile       Tue Jul 16 21:24:47 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2019/07/01 04:07:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.115 2019/07/16 21:24:47 nia Exp $
 
-PKGREVISION=   3
+PKGREVISION=   4
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
 
@@ -35,7 +35,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
diff -r 446730c4de58 -r 14217b10a1ce geography/gdal-lib/Makefile.common
--- a/geography/gdal-lib/Makefile.common        Tue Jul 16 21:19:19 2019 +0000
+++ b/geography/gdal-lib/Makefile.common        Tue Jul 16 21:24:47 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2019/03/22 14:00:49 gdt Exp $
+# $NetBSD: Makefile.common,v 1.6 2019/07/16 21:24:47 nia Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
@@ -16,7 +16,7 @@
 
 CHECK_PORTABILITY_SKIP+=       mkbindist.sh
 
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake pkg-config
 USE_LANGUAGES=         c99 c++
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
@@ -30,3 +30,7 @@
 CONFIGURE_ARGS+=       --with-xerces
 CONFIGURE_ARGS+=       --with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include
 CONFIGURE_ARGS+=       --with-xerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c
+
+# force OpenJPEG for JPEG 2000 support
+CONFIGURE_ARGS+=       --without-jasper
+CONFIGURE_ARGS+=       --with-openjpeg
diff -r 446730c4de58 -r 14217b10a1ce geography/gdal-lib/buildlink3.mk
--- a/geography/gdal-lib/buildlink3.mk  Tue Jul 16 21:19:19 2019 +0000
+++ b/geography/gdal-lib/buildlink3.mk  Tue Jul 16 21:24:47 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2019/07/01 04:07:48 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2019/07/16 21:24:47 nia Exp $
 
 BUILDLINK_TREE+=       gdal-lib
 
@@ -25,7 +25,6 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"