Skip to contentSkip to conversation

libgeotiff: bump to version 1.4.0

PATCH New Thomas Petazzoni 2 participants 10 messages Oct 9, 2014 – Oct 10, 2014

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

PATCH 1/5 libgeotiff: bump to version 1.4.0

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/libgeotiff/libgeotiff.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libgeotiff/libgeotiff.mk +1 -1
index 5cfcbea..f6568c1 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGEOTIFF_VERSION = 1.3.0
+LIBGEOTIFF_VERSION = 1.4.0
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
 LIBGEOTIFF_DEPENDENCIES = tiff
 LIBGEOTIFF_INSTALL_STAGING = YES
Signature · 1 line
2.0.0
author
#1 lore raw

PATCH 2/5 libgeotiff: fix static linking issue

This commit adds a patch to improve the libgeotiff configure script to use pkg-config to detect libtiff, which allows to properly take into account dependant libraries such as libz and libjpeg.

As a consequence, we now autoreconf the libgeotiff package, and add host-pkgconf as a dependency.

Fixes:

http://autobuild.buildroot.org/results/649/6498d6516a412b12d68fa9f6a66172021abadc34/

Signed-off-by Thomas Petazzoni <[email protected]>
---
 .../libgeotiff-0001-use-pkg-config.patch           | 79 ++++++++++++++++++++++
 package/libgeotiff/libgeotiff.mk                   |  3 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 package/libgeotiff/libgeotiff-0001-use-pkg-config.patch
package/libgeotiff/libgeotiff-0001-use-pkg-config.patch new file +79 -0
new file mode 100644
index 0000000..a4b11f1
@@ -0,0 +1,79 @@
+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/libgeotiff.mk +2 -1
index f6568c1..722e71c 100644
@@ -6,7 +6,8 @@
 
 LIBGEOTIFF_VERSION = 1.4.0
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
-LIBGEOTIFF_DEPENDENCIES = tiff
+LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf
 LIBGEOTIFF_INSTALL_STAGING = YES
+LIBGEOTIFF_AUTORECONF = YES
 
 $(eval $(autotools-package))
Signature · 1 line
2.0.0
#2 lore raw

PATCH 2/5 libgeotiff: fix static linking issue

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

This commit adds a patch to improve the libgeotiff configure script to use pkg-config to detect libtiff, which allows to properly take into account dependant libraries such as libz and libjpeg.

Quoted 8 lines

As a consequence, we now autoreconf the libgeotiff package, and add host-pkgconf as a dependency.

Fixes:

http://autobuild.buildroot.org/results/649/6498d6516a412b12d68fa9f6a66172021abadc34/

Signed-off-by Thomas Petazzoni <[email protected]>

Committed, thanks. Don't forget to send the patch upstream.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 3/5 libgeotiff: explicit optional dependencies on zlib and jpeg

In reply to Thomas Petazzoni

In order to provide consistent behavior, this commit explicits the optional dependencies of libgeotiff on zlib and jpeg.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/libgeotiff/libgeotiff.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/libgeotiff/libgeotiff.mk +14 -0
index 722e71c..61f5c21 100644
@@ -10,4 +10,18 @@ LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf
 LIBGEOTIFF_INSTALL_STAGING = YES
 LIBGEOTIFF_AUTORECONF = YES
 
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LIBGEOTIFF_DEPENDENCIES += zlib
+LIBGEOTIFF_CONF_OPTS += --with-zlib
+else
+LIBGEOTIFF_CONF_OPTS += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+LIBGEOTIFF_DEPENDENCIES += jpeg
+LIBGEOTIFF_CONF_OPTS += --with-jpeg
+else
+LIBGEOTIFF_CONF_OPTS += --without-jpeg
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.0.0
#4 lore raw

PATCH 3/5 libgeotiff: explicit optional dependencies on zlib and jpeg

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

In order to provide consistent behavior, this commit explicits the optional dependencies of libgeotiff on zlib and jpeg.

Signed-off-by Thomas Petazzoni <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 4/5 libgeotiff: add license informations

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>

---
It would be good to get some independent review of the license information, since it's not really clear how to encode the license details provided in the LICENSE file into the LIBGEOTIFF_LICENSE variable.

Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/libgeotiff/libgeotiff.mk | 2 ++
 1 file changed, 2 insertions(+)
package/libgeotiff/libgeotiff.mk +2 -0
index 61f5c21..2bb0941 100644
@@ -6,6 +6,8 @@
 
 LIBGEOTIFF_VERSION = 1.4.0
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
+LIBGEOTIFF_LICENSE = X-style, public domain
+LIBGEOTIFF_LICENSE_FILES = LICENSE
 LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf
 LIBGEOTIFF_INSTALL_STAGING = YES
 LIBGEOTIFF_AUTORECONF = YES
Signature · 1 line
2.0.0
#6 lore raw

PATCH 4/5 libgeotiff: add license informations

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Signed-off-by Thomas Petazzoni <[email protected]>

---
It would be good to get some independent review of the license information, since it's not really clear how to encode the license details provided in the LICENSE file into the LIBGEOTIFF_LICENSE variable.

Yeah, I agree that it is a bit of a mess.

Quoted 10 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/libgeotiff/libgeotiff.mk | 2 ++
 1 file changed, 2 insertions(+)
package/libgeotiff/libgeotiff.mk +0 -0
index 61f5c21..2bb0941 100644

package/libgeotiff/libgeotiff.mk line 9

Quoted 4 lines
package/libgeotiff/libgeotiff.mk +1 -0
@@ -6,6 +6,8 @@
 
 LIBGEOTIFF_VERSION = 1.4.0
 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
+LIBGEOTIFF_LICENSE = X-style, public domain

I know that is what the license explicitly says, but the X refers to X11, and we use X11 elsewhere so I've changed it to X11-style.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#7 lore raw

PATCH 5/5 libgeotiff: add hash file

In reply to Thomas Petazzoni
Signed-off-by Thomas Petazzoni <[email protected]>
---
 package/libgeotiff/libgeotiff.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/libgeotiff/libgeotiff.hash
package/libgeotiff/libgeotiff.hash new file +2 -0
new file mode 100644
index 0000000..66b8cb7
@@ -0,0 +1,2 @@
+# Locally computed
+sha1 4c6f405869826bb7d9f35f1d69167e3b44a57ef0 libgeotiff-1.4.0.tar.gz
Signature · 1 line
2.0.0