mingw-w64-libgeotiff: update to 1.4.2

3 files changed, 59 insertions, 133 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc7277786c0f..7721b8f00a07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = mingw-w64-libgeotiff
 	pkgdesc = A TIFF based interchange format for georeferenced raster imagery (mingw-w64)
-	pkgver = 1.4.1
+	pkgver = 1.4.2
 	pkgrel = 1
-	url = http://www.remotesensing.org/geotiff
+	url = https://trac.osgeo.org/geotiff/
 	arch = any
 	license = custom
 	makedepends = mingw-w64-configure
@@ -12,10 +12,10 @@ pkgbase = mingw-w64-libgeotiff
 	options = !buildflags
 	options = staticlibs
 	options = !strip
-	source = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.1.tar.gz
+	source = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.2.tar.gz
 	source = libgeotiff_buildsys.patch
-	sha256sums = acfc76ee19b3d41bb9c7e8b780ca55d413893a96c09f3b27bdb9b2573b41fd23
-	sha256sums = SKIP
+	sha256sums = ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e
+	sha256sums = ea3f8f94afd691281bdb71e9e16defb6e3b69a50e5c222a97bb2ef950a0761f9
 
 pkgname = mingw-w64-libgeotiff
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b970d8e98c0..c9a51c6bb7f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,54 @@
+# Maintainer: Andrew Sun <adsun701@gmail.com>
 
 pkgname=mingw-w64-libgeotiff
-pkgver=1.4.1
+pkgver=1.4.2
 pkgrel=1
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery (mingw-w64)"
 arch=('any')
-url="http://www.remotesensing.org/geotiff"
+url="https://trac.osgeo.org/geotiff/"
 license=('custom')
 depends=('mingw-w64-libtiff' 'mingw-w64-proj' 'mingw-w64-libjpeg-turbo')
 makedepends=('mingw-w64-configure')
 options=('!buildflags' 'staticlibs' '!strip')
-source=("http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$pkgver.tar.gz" libgeotiff_buildsys.patch)
-sha256sums=('acfc76ee19b3d41bb9c7e8b780ca55d413893a96c09f3b27bdb9b2573b41fd23' SKIP)
+source=("http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${pkgver}.tar.gz"
+        "libgeotiff_buildsys.patch")
+sha256sums=('ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e'
+            'ea3f8f94afd691281bdb71e9e16defb6e3b69a50e5c222a97bb2ef950a0761f9')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd ${srcdir}/libgeotiff-$pkgver
+  cd ${srcdir}/libgeotiff-${pkgver}
   patch -p1 -i ../libgeotiff_buildsys.patch
