Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 13 Oct 2020 18:41:44 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r552248 - in head/graphics/gdal: . files
Message-ID:  <202010131841.09DIfiDo063466@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: sunpoet
Date: Tue Oct 13 18:41:43 2020
New Revision: 552248
URL: https://svnweb.freebsd.org/changeset/ports/552248

Log:
  Update to 3.1.3
  
  Changes:	https://github.com/OSGeo/gdal/blob/release/3.1/gdal/NEWS
  PR:		250102
  Exp-run by:	antoine

Added:
  head/graphics/gdal/files/patch-apps-GNUmakefile
     - copied, changed from r552247, head/graphics/gdal/files/patch-apps_GNUmakefile
Deleted:
  head/graphics/gdal/files/patch-apps_GNUmakefile
  head/graphics/gdal/files/patch-configure
  head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp
Modified:
  head/graphics/gdal/Makefile
  head/graphics/gdal/distinfo
  head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp

Modified: head/graphics/gdal/Makefile
==============================================================================
--- head/graphics/gdal/Makefile	Tue Oct 13 18:41:37 2020	(r552247)
+++ head/graphics/gdal/Makefile	Tue Oct 13 18:41:43 2020	(r552248)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gdal
-PORTVERSION=	3.1.0
-PORTREVISION=	7
+PORTVERSION=	3.1.3
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet

Modified: head/graphics/gdal/distinfo
==============================================================================
--- head/graphics/gdal/distinfo	Tue Oct 13 18:41:37 2020	(r552247)
+++ head/graphics/gdal/distinfo	Tue Oct 13 18:41:43 2020	(r552248)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588929131
-SHA256 (gdal-3.1.0.tar.xz) = e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda
-SIZE (gdal-3.1.0.tar.xz) = 12076312
+TIMESTAMP = 1599924233
+SHA256 (gdal-3.1.3.tar.xz) = 161cf55371a143826f1d76ce566db1f0a666496eeb4371aed78b1642f219d51d
+SIZE (gdal-3.1.3.tar.xz) = 12087908

Copied and modified: head/graphics/gdal/files/patch-apps-GNUmakefile (from r552247, head/graphics/gdal/files/patch-apps_GNUmakefile)
==============================================================================
--- head/graphics/gdal/files/patch-apps_GNUmakefile	Tue Oct 13 18:41:37 2020	(r552247, copy source)
+++ head/graphics/gdal/files/patch-apps-GNUmakefile	Tue Oct 13 18:41:43 2020	(r552248)
@@ -1,6 +1,6 @@
---- apps/GNUmakefile.orig	2018-05-04 16:05:45 UTC
+--- apps/GNUmakefile.orig	2020-09-01 08:36:31 UTC
 +++ apps/GNUmakefile
-@@ -215,7 +215,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
+@@ -232,7 +232,7 @@ gdal-config-inst:	gdal-config.in ../GDALmake.opt ./GNU
  
  
  install: default

Modified: head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp
==============================================================================
--- head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp	Tue Oct 13 18:41:37 2020	(r552247)
+++ head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp	Tue Oct 13 18:41:43 2020	(r552248)
@@ -1,28 +1,11 @@
-Obtained from:	https://github.com/OSGeo/gdal/commit/e236eeaed1be45a4af457565085e3db1f2fc489f
-
---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig	2020-05-04 09:21:31 UTC
+--- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig	2020-09-01 08:39:25 UTC
 +++ frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,23 @@ typedef struct {
- * File stream object.
- \******************************************************************************/
- 
-+// PRIjas_seqent macro is defined since Jasper 2.0.17
-+
-+#ifndef PRIjas_seqent
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#else
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#endif
- {
-     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
-     return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
- 
-+#ifndef PRIjas_seqent
+@@ -109,7 +109,7 @@ static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, c
+ #ifndef PRIjas_seqent
  static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#else
+ #else
+-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
 +static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#endif
+ #endif
  {
      jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
-     return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010131841.09DIfiDo063466>