diff options
| author | nia <nia@pkgsrc.org> | 2019-07-16 21:24:47 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-07-16 21:24:47 +0000 |
| commit | 01f2abc5fc06ba9f2ef65ef375860b289b73a6df (patch) | |
| tree | c4746e15037e4525368475b8745ecf0d3bd0738e /geography | |
| parent | a2c8fb7a1dfa2a172bfc64c5336b213f7088e3b5 (diff) | |
| download | pkgsrc-01f2abc5fc06ba9f2ef65ef375860b289b73a6df.tar.gz | |
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 (limited to 'geography')
| -rw-r--r-- | geography/gdal-lib/Makefile | 5 | ||||
| -rw-r--r-- | geography/gdal-lib/Makefile.common | 8 | ||||
| -rw-r--r-- | geography/gdal-lib/buildlink3.mk | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index 31dda9965a9..867a7a4eea9 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -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" diff --git a/geography/gdal-lib/Makefile.common b/geography/gdal-lib/Makefile.common index 4419f77144f..992a9151b85 100644 --- a/geography/gdal-lib/Makefile.common +++ b/geography/gdal-lib/Makefile.common @@ -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}/../../geography/gdal-lib/distinfo 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_PREFIX.libwebp} 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 --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index d83ecd79c83..262014defd3 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -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" |