aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2018-04-30 22:01:58 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-05-01 22:10:13 +0200
commitbfe53a78ef2b2618c4b28047c88f9c2e36010840 (patch)
tree536f91b2fe49bf93bbca2a518b697f9eca011dd8
parent2b21ba2fac486cf550399be7e6247de4e269595a (diff)
downloadbuildroot-bfe53a78ef2b2618c4b28047c88f9c2e36010840.tar.gz
buildroot-bfe53a78ef2b2618c4b28047c88f9c2e36010840.tar.bz2
libgeotiff: bump to version 1.4.2
- Add patch to fix autoheader issue: "missing template: GEO_NORMALIZE_DISABLE_TOWGS84" - Add hash for license file Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch20
-rw-r--r--package/libgeotiff/libgeotiff.hash3
-rw-r--r--package/libgeotiff/libgeotiff.mk2
3 files changed, 23 insertions, 2 deletions
diff --git a/package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch b/package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch
new file mode 100644
index 0000000000..a8a2d257cb
--- /dev/null
+++ b/package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch
@@ -0,0 +1,20 @@
+Fix GEO_NORMALIZE_DISABLE_TOWGS84 definition
+
+Fix "missing template: GEO_NORMALIZE_DISABLE_TOWGS84" error by adding
+a non-empty description of GEO_NORMALIZE_DISABLE_TOWGS84 in AC_DEFINE
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+Index: libgeotiff/configure.ac
+===================================================================
+--- libgeotiff/configure.ac (révision 2818)
++++ libgeotiff/configure.ac (copie de travail)
+@@ -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, [], [Disable WGS84 parameters]))
+
+ dnl #########################################################################
+ dnl Doxygen settings
diff --git a/package/libgeotiff/libgeotiff.hash b/package/libgeotiff/libgeotiff.hash
index 66b8cb74b2..a2b16ac0b2 100644
--- a/package/libgeotiff/libgeotiff.hash
+++ b/package/libgeotiff/libgeotiff.hash
@@ -1,2 +1,3 @@
# Locally computed
-sha1 4c6f405869826bb7d9f35f1d69167e3b44a57ef0 libgeotiff-1.4.0.tar.gz
+sha256 ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e libgeotiff-1.4.2.tar.gz
+sha256 16b83cf7c3bbfd20bffa768b9bfdb16506ca50f5c140a9f3431e740b155359c1 LICENSE
diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk
index 96f04c2e09..a1f234b33b 100644
--- a/package/libgeotiff/libgeotiff.mk
+++ b/package/libgeotiff/libgeotiff.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBGEOTIFF_VERSION = 1.4.0
+LIBGEOTIFF_VERSION = 1.4.2
LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
LIBGEOTIFF_LICENSE = X11-style, public domain
LIBGEOTIFF_LICENSE_FILES = LICENSE