merge-libtiff4-libtiff3.patch

From 1e5452bed9a0a6daf1c88532cceb59cca9d23655 Mon Sep 17 00:00:00 2001
From: Joost Bremmer <[email protected]>
Date: Fri, 21 Aug 2015 03:26:41 +0200
Subject: [PATCH] Merge libtiff3 and libtiff4

Move relevant code from libtiff4 PKGBUILD to libtiff3 to avoid
messy and conflicting packages and dependency circles

Signed-off-by: Joost Bremmer <[email protected]>
---
 .SRCINFO | 16 ++++++++++++----
 PKGBUILD | 52 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index cb168a9..843264e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,21 @@
 pkgbase = libtiff3
-	pkgdesc = Library for manipulation of TIFF images (legacy version, provides libtiff.so.3)
+	pkgdesc = Library for manipulation of TIFF images (legacy version)
 	pkgver = 3.9.7
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.remotesensing.org/libtiff/
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = custom
-	depends = libtiff4
+	makedepends = freeglut
+	depends = libjpeg
+	depends = zlib
+	depends = libtiff
 	optdepends = freeglut: for using tiffgt
+	provides = libtiff3
+	provides = libtiff4
 	options = !libtool
+	source = http://download.osgeo.org/libtiff/tiff-3.9.7.tar.gz
+	sha256sums = f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a
 
 pkgname = libtiff3
 
diff --git a/PKGBUILD b/PKGBUILD
index 6de4e14..1184997 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,50 @@
 # Contributor: Miguel Revilla <[email protected]>
 # Contributor: josephgbr <[email protected]>
 # Contributor: Eric Bélanger <[email protected]>
+# Contributor: Joost Bremmer <toost dot b at gmail dot com>
 
 pkgname=libtiff3
 pkgver=3.9.7
-pkgrel=1
-pkgdesc="Library for manipulation of TIFF images (legacy version, provides libtiff.so.3)"
-arch=('any')
+pkgrel=2
+pkgdesc="Library for manipulation of TIFF images (legacy version)"
+arch=('i686' 'x86_64')
 url="http://www.remotesensing.org/libtiff/"
 license=('custom')
-depends=('libtiff4')
+depends=('libjpeg' 'zlib' 'libtiff')
+makedepends=('freeglut')
 optdepends=('freeglut: for using tiffgt')
+source=(http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz)
+sha256sums=('f5d64dd4ce61c55f5e9f6dc3920fbe5a41e02c2e607da7117a35eb5c320cef6a')
 options=('!libtool')
+provides=('libtiff3' 'libtiff4')
+
+build() {
+  cd "${srcdir}/tiff-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}/tiff-${pkgver}"
+  make check
+}
 
 package() {
-  cd "${pkgdir}"
-  mkdir usr
-  mkdir usr/lib
-  cd usr/lib
-  ln -s libtiff.so.${pkgver} libtiff.so.3
-  ln -s libtiffxx.so.${pkgver} libtiffxx.so.3
-  cd ..
-  mkdir share
-  mkdir share/licenses
-  cd share/licenses
-  ln -s libtiff4 libtiff3
+  cd "${srcdir}/tiff-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  # Cleaning binaries and headers
+  rm -rvf ${pkgdir}/usr/bin
+  rm -rvf ${pkgdir}/usr/include
+  # Remove documentation
+  rm -rvf ${pkgdir}/usr/share/man
+  rm -rvf ${pkgdir}/usr/share/doc
+  # Fix libraries
+  cd ${pkgdir}/usr/lib/
+  # Remove main library, this is supplied by libtiff package
+  rm -vf libtiff.{a,so} libtiffxx.{a,so}
+  # http://www.asmail.be/msg0055009514.html
+  ln -svf libtiff.so.${pkgver} libtiff.so.4
+  ln -svf libtiffxx.so.${pkgver} libtiffxx.so.4
 }
+
-- 
2.5.0