-  sed -i "s|la_LDFLAGS = -version-info|la_LDFLAGS = -no-undefined -version-info|g" Makefile.in
+  
+  # fix wrongly encoded files from tarball
+  for f in $(find . -type f); do
+    if file $f | grep -q ISO-8859 ; then
+      iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
+        mv -f ${f}.tmp $f
+    fi
+    if file $f | grep -q CRLF ; then
+      sed -i -e 's|\r$||g' $f
+    fi
+  done
+  
+  ./autogen.sh
 }
 
 build() {
-  cd ${srcdir}/libgeotiff-$pkgver
+  cd ${srcdir}/libgeotiff-${pkgver}
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-configure --with-proj --with-jpeg --with-zip
+    ${_arch}-configure \
+      --with-proj \
+      --with-jpeg \
+      --with-zip \
+      ..
 
     # FIXME: out-of-source build fails
-    cp ../*.h libxtiff
-    cp ../libxtiff/*.h libxtiff
-    cp ../*.inc bin
+    # cp ../*.h libxtiff
+    # cp ../libxtiff/*.h libxtiff
+    # cp ../*.inc bin
 
 #     ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release \
 #       -DGEOTIFF_CSV_DATA_DIR=$PWD/../csv \
@@ -43,10 +62,26 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/libgeotiff-$pkgver/build-${_arch}"
-    make DESTDIR="$pkgdir" install
-    rm -r "$pkgdir"/usr/${_arch}/share
-    rm "$pkgdir"/usr/${_arch}/bin/*.exe
+    cd "${srcdir}/libgeotiff-${pkgver}/build-${_arch}"
+    make DESTDIR="${pkgdir}" install
+    
+    mkdir -p "${pkgdir}"/usr/${_arch}/lib/pkgconfig/
+
+cat > ${pkgdir}/usr/${_arch}/lib/pkgconfig/libgeotiff.pc <<EOF
+prefix=/usr/${_arch}
+exec_prefix=\${prefix}
+libdir=\${prefix}/lib
+includedir=\${prefix}/include
+Name: libgeotiff
+Description: GeoTIFF file format library
+Version: ${pkgver}
+Libs: -L\${libdir} -lgeotiff
+Cflags: -I\${includedir}
+EOF
+    
+    rm -rf "${pkgdir}"/usr/${_arch}/share
+    find "${pkgdir}/usr/${_arch}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.exe
     ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
     ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
   done
diff --git a/libgeotiff_buildsys.patch b/libgeotiff_buildsys.patch
index 5b0d3d213860..567a3893e15a 100644
--- a/libgeotiff_buildsys.patch
+++ b/libgeotiff_buildsys.patch
@@ -1,107 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>mingw-libgeotiff.git - mingw-libgeotiff</title>
-<meta name='generator' content='cgit v0.10.2'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/mingw-libgeotiff.git/atom/libgeotiff_buildsys.patch?h=master' type='application/atom+xml'/>
-</head>
-<body>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a title='mingw-libgeotiff.git' href='/cgit/mingw-libgeotiff.git/'>mingw-libgeotiff.git</a></td><td class='form'><form method='get' action=''>
-<select name='h' onchange='this.form.submit();'>
-<option value='f17'>f17</option>
-<option value='f18'>f18</option>
-<option value='f19'>f19</option>
-<option value='f20'>f20</option>
-<option value='f21'>f21</option>
-<option value='f22'>f22</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>mingw-libgeotiff</td><td class='sub right'>Jon Ciesla</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/mingw-libgeotiff.git/'>summary</a><a href='/cgit/mingw-libgeotiff.git/refs/'>refs</a><a href='/cgit/mingw-libgeotiff.git/log/libgeotiff_buildsys.patch'>log</a><a class='active' href='/cgit/mingw-libgeotiff.git/tree/libgeotiff_buildsys.patch'>tree</a><a href='/cgit/mingw-libgeotiff.git/commit/libgeotiff_buildsys.patch'>commit</a><a href='/cgit/mingw-libgeotiff.git/diff/libgeotiff_buildsys.patch'>diff</a><a href='/cgit/mingw-libgeotiff.git/stats/libgeotiff_buildsys.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/mingw-libgeotiff.git/log/libgeotiff_buildsys.patch'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/cgit/mingw-libgeotiff.git/tree/'>root</a>/<a href='/cgit/mingw-libgeotiff.git/tree/libgeotiff_buildsys.patch'>libgeotiff_buildsys.patch</a></div><div class='content'>blob: 28abf9a886d1568c59a014c5922fbf975a9cd835 (<a href='/cgit/mingw-libgeotiff.git/plain/libgeotiff_buildsys.patch'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-<a id='n4' href='#n4'>4</a>
-<a id='n5' href='#n5'>5</a>
-<a id='n6' href='#n6'>6</a>
-<a id='n7' href='#n7'>7</a>
-<a id='n8' href='#n8'>8</a>
-<a id='n9' href='#n9'>9</a>
-<a id='n10' href='#n10'>10</a>
-<a id='n11' href='#n11'>11</a>
-<a id='n12' href='#n12'>12</a>
-<a id='n13' href='#n13'>13</a>
-<a id='n14' href='#n14'>14</a>
-<a id='n15' href='#n15'>15</a>
-<a id='n16' href='#n16'>16</a>
-<a id='n17' href='#n17'>17</a>
-<a id='n18' href='#n18'>18</a>
-<a id='n19' href='#n19'>19</a>
-<a id='n20' href='#n20'>20</a>
-<a id='n21' href='#n21'>21</a>
-<a id='n22' href='#n22'>22</a>
-<a id='n23' href='#n23'>23</a>
-<a id='n24' href='#n24'>24</a>
-<a id='n25' href='#n25'>25</a>
-<a id='n26' href='#n26'>26</a>
-<a id='n27' href='#n27'>27</a>
-<a id='n28' href='#n28'>28</a>
-<a id='n29' href='#n29'>29</a>
-<a id='n30' href='#n30'>30</a>
-<a id='n31' href='#n31'>31</a>
-<a id='n32' href='#n32'>32</a>
-<a id='n33' href='#n33'>33</a>
-<a id='n34' href='#n34'>34</a>
-<a id='n35' href='#n35'>35</a>
-<a id='n36' href='#n36'>36</a>
-<a id='n37' href='#n37'>37</a>
-<a id='n38' href='#n38'>38</a>
-<a id='n39' href='#n39'>39</a>
-<a id='n40' href='#n40'>40</a>
-<a id='n41' href='#n41'>41</a>
-<a id='n42' href='#n42'>42</a>
-<a id='n43' href='#n43'>43</a>
-<a id='n44' href='#n44'>44</a>
-<a id='n45' href='#n45'>45</a>
-<a id='n46' href='#n46'>46</a>
-<a id='n47' href='#n47'>47</a>
-<a id='n48' href='#n48'>48</a>
-<a id='n49' href='#n49'>49</a>
-<a id='n50' href='#n50'>50</a>
-<a id='n51' href='#n51'>51</a>
-<a id='n52' href='#n52'>52</a>
-<a id='n53' href='#n53'>53</a>
-<a id='n54' href='#n54'>54</a>
-<a id='n55' href='#n55'>55</a>
-<a id='n56' href='#n56'>56</a>
-<a id='n57' href='#n57'>57</a>
-<a id='n58' href='#n58'>58</a>
-<a id='n59' href='#n59'>59</a>
-<a id='n60' href='#n60'>60</a>
-<a id='n61' href='#n61'>61</a>
-<a id='n62' href='#n62'>62</a>
-</pre></td>
-<td class='lines'><pre><code>diff -rupN libgeotiff-1.4.0/bin/Makefile.am libgeotiff-1.4.0-new/bin/Makefile.am
+diff -rupN libgeotiff-1.4.0/bin/Makefile.am libgeotiff-1.4.0-new/bin/Makefile.am
 --- libgeotiff-1.4.0/bin/Makefile.am	2011-10-05 23:34:23.000000000 +0200
 +++ libgeotiff-1.4.0-new/bin/Makefile.am	2013-08-08 23:45:38.376229660 +0200
 @@ -10,9 +10,9 @@ if TIFF_IS_CONFIG
@@ -155,17 +52,11 @@ diff -rupN libgeotiff-1.4.0/Makefile.am libgeotiff-1.4.0-new/Makefile.am
  
  csvdir = $(datadir)/epsg_csv
 @@ -108,7 +108,7 @@ if CSV_IS_CONFIG
-                              csv/unit_of_measure.c 
+                              csv/unit_of_measure.c
  endif
  
--libgeotiff_la_LDFLAGS = -version-info 3:1:1
-+libgeotiff_la_LDFLAGS = -version-info 3:1:1 -no-undefined
+-libgeotiff_la_LDFLAGS = -version-info 3:2:1
++libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined
  
  libgeotiff_la_LIBADD = libxtiff/libxtiff.la
  
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated  by cgit v0.10.2 at 2015-02-27 19:04:32 (GMT)</div>
-</div> <!-- id=cgit -->
-</body>
-</html>