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

Bugfix update to gdal 1.11.2.

Browse Source 
See http://trac.osgeo.org/gdal/wiki/Release/1.11.2-News
Do a better job at detecting the correct version of openjpeg 2..
This commit is contained in:
landry 2015-02-17 21:47:43 +00:00
parent a40246921f
commit 8d374a70f0
5 changed files with 34 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
geo/gdal/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.34 2014/11/29 13:25:46 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2015/02/17 21:47:43 landry Exp $
COMMENT-main = translator library for geospatial data formats
COMMENT-python =python bindings and utilities for GDAL
COMMENT-perl = perl bindings for GDAL
V = 1.11.1
V = 1.11.2
DISTNAME = gdal-${V}
REVISION-main = 0
SHARED_ONLY = Yes
PKGNAME-main = ${DISTNAME}
@ -48,7 +47,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
WANTLIB-main = ${WANTLIB} c expat m stdc++ z tiff openjp2 ssl crypto \
curl pq geos geos_c idn png gif jpeg jasper json-c geotiff \
proj pthread freexl pcre spatialite sqlite3 xml2
proj pthread freexl pcre spatialite sqlite3 xml2 lzma
LIB_DEPENDS-python = ${PKGNAME}:${BASE_PKGPATH},-main

4
geo/gdal/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gdal-1.11.1.tar.gz) = 9GtZRKjKvIUWZz8jH0ZhMc39LNxmd9vuXZbsf8WKM0A=
SIZE (gdal-1.11.1.tar.gz) = 10731242
SHA256 (gdal-1.11.2.tar.gz) = ZryBktJOMUpm7WkoUYbUbmmZvrRPyX7rnHbYKhF8CEU=
SIZE (gdal-1.11.2.tar.gz) = 10746847

38
geo/gdal/patches/patch-configure
View File

@ -1,24 +1,24 @@
$OpenBSD: patch-configure,v 1.8 2014/05/04 20:17:35 landry Exp $
--- configure.orig Wed Apr 16 22:04:49 2014
+++ configure Wed Apr 30 22:15:37 2014
@@ -22142,9 +22142,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
$OpenBSD: patch-configure,v 1.9 2015/02/17 21:47:43 landry Exp $
--- configure.orig Tue Feb 10 13:12:08 2015
+++ configure Tue Feb 17 22:19:37 2015
@@ -22201,9 +22201,9 @@ fi
LIBS="-lopenjp2 $LIBS"
fi
else
- for ac_header in openjpeg-2.1/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 :
- ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "openjp2/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default"
if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
@@ -22204,7 +22204,7 @@ fi
else
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
@@ -22267,7 +22267,7 @@ 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
if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then
EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
- elif test -r $with_openjpeg/include/openjpeg-2.1/openjpeg.h ; then
+ elif test -r $with_openjpeg/include/openjp2/openjpeg.h ; then
OPENJPEG_VERSION=20100
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

47
geo/gdal/patches/patch-frmts_openjpeg_openjpegdataset_cpp
View File

@ -1,43 +1,12 @@
$OpenBSD: patch-frmts_openjpeg_openjpegdataset_cpp,v 1.3 2014/11/29 13:25:46 sthen Exp $
cope with API change in openjpeg 2.1.0 - similar to diff in
https://trac.osgeo.org/gdal/changeset/27538, but without #ifdefs.
--- frmts/openjpeg/openjpegdataset.cpp.orig Wed Sep 24 14:48:04 2014
+++ frmts/openjpeg/openjpegdataset.cpp Sat Nov 29 00:05:00 2014
$OpenBSD: patch-frmts_openjpeg_openjpegdataset_cpp,v 1.4 2015/02/17 21:47:43 landry Exp $
--- frmts/openjpeg/openjpegdataset.cpp.orig Tue Feb 17 22:16:39 2015
+++ frmts/openjpeg/openjpegdataset.cpp Tue Feb 17 22:16:55 2015
@@ -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>
#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
-#include <openjpeg-2.1/openjpeg.h>
+#include <openjp2/openjpeg.h>
#include <vector>
#include "gdaljp2abstractdataset.h"
@@ -612,7 +612,7 @@ CPLErr JP2OpenJPEGDataset::ReadBlock( int nBand, VSILF
opj_stream_set_read_function(pStream, JP2OpenJPEGDataset_Read);
opj_stream_set_seek_function(pStream, JP2OpenJPEGDataset_Seek);
opj_stream_set_skip_function(pStream, JP2OpenJPEGDataset_Skip);
- opj_stream_set_user_data(pStream, fp);
+ opj_stream_set_user_data(pStream, fp, NULL);
if(!opj_read_header(pStream,pCodec,&psImage))
{
@@ -950,7 +950,7 @@ GDALDataset *JP2OpenJPEGDataset::Open( GDALOpenInfo *
opj_stream_set_read_function(pStream, JP2OpenJPEGDataset_Read);
opj_stream_set_seek_function(pStream, JP2OpenJPEGDataset_Seek);
opj_stream_set_skip_function(pStream, JP2OpenJPEGDataset_Skip);
- opj_stream_set_user_data(pStream, fp);
+ opj_stream_set_user_data(pStream, fp, NULL);
opj_image_t * psImage = NULL;
OPJ_INT32 nX0,nY0;
@@ -1498,7 +1498,7 @@ GDALDataset * JP2OpenJPEGDataset::CreateCopy( const ch
opj_stream_set_write_function(pStream, JP2OpenJPEGDataset_Write);
opj_stream_set_seek_function(pStream, JP2OpenJPEGDataset_Seek);
opj_stream_set_skip_function(pStream, JP2OpenJPEGDataset_Skip);
- opj_stream_set_user_data(pStream, fp);
+ opj_stream_set_user_data(pStream, fp, NULL);
if (!opj_start_compress(pCodec,psImage,pStream))
{
#else
#include <stdio.h> /* openjpeg.h needs FILE* */
#include <openjpeg-2.0/openjpeg.h>

3
geo/gdal/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.10 2014/10/20 10:57:00 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.11 2015/02/17 21:47:43 landry Exp $
@conflict gdal-<=1.8.0
@pkgpath geo/gdal
bin/gdal-config
@ -133,6 +133,7 @@ share/gdal/pcs.override.csv
share/gdal/prime_meridian.csv
share/gdal/projop_wparm.csv
share/gdal/ruian_vf_ob_v1.gfs
share/gdal/ruian_vf_st_uvoh_v1.gfs
share/gdal/ruian_vf_st_v1.gfs
share/gdal/ruian_vf_v1.gfs
share/gdal/s57agencies.csv