Mercurial > mxe-octave
changeset 5106:8212b14b3233
libgeotiff: update to v1.5.0
* src/libgeotiff-1-noundefined.patch: update patch
* src/libgeotiff.mk: update version, checksum
| author | John Donoghue |
|---|---|
| date | Wed, 03 Jul 2019 13:06:07 -0400 |
| parents | ce340a7b24bd |
| children | c90ddbb50b65 |
| files | src/libgeotiff-1-noundefined.patch src/libgeotiff.mk |
| diffstat | 2 files changed, 26 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libgeotiff-1-noundefined.patch Wed Jul 03 12:58:12 2019 -0400 +++ b/src/libgeotiff-1-noundefined.patch Wed Jul 03 13:06:07 2019 -0400 @@ -1,55 +1,31 @@ -diff -ur libgeotiff-1.4.2.orig/configure.ac libgeotiff-1.4.2/configure.ac ---- libgeotiff-1.4.2.orig/configure.ac 2016-12-20 07:54:57.947571494 -0500 -+++ libgeotiff-1.4.2/configure.ac 2016-12-20 08:04:22.867573204 -0500 -@@ -281,7 +281,7 @@ - PROJ_INC=-I$PROJ_INC - - AC_SUBST(PROJ_INC,$PROJ_INC) -- AC_DEFINE(HAVE_PROJECTS_H) -+ AC_DEFINE([HAVE_PROJECTS_H],[],[D]) - AC_DEFINE(HAVE_LIBPROJ) - AC_SUBST([HAVE_LIBPROJ]) - PROJ_CONFIG="yes" -@@ -317,7 +317,7 @@ - AM_CONDITIONAL([CSV_IS_CONFIG], [test ! x$CSV_CONFIG = xno]) - - --AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84)) -+AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE([GEO_NORMALIZE_DISABLE_TOWGS84],[],[D])) +Common subdirectories: libgeotiff-1.5.0.orig/bin and libgeotiff-1.5.0/bin +Common subdirectories: libgeotiff-1.5.0.orig/cmake and libgeotiff-1.5.0/cmake +Common subdirectories: libgeotiff-1.5.0.orig/docs and libgeotiff-1.5.0/docs +Common subdirectories: libgeotiff-1.5.0.orig/libxtiff and libgeotiff-1.5.0/libxtiff +Common subdirectories: libgeotiff-1.5.0.orig/m4 and libgeotiff-1.5.0/m4 +diff -ut libgeotiff-1.5.0.orig/Makefile.am libgeotiff-1.5.0/Makefile.am +--- libgeotiff-1.5.0.orig/Makefile.am 2019-03-27 12:27:19.591626244 -0400 ++++ libgeotiff-1.5.0/Makefile.am 2019-03-27 12:33:15.357484044 -0400 +@@ -52,7 +52,7 @@ + geo_strtod.c \ + geotiff_proj4.c - dnl ######################################################################### - dnl Doxygen settings -diff -ur libgeotiff-1.4.2.orig/libxtiff/Makefile.am libgeotiff-1.4.2/libxtiff/Makefile.am ---- libgeotiff-1.4.2.orig/libxtiff/Makefile.am 2016-12-20 07:54:57.946488133 -0500 -+++ libgeotiff-1.4.2/libxtiff/Makefile.am 2016-12-20 07:55:59.005822766 -0500 -@@ -7,5 +7,6 @@ - AM_CFLAGS = -I../ $(TIFF_CFLAGS) - - libxtiff_la_SOURCES = xtiff.c -+libxtiff_la_LIBADD = -ltiff - - noinst_LTLIBRARIES = libxtiff.la -diff -ur libgeotiff-1.4.2.orig/Makefile.am libgeotiff-1.4.2/Makefile.am ---- libgeotiff-1.4.2.orig/Makefile.am 2016-12-20 07:54:57.948654856 -0500 -+++ libgeotiff-1.4.2/Makefile.am 2016-12-20 07:57:15.239801217 -0500 -@@ -110,7 +110,7 @@ - csv/unit_of_measure.c - endif - --libgeotiff_la_LDFLAGS = -version-info 3:2:1 -+libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined +-libgeotiff_la_LDFLAGS = -version-info 5:0:0 ++libgeotiff_la_LDFLAGS = -version-info 5:0:0 -no-undefined libgeotiff_la_LIBADD = libxtiff/libxtiff.la -diff -ur libgeotiff-1.4.2.orig/Makefile.in libgeotiff-1.4.2/Makefile.in ---- libgeotiff-1.4.2.orig/Makefile.in 2016-12-20 07:54:57.931321073 -0500 -+++ libgeotiff-1.4.2/Makefile.in 2016-12-20 07:57:58.276334784 -0500 -@@ -567,7 +567,7 @@ - geo_get.c geo_names.c geo_new.c geo_normalize.c geo_print.c \ - geo_set.c geo_simpletags.c geo_tiffp.c geo_trans.c geo_write.c \ - geo_strtod.c geotiff_proj4.c $(am__append_3) --libgeotiff_la_LDFLAGS = -version-info 3:2:1 -+libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined +diff -ut libgeotiff-1.5.0.orig/Makefile.in libgeotiff-1.5.0/Makefile.in +--- libgeotiff-1.5.0.orig/Makefile.in 2019-03-27 12:27:19.591626244 -0400 ++++ libgeotiff-1.5.0/Makefile.in 2019-03-27 12:33:46.430486814 -0400 +@@ -521,7 +521,7 @@ + geo_strtod.c \ + geotiff_proj4.c + +-libgeotiff_la_LDFLAGS = -version-info 5:0:0 ++libgeotiff_la_LDFLAGS = -version-info 5:0:0 -no-undefined libgeotiff_la_LIBADD = libxtiff/libxtiff.la lib_LTLIBRARIES = libgeotiff.la EXTRA_DIST = autogen.sh \ +Common subdirectories: libgeotiff-1.5.0.orig/man and libgeotiff-1.5.0/man +Common subdirectories: libgeotiff-1.5.0.orig/test and libgeotiff-1.5.0/test
--- a/src/libgeotiff.mk Wed Jul 03 12:58:12 2019 -0400 +++ b/src/libgeotiff.mk Wed Jul 03 13:06:07 2019 -0400 @@ -3,8 +3,8 @@ PKG := libgeotiff $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.2 -$(PKG)_CHECKSUM := a3147443276ed775c50d7581035e951b499a4536 +$(PKG)_VERSION := 1.5.0 +$(PKG)_CHECKSUM := 44782c8218aeb4a3dfbb5c1e8eae12690977dd9a $(PKG)_SUBDIR := libgeotiff-$($(PKG)_VERSION) $(PKG)_FILE := libgeotiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE)