Skip to contentSkip to conversation

package/proj: bump version to 6.2.0

PATCH New Bernd Kuhls 2 participants 3 messages Oct 6, 2019 – Oct 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/proj: bump version to 6.2.0

Added dependency to sqlite:
https://github.com/OSGeo/PROJ/commit/4ad1477c24c3da4be6c7962606e6f9d47336b6a3

Needed for the libgeotiff version bump to 1.5.1.

---
 package/proj/Config.in | 1 +
 package/proj/proj.hash | 6 +++---
 package/proj/proj.mk   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)
package/proj/Config.in +1 -0
index 788aee8319..4880d3f2cd 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PROJ
 	bool "proj"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_SQLITE
 	help
 	  proj.4 is a standard UNIX filter function which converts
 	  geographic longitude and latitude coordinates into cartesian
package/proj/proj.hash +3 -3
index aadbc385df..c409544d77 100644
@@ -1,5 +1,5 @@
-# Fetched from http://download.osgeo.org/proj/proj-4.9.3.tar.gz.md5
-md5 15c8d7d6a8cb945c7878d0ff322a232c proj-5.0.1.tar.gz
+# Fetched from http://download.osgeo.org/proj/proj-6.2.0.tar.gz.md5
+md5 5cde556545828beaffbe50b1bb038480 proj-6.2.0.tar.gz
 # Locally calculated
-sha256 a792f78897482ed2c4e2af4e8a1a02e294c64e32b591a635c5294cb9d49fdc8c proj-5.0.1.tar.gz
+sha256 b300c0f872f632ad7f8eb60725edbf14f0f8f52db740a3ab23e7b94f1cd22a50 proj-6.2.0.tar.gz
 sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING
package/proj/proj.mk +2 -1
index 2969eb57ac..735e96bb5f 100644
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-PROJ_VERSION = 5.0.1
+PROJ_VERSION = 6.2.0
 PROJ_SITE = http://download.osgeo.org/proj
 PROJ_LICENSE = MIT
 PROJ_LICENSE_FILES = COPYING
 PROJ_INSTALL_STAGING = YES
+PROJ_DEPENDENCIES = sqlite
 
 PROJ_CFLAGS = $(TARGET_CFLAGS)
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/libgeotiff: bump version to 1.5.1

Removed patches applied upstream:
https://github.com/OSGeo/libgeotiff/commit/2fbae8298d7cc976d7c0f329fc26dafe57fb0fc4
https://github.com/OSGeo/libgeotiff/commit/b5895ac935914f5b5c2af66f78b11d059867d71a
https://github.com/OSGeo/libgeotiff/commit/edc9ec69b43c27955ee4f24db2e6808bb1a8974d

Updated upstream URL in Config.in due to the upstream switch to github:
https://trac.osgeo.org/geotiff/

Updated license hash after upstream commit:
https://github.com/OSGeo/libgeotiff/commit/e3dd2e1bf1ce58aa98d25cc778cb491794a13197

proj 6 is now a mandatory dependency:
https://github.com/OSGeo/libgeotiff/commit/a0526817886614c41ba5fdee4a5998bafcdff658

---
 package/libgeotiff/0001-use-pkg-config.patch  | 79 -------------------
 ...GEO_NORMALIZE_DISABLE_TOWGS84-define.patch | 20 -----
 ...tiff-configure.ac-do-not-check-for-C.patch | 65 ---------------
 package/libgeotiff/Config.in                  |  7 +-
 package/libgeotiff/libgeotiff.hash            |  4 +-
 package/libgeotiff/libgeotiff.mk              | 13 +--
 6 files changed, 11 insertions(+), 177 deletions(-)
 delete mode 100644 package/libgeotiff/0001-use-pkg-config.patch
 delete mode 100644 package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch
 delete mode 100644 package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch
package/libgeotiff/0001-use-pkg-config.patch deleted +0 -79
deleted file mode 100644
index a4b11f1523..0000000000
@@ -1,79 +0,0 @@
-Use pkg-config for libtiff detection
-
-Using pkg-config allows proper behavior in static-only contexts: the
-libtiff library might depend on libz and libjpeg.
-
-This patch also fixes a few other issues in the configure.ac script
-that prevents autoreconf to work, or proper detection of the proj
-library.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,39 +196,12 @@
- 
- TIFF_CONFIG="no"
- 
--AC_ARG_WITH(libtiff, [  --with-libtiff=dir      Use libtiff in directory dir],,)
--
--if test "$with_libtiff" != "" ; then
--  if test -f $with_libtiff/include/tiffio.h -a -d $with_libtiff/lib ; then
--    LIBS="-L$with_libtiff/lib -ltiff $LIBS"
--    TIFF_INC=-I$with_libtiff/include
--  else
--    LIBS="-L$with_libtiff -ltiff $LIBS"
--    TIFF_INC=-I$with_libtiff
--  fi
--  LIBS_SAVED="$LIBS"
--  AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes],
--               AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),-lm)
--  AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes],
--               AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of
--libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm)
--  LIBS="$LIBS_SAVED"
--else
--  AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes],
--               AC_MSG_ERROR([You will need to substantially rewrite libxtiff to
--build libgeotiff without libtiff]),-lm)
--  LIBS_SAVED="$LIBS"
--  AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes],
--               AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of
--libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm)
--  LIBS="$LIBS -ltiff"
--  TIFF_INC=
--  TIFF_CONFIG="yes"
--fi
--
-+PKG_CHECK_MODULES(LIBTIFF, libtiff-4)
-+TIFF_INC="$LIBTIFF_CFLAGS"
-+LIBS="$LIBS $LIBTIFF_LIBS"
-+TIFF_CONFIG="yes"
- 
- AC_SUBST([TIFF_INC])
--AC_SUBST([TIFF_PREFIX])
- AM_CONDITIONAL([TIFF_IS_CONFIG], [test ! x$TIFF_CONFIG = xno])
- 
- dnl
-@@ -280,15 +253,16 @@
-   PROJ_INC=-I$PROJ_INC
- 
-   AC_SUBST(PROJ_INC,$PROJ_INC)
--  AC_DEFINE(HAVE_PROJECTS_H)
-+  AC_DEFINE([HAVE_PROJECTS_H], [], [Whether proj library header is available])
-   AC_DEFINE(HAVE_LIBPROJ)
-   AC_SUBST([HAVE_LIBPROJ])
-   PROJ_CONFIG="yes"
--
- else
-   AC_CHECK_LIB(proj,pj_init,,,-lm)
-   AC_CHECK_HEADERS(proj_api.h,,)
--  PROJ_CONFIG="yes"
-+  if "$ac_cv_lib_proj_pj_init" = "yes" -a "$ac_cv_header_proj_api_h" = "yes"; then
-+    PROJ_CONFIG="yes"
-+  fi
- fi
- 
- AM_CONDITIONAL([PROJ_IS_CONFIG], [test ! x$PROJ_CONFIG = xno])
package/libgeotiff/0002-fix-GEO_NORMALIZE_DISABLE_TOWGS84-define.patch deleted +0 -20
deleted file mode 100644
index a8a2d257cb..0000000000
@@ -1,20 +0,0 @@
-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 <[email protected]>
-
-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
package/libgeotiff/0003-libgeotiff-configure.ac-do-not-check-for-C.patch deleted +0 -65

65 lines not on this page · raw message

package/libgeotiff/Config.in +6 -1
index 530cd450b4..60ca4115d9 100644
@@ -1,8 +1,13 @@
 config BR2_PACKAGE_LIBGEOTIFF
 	bool "libgeotiff"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # proj
+	select BR2_PACKAGE_PROJ
 	select BR2_PACKAGE_TIFF
 	help
 	  Libgeotiff is an open source library normally hosted on top of
 	  libtiff for reading, and writing GeoTIFF information tags.
 
-	  http://geotiff.osgeo.org
+	  https://github.com/OSGeo/libgeotiff
+
+comment "libgeotiff needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
package/libgeotiff/libgeotiff.hash +2 -2
index 08e8e06788..12d3b2a166 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265 libgeotiff-1.4.3.tar.gz
-sha256 16b83cf7c3bbfd20bffa768b9bfdb16506ca50f5c140a9f3431e740b155359c1 LICENSE
+sha256 f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c libgeotiff-1.5.1.tar.gz
+sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE
package/libgeotiff/libgeotiff.mk +3 -10
index a4606bc30c..4fc229cf0b 100644
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-LIBGEOTIFF_VERSION = 1.4.3
+LIBGEOTIFF_VERSION = 1.5.1
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
 LIBGEOTIFF_LICENSE = X11-style, public domain
 LIBGEOTIFF_LICENSE_FILES = LICENSE
-LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf
+LIBGEOTIFF_DEPENDENCIES = proj tiff host-pkgconf
 LIBGEOTIFF_INSTALL_STAGING = YES
-LIBGEOTIFF_AUTORECONF = YES
+LIBGEOTIFF_CONF_OPTS = --with-proj=$(STAGING_DIR)/usr
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 LIBGEOTIFF_DEPENDENCIES += zlib
@@ -26,11 +26,4 @@ else
 LIBGEOTIFF_CONF_OPTS += --without-jpeg
 endif
 
-ifeq ($(BR2_PACKAGE_PROJ),y)
-LIBGEOTIFF_DEPENDENCIES += proj
-LIBGEOTIFF_CONF_OPTS += --with-proj=$(STAGING_DIR)/usr
-else
-LIBGEOTIFF_CONF_OPTS += --without-proj
-endif
-
 $(eval $(autotools-package))
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 package/proj: bump version to 6.2.0

In reply to Bernd Kuhls
Quoted 11 lines · On Sun, 6 Oct 2019 15:47:34 +0200 Bernd Kuhls <[email protected]> wrote:

Added dependency to sqlite:
https://github.com/OSGeo/PROJ/commit/4ad1477c24c3da4be6c7962606e6f9d47336b6a3

Needed for the libgeotiff version bump to 1.5.1.

---
 package/proj/Config.in | 1 +
 package/proj/proj.hash | 6 +++---
 package/proj/proj.mk   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

Both applied. Thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com