diff options
Diffstat (limited to 'geography/gdal-lib/patches')
6 files changed, 34 insertions, 63 deletions
diff --git a/geography/gdal-lib/patches/patch-GDALmake.opt.in b/geography/gdal-lib/patches/patch-GDALmake.opt.in deleted file mode 100644 index 560a672a6dc..00000000000 --- a/geography/gdal-lib/patches/patch-GDALmake.opt.in +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-GDALmake.opt.in,v 1.3 2017/01/13 14:48:26 gdt Exp $ - -Fix occasional paralell build failure: - ogr/ogr_core.h:34:26: fatal error: gdal_version.h: No such file or directory -by ensuring we have the correct includes. - ---- GDALmake.opt.in.orig 2016-07-01 10:22:10.000000000 +0000 -+++ GDALmake.opt.in -@@ -66,7 +66,7 @@ INST_DOCS = @exec_prefix@/doc - INST_MAN = @mandir@ - INST_HTML = $(HOME)/www/gdal - --CPPFLAGS = @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION -+CPPFLAGS = @CPPFLAGS@ -I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore @EXTRA_INCLUDES@ -DGDAL_COMPILATION - CFLAGS = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS) - CXXFLAGS = @CXXFLAGS@ @CXX_WFLAGS@ $(USER_DEFS) - LDFLAGS = @LDFLAGS@ diff --git a/geography/gdal-lib/patches/patch-dist__docs_install__unx.sh b/geography/gdal-lib/patches/patch-dist__docs_install__unx.sh deleted file mode 100644 index bb34c92fe73..00000000000 --- a/geography/gdal-lib/patches/patch-dist__docs_install__unx.sh +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dist__docs_install__unx.sh,v 1.1 2017/01/13 02:26:04 gdt Exp $ - -Remediate bashisms. -Not yet reported upstream. - ---- dist_docs/install_unx.sh.orig 2016-07-01 08:55:08.000000000 +0000 -+++ dist_docs/install_unx.sh -@@ -58,7 +58,7 @@ done - cp share/gdal/* $PREFIX/share/gdal - - for EXECUTABLE in bin/* ; do -- if test "$EXECUTABLE" == "bin/gdal-config" -o "$EXECUTABLE" == "bin/burnpath" ; then -+ if test "$EXECUTABLE" = "bin/gdal-config" -o "$EXECUTABLE" = "bin/burnpath" ; then - /bin/true - else - cp $EXECUTABLE $PREFIX/bin diff --git a/geography/gdal-lib/patches/patch-frmts_grib_degrib18_degrib_myutil.c b/geography/gdal-lib/patches/patch-frmts_grib_degrib18_degrib_myutil.c index d17061b8d95..983163cdbc6 100644 --- a/geography/gdal-lib/patches/patch-frmts_grib_degrib18_degrib_myutil.c +++ b/geography/gdal-lib/patches/patch-frmts_grib_degrib18_degrib_myutil.c @@ -1,14 +1,14 @@ -$NetBSD: patch-frmts_grib_degrib18_degrib_myutil.c,v 1.1 2015/12/12 15:27:50 wiedi Exp $ +$NetBSD: patch-frmts_grib_degrib18_degrib_myutil.c,v 1.2 2018/02/19 12:05:17 ryoon Exp $ fix build on SunOS ---- frmts/grib/degrib18/degrib/myutil.c.orig 2015-09-16 10:21:15.000000000 +0000 +--- frmts/grib/degrib18/degrib/myutil.c.orig 2017-11-20 10:45:40.000000000 +0000 +++ frmts/grib/degrib18/degrib/myutil.c -@@ -12,7 +12,7 @@ - */ - - /* For S_IFDIR */ +@@ -23,7 +23,7 @@ + #ifdef _XOPEN_SOURCE + #undef _XOPEN_SOURCE + #endif -#define _XOPEN_SOURCE 500 +#define _XOPEN_SOURCE 600 + #endif + #include <stdlib.h> - #include <stdio.h> - #include <ctype.h> diff --git a/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp b/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp deleted file mode 100644 index f4a38905620..00000000000 --- a/geography/gdal-lib/patches/patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp,v 1.1 2016/12/17 23:24:31 joerg Exp $ - ---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2016-12-17 20:05:26.504722084 +0000 -+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp -@@ -206,7 +206,7 @@ static void JPEG2000_VSIL_jas_stream_ini - /* The buffer must be large enough to accommodate maximum
- putback. */
- assert(bufsize > JAS_STREAM_MAXPUTBACK);
-- stream->bufbase_ = JAS_CAST(uchar *, buf);
-+ stream->bufbase_ = JAS_CAST(unsigned char *, buf);
- stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
- }
- } else {
diff --git a/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile b/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile index 51490695ab1..1e82b7b48ad 100644 --- a/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile +++ b/geography/gdal-lib/patches/patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile @@ -1,15 +1,17 @@ -$NetBSD: patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile,v 1.1 2017/03/27 13:52:27 fhajny Exp $ +$NetBSD: patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile,v 1.2 2018/02/19 12:05:17 ryoon Exp $ Raise _XOPEN_SOURCE to 600 (for SunOS). ---- ogr/ogrsf_frmts/geojson/libjson/GNUmakefile.orig 2016-07-01 10:22:06.000000000 +0000 +--- ogr/ogrsf_frmts/geojson/libjson/GNUmakefile.orig 2017-11-20 10:45:35.000000000 +0000 +++ ogr/ogrsf_frmts/geojson/libjson/GNUmakefile -@@ -23,7 +23,7 @@ default: $(O_OBJ:.o=.$(OBJ_EXT)) +@@ -21,8 +21,8 @@ CPPFLAGS := $(CPPFLAGS) - # -D_XOPEN_SOURCE=500 to enable strdup() definition in C11 mode - ../../o/%.$(OBJ_EXT): %.c -- $(CC) $(CFLAGS) $(CPPFLAGS) -D_XOPEN_SOURCE=500 -c -o $@ $< -+ $(CC) $(CFLAGS) $(CPPFLAGS) -D_XOPEN_SOURCE=600 -c -o $@ $< + default: $(O_OBJ:.o=.$(OBJ_EXT)) + +-# -D_XOPEN_SOURCE=500 to enable strdup() definition in C11 mode +-CPPFLAGS := -D_XOPEN_SOURCE=500 $(CPPFLAGS) ++# -D_XOPEN_SOURCE=600 to enable strdup() definition in C11 mode ++CPPFLAGS := -D_XOPEN_SOURCE=600 $(CPPFLAGS) - clean: - rm -f *.o $(O_OBJ) + ../../o/%.$(OBJ_EXT): %.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/geography/gdal-lib/patches/patch-port_cpl__conv.cpp b/geography/gdal-lib/patches/patch-port_cpl__conv.cpp new file mode 100644 index 00000000000..bd40f15e226 --- /dev/null +++ b/geography/gdal-lib/patches/patch-port_cpl__conv.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-port_cpl__conv.cpp,v 1.1 2018/02/19 12:05:17 ryoon Exp $ + +* Fix build under NetBSD + +--- port/cpl_conv.cpp.orig 2017-11-20 10:45:32.000000000 +0000 ++++ port/cpl_conv.cpp +@@ -45,7 +45,7 @@ + #endif + + // For atoll (at least for NetBSD) +-#define _ISOC99_SOURCE ++#define _NETBSD_SOURCE + + #ifdef MSVC_USE_VLD + #include <vld.h> |