From e5639b44098fac3507e1e12539fe4dbe6a1ac6f2 Mon Sep 17 00:00:00 2001
From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Date: Mon, 29 Aug 2016 11:37:11 +0200
Subject: [PATCH] libtiff: update recipe

This makes use of auto-package-* and makes a few features
optional. Since mingw build is disabled for now (see issue #220) we
also remove the mingw specific bits - getting the mingw build to work
again may require adding those back, or something entirely different,
so it's better if there's no confusing legacy settings.
---
 recipes/libtiff/tiff.inc | 63 +++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/recipes/libtiff/tiff.inc b/recipes/libtiff/tiff.inc
index b5e160383..9c83a212a 100644
--- a/recipes/libtiff/tiff.inc
+++ b/recipes/libtiff/tiff.inc
@@ -1,24 +1,61 @@
 DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)"
+HOMEPAGE = "http://www.libtiff.org/"
 LICENSE = "BSD-2-Clause*"
-HOMEPAGE = "http://www.remotesensing.org/libtiff/"
 
 RECIPE_TYPES = "machine native"
+SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz"
 
 COMPATIBLE_HOST_ARCHS = ".*linux"
 
-SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz"
+inherit autotools-autoreconf c++ auto-package-utils auto-package-libs
+
+RECIPE_FLAGS += "tiff_jpeg tiff_lzma tiff_zlib"
+DEFAULT_USE_tiff_jpeg = "1"
+DEFAULT_USE_tiff_lzma = "1"
+DEFAULT_USE_tiff_zlib = "1"
+
+TIFF_JPEG = ""
+TIFF_JPEG:USE_tiff_jpeg = "libjpeg"
+TIFF_LZMA = ""
+TIFF_LZMA:USE_tiff_lzma = "liblzma"
+TIFF_ZLIB = ""
+TIFF_ZLIB:USE_tiff_zlib = "libz"
+
+USE_FLAG_DEPENDS = "${TIFF_JPEG} ${TIFF_LZMA} ${TIFF_ZLIB}"
 
-inherit autotools c++
+DEPENDS += "libc libgcc-s libm libstdc++ ${USE_FLAG_DEPENDS}"
 
-OECONF_ARCHTUPLE = "ax_cv_check_gl_libgl=no"
+AUTO_PACKAGE_UTILS = "\
+  bmp2tiff    \
+  fax2ps      \
+  fax2tiff    \
+  gif2tiff    \
+  pal2rgb     \
+  ppm2tiff    \
+  ras2tiff    \
+  raw2tiff    \
+  rgb2ycbcr   \
+  thumbnail   \
+  tiff2bw     \
+  tiff2pdf    \
+  tiff2ps     \
+  tiff2rgba   \
+  tiffcmp     \
+  tiffcp      \
+  tiffcrop    \
+  tiffdither  \
+  tiffdump    \
+  tiffinfo    \
+  tiffmedian  \
+  tiffset     \
+  tiffsplit   \
+"
 
-PACKAGES =+ "${PN}-staticdev ${PN}-utils ${PN}-utils-dbg"
-FILES_${PN} += "${libdir}/libtiffxx.so.*"
-FILES_${PN}-dev += "${libdir}/libtiffxx.so ${libdir}/libtiffxx.la"
-FILES_${PN}-staticdev = "${libdir}/libtiffxx.a"
-FILES_${PN}-dbg += "${libdir}/.debug/libtiffxx.so*"
-FILES_${PN}-utils = "${bindir}/*"
-FILES_${PN}-utils-dbg += "${bindir}/.debug/"
+AUTO_PACKAGE_UTILS_DEPENDS = "libc libm libtiff ${USE_FLAG_DEPENDS}"
+AUTO_PACKAGE_UTILS_RDEPENDS = "libc libm libtiff ${USE_FLAG_DEPENDS}"
 
-LIBTOOL_HOST_SCRIPTS:HOST_LIBC_mingw = "libtool"
-LIBTOOL_HOST_SCRIPT_FIXUP:HOST_LIBC_mingw = "1"
+AUTO_PACKAGE_LIBS = "tiff tiffxx"
+AUTO_PACKAGE_LIBS_DEPENDS = "libc libm tiff-dev ${USE_FLAG_DEPENDS}"
+AUTO_PACKAGE_LIBS_RDEPENDS = "libc libm ${USE_FLAG_DEPENDS}"
+DEPENDS_${PN}-libtiffxx += "libgcc-s libstdc++ libtiff"
+RDEPENDS_${PN}-libtiffxx += "libgcc-s libstdc++ libtiff"