Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libgeotiff: update to 1.6.0

Browse Source
This commit is contained in:
Andrew Sun
2020-05-18 13:11:56 -04:00
parent ebe977c92d
commit c0879e1d84
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mingw-w64-libgeotiff/PKGBUILD
View File

@@ -3,7 +3,7 @@
_realname=libgeotiff
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.5.1
pkgver=1.6.0
pkgrel=1
pkgdesc="TIFF based interchange format for georeferenced raster imagery (mingw-w64)"
arch=(any)
@@ -17,9 +17,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-libtool")
options=('staticlibs' 'strip')
source=("https://download.osgeo.org/geotiff/${_realname}/${_realname}-${pkgver}.tar.gz"
'libgeotiff_buildsys.patch')
sha256sums=('f9e99733c170d11052f562bcd2c7cb4de53ed405f7acdde4f16195cd3ead612c'
'0639212e7dee968ec303c70e98eb074e0ac31596388d3a62c10f3ab76c072ed5')
'libgeotiff_buildsys.patch')
sha256sums=('9311017e5284cffb86f2c7b7a9df1fb5ebcdc61c30468fb2e6bca36e4272ebca'
'fb7e213559f779905c913389ad715e3aaf849c0e8c8ef72df86d1ca313d9393b')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

35
mingw-w64-libgeotiff/libgeotiff_buildsys.patch
View File

@@ -1,48 +1,39 @@
diff -Naur libgeotiff-1.5.1.orig/bin/Makefile.am libgeotiff-1.5.1/bin/Makefile.am
--- libgeotiff-1.5.1.orig/bin/Makefile.am 2019-04-02 16:00:18.771074061 -0400
+++ libgeotiff-1.5.1/bin/Makefile.am 2019-04-02 16:01:42.484867414 -0400
diff -Naur libgeotiff-1.6.0.orig/bin/Makefile.am libgeotiff-1.6.0/bin/Makefile.am
--- libgeotiff-1.6.0.orig/bin/Makefile.am 2020-05-18 13:01:27.078949115 -0400
+++ libgeotiff-1.6.0/bin/Makefile.am 2020-05-18 13:03:10.903759320 -0400
@@ -12,9 +12,9 @@
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
-AM_CFLAGS = -I../ -I../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
-AM_CFLAGS = -I../ -I$(srcdir)/.. -I$(srcdir)/../libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libxtiff $(TIFF_CFLAGS) @PROJ_INCLUDE@
-LDADD = ../libgeotiff.la
+LDADD = $(top_builddir)/libgeotiff.la
EXTRA_DIST = getopt.c
diff -Naur libgeotiff-1.5.1.orig/libxtiff/Makefile.am libgeotiff-1.5.1/libxtiff/Makefile.am
--- libgeotiff-1.5.1.orig/libxtiff/Makefile.am 2019-04-02 16:00:18.771074061 -0400
+++ libgeotiff-1.5.1/libxtiff/Makefile.am 2019-04-02 16:04:25.129084271 -0400
diff -Naur libgeotiff-1.6.0.orig/libxtiff/Makefile.am libgeotiff-1.6.0/libxtiff/Makefile.am
--- libgeotiff-1.6.0.orig/libxtiff/Makefile.am 2020-05-18 13:01:27.072282278 -0400
+++ libgeotiff-1.6.0/libxtiff/Makefile.am 2020-05-18 13:03:33.455220288 -0400
@@ -4,7 +4,7 @@
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
-AM_CFLAGS = -I../ $(TIFF_CFLAGS)
-AM_CFLAGS = -I../ -I$(srcdir)/.. $(TIFF_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir) $(TIFF_CFLAGS)
libxtiff_la_SOURCES = xtiff.c
diff -Naur libgeotiff-1.5.1.orig/Makefile.am libgeotiff-1.5.1/Makefile.am
--- libgeotiff-1.5.1.orig/Makefile.am 2019-04-02 16:00:18.771074061 -0400
+++ libgeotiff-1.5.1/Makefile.am 2019-04-02 16:05:07.432645580 -0400
diff -Naur libgeotiff-1.6.0.orig/Makefile.am libgeotiff-1.6.0/Makefile.am
--- libgeotiff-1.6.0.orig/Makefile.am 2020-05-18 13:01:27.082282534 -0400
+++ libgeotiff-1.6.0/Makefile.am 2020-05-18 13:05:11.805886400 -0400
@@ -11,7 +11,7 @@
TIFF_CFLAGS = @TIFF_INC@ -DHAVE_TIFF=1
endif
-AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
-AM_CFLAGS = -I$(srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/libxtiff $(PROJ_CFLAGS) $(TIFF_CFLAGS)
include_HEADERS = geotiff.h \
geotiffio.h \
@@ -52,7 +52,7 @@
geo_strtod.c \
geotiff_proj4.c
-libgeotiff_la_LDFLAGS = -version-info 5:1:0
+libgeotiff_la_LDFLAGS = -version-info 5:1:0 -no-undefined
libgeotiff_la_LIBADD = libxtiff/libxtiff.la