CVS commit: pkgsrc/geography/gdal-lib

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 16 21:24:47 UTC 2019

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile Makefile.common buildlink3.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/geography/gdal-lib/Makefile.common
cvs rdiff -u -r1.52 -r1.53 pkgsrc/geography/gdal-lib/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/gdal-lib/Makefile
diff -u pkgsrc/geography/gdal-lib/Makefile:1.114 pkgsrc/geography/gdal-lib/Makefile:1.115
--- pkgsrc/geography/gdal-lib/Makefile:1.114    Mon Jul  1 04:07:48 2019
+++ pkgsrc/geography/gdal-lib/Makefile  Tue Jul 16 21:24:47 2019
@@ -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 @@ CPPFLAGS+=    -D__STDC_LIMIT_MACROS
 .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"

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.5 pkgsrc/geography/gdal-lib/Makefile.common:1.6
--- pkgsrc/geography/gdal-lib/Makefile.common:1.5       Fri Mar 22 14:00:49 2019
+++ pkgsrc/geography/gdal-lib/Makefile.common   Tue Jul 16 21:24:47 2019
@@ -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 @@ DISTINFO_FILE=        ${.CURDIR}/../../geograph
 
 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-webp=${BUILDLINK
 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

Index: pkgsrc/geography/gdal-lib/buildlink3.mk
diff -u pkgsrc/geography/gdal-lib/buildlink3.mk:1.52 pkgsrc/geography/gdal-lib/buildlink3.mk:1.53
--- pkgsrc/geography/gdal-lib/buildlink3.mk:1.52        Mon Jul  1 04:07:48 2019
+++ pkgsrc/geography/gdal-lib/buildlink3.mk     Tue Jul 16 21:24:47 2019
@@ -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 @@ pkgbase := gdal-lib
 .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"