diff options
| author | Luke <fried.roadkill+ght@gmail.com> | 2017-09-01 08:41:16 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-10-10 04:31:48 (GMT) |
| commit | 448c95ea6c8c14bc7cdae3271920e7efbbd98418 (patch) | |
| tree | 436da4c580ce9b90470788ddd0be1e1f000b8ad1 | |
| parent | 3aca05268dcd802c1350a17685ecc6d0f404461c (diff) | |
| download | mxe-448c95ea6c8c14bc7cdae3271920e7efbbd98418.zip mxe-448c95ea6c8c14bc7cdae3271920e7efbbd98418.tar.gz mxe-448c95ea6c8c14bc7cdae3271920e7efbbd98418.tar.bz2 | |
Update libgeotiff
| -rw-r--r-- | src/libgeotiff-1-fixes.patch | 28 | ||||
| -rw-r--r-- | src/libgeotiff.mk | 7 |
2 files changed, 29 insertions, 6 deletions
diff --git a/src/libgeotiff-1-fixes.patch b/src/libgeotiff-1-fixes.patch index aa831b4..62012d1 100644 --- a/src/libgeotiff-1-fixes.patch +++ b/src/libgeotiff-1-fixes.patch @@ -1,7 +1,18 @@ -diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac ---- libgeotiff-1.4.0.orig/configure.ac 2015-06-21 03:50:03.341076086 +0200 -+++ libgeotiff-1.4.0/configure.ac 2015-06-21 03:50:39.741125191 +0200 -@@ -280,7 +280,7 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Luke Potgieter <fried.roadkill+ght@gmail.com> +Date: Tue, 1 Aug 2017 10:20:44 +0200 +Subject: [PATCH] Patch template definitions + + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -281,7 +281,7 @@ elif test "$PROJ_LIB" != "" -a "$PROJ_INC" != "" ; then PROJ_INC=-I$PROJ_INC AC_SUBST(PROJ_INC,$PROJ_INC) @@ -10,3 +21,12 @@ diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac AC_DEFINE(HAVE_LIBPROJ) AC_SUBST([HAVE_LIBPROJ]) PROJ_CONFIG="yes" +@@ -317,7 +317,7 @@ fi + 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], [], [Description])) + + dnl ######################################################################### + dnl Doxygen settings diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index 1d0320a..99af429 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -4,8 +4,8 @@ PKG := libgeotiff $(PKG)_WEBSITE := https://trac.osgeo.org/geotiff/ $(PKG)_DESCR := GeoTiff $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.0 -$(PKG)_CHECKSUM := d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329 +$(PKG)_VERSION := 1.4.2 +$(PKG)_CHECKSUM := ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e $(PKG)_SUBDIR := libgeotiff-$($(PKG)_VERSION) $(PKG)_FILE := libgeotiff-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/geotiff/libgeotiff/$($(PKG)_FILE) @@ -18,6 +18,8 @@ define $(PKG)_UPDATE head -1 endef +# Note: towgs84 is set to disabled for binary compatibility to < 1.4.2 +# Enabling towgs84 *may* require some work. define $(PKG)_BUILD $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in' touch '$(1)/configure' @@ -26,6 +28,7 @@ define $(PKG)_BUILD $(MXE_CONFIGURE_OPTS) \ --with-jpeg \ --with-zlib \ + --disable-towgs84 \ LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4` -ljpeg -lz" $(MAKE) -C '$(1)' -j 1 all install \ LDFLAGS=-no-undefined \ |