cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable the JP2OpenJPEG driver using the newly imported graphics/openjp2

Browse Source 
port. See http://www.gdal.org/frmt_jp2openjpeg.html for features and
differences with the jasper-based driver (mainly, being able to use
GeoJP2 support without needing a hacked up jasper library).
This commit is contained in:
landry 2013-10-30 15:22:33 +00:00
parent f0f074dada
commit b3cee68a04
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
geo/gdal/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2013/09/25 07:56:57 sthen Exp $
# $OpenBSD: Makefile,v 1.29 2013/10/30 15:22:33 landry Exp $
COMMENT-main = translator library for geospatial data formats
COMMENT-python =python bindings and utilities for GDAL
@ -6,7 +6,8 @@ COMMENT-perl = perl bindings for GDAL
V = 1.10.0
DISTNAME = gdal-${V}
REVISION-main = 0
REVISION-main = 1
REVISION-perl = 0
SHARED_ONLY = Yes
PKGNAME-main = ${DISTNAME}
@ -40,12 +41,14 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/giflib \
graphics/jpeg \
graphics/jasper \
graphics/openjp2 \
devel/pcre \
devel/proj \
devel/geotiff
WANTLIB-main = ${WANTLIB} c crypto expat m ssl stdc++ z tiff \
curl pq geos geos_c idn png gif jpeg jasper geotiff \
asn1 heimbase krb5 openjp2 roken wind \
com_err proj pthread freexl pcre spatialite sqlite3 xml2
@ -54,7 +57,7 @@ WANTLIB-python = ${MODPY_WANTLIB} gdal m pthread stdc++
LIB_DEPENDS-perl = ${PKGNAME}:${BASE_PKGPATH},-main
WANTLIB-perl = gdal crypto curl expat geos_c geotiff gif idn \
jasper jpeg m png pq ssl tiff z pthread \
jasper jpeg openjp2 m png pq ssl tiff z pthread \
freexl pcre spatialite xml2 \
${MODGETTEXT_WANTLIB}

24
geo/gdal/patches/patch-configure Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-configure,v 1.7 2013/10/30 15:22:33 landry Exp $
--- configure.orig Tue Oct 29 23:24:34 2013
+++ configure Tue Oct 29 23:25:28 2013
@@ -21882,9 +21882,9 @@ $as_echo "$as_me: OpenJPEG (JPEG2000) support disabled
elif test "$with_openjpeg" = "yes" -o "$with_openjpeg" = "" ; then
- for ac_header in openjpeg-2.0/openjpeg.h
+ for ac_header in openjp2/openjpeg.h
do :
- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "openjp2/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
@@ -21944,7 +21944,7 @@ fi
else
HAVE_OPENJPEG=yes
- if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then
+ if test -r $with_openjpeg/include/openjp2/openjpeg.h ; then
EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
else
as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0" "$LINENO" 5

12
geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-frmts_openjpeg_openjpegdataset_cpp,v 1.1 2013/10/30 15:22:33 landry Exp $
--- frmts/openjpeg/openjpegdataset.cpp.orig Wed Oct 30 07:59:03 2013
+++ frmts/openjpeg/openjpegdataset.cpp Wed Oct 30 07:59:13 2013
@@ -30,7 +30,7 @@
/* This file is to be used with openjpeg 2.0 */
#include <stdio.h> /* openjpeg.h needs FILE* */
-#include <openjpeg-2.0/openjpeg.h>
+#include <openjp2/openjpeg.h>
#include <vector>
#include "gdal_pam.h"