From 927d54c9cfd60e86f111bfc24d85b9d9f4c4544a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 11 Nov 2021 10:27:09 +0100
Subject: libtiff: use autotools for correct *.pc generation
---
package/libtiff/Makefile | 4 +---
package/libtiff/patches/patch-libtiff-4_pc_in | 14 ++++++++++++++
package/libtiff/patches/patch-libtiff-4_pc_in.orig | 11 +++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 package/libtiff/patches/patch-libtiff-4_pc_in
create mode 100644 package/libtiff/patches/patch-libtiff-4_pc_in.orig
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index dfb21684a..960605be8 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8
PKG_DESCR:= library for reading/writing tiff images
PKG_SECTION:= libs/image
PKG_NEEDS:= c++
-PKG_BUILDDEP:= cmake-host zlib xz
+PKG_BUILDDEP:= zlib xz
PKG_URL:= http://simplesystems.org/libtiff/
PKG_SITES:= http://download.osgeo.org/libtiff/
PKG_LIBNAME:= libtiff
@@ -22,8 +22,6 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIG_STYLE:= cmake
-
libtiff-install:
${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/
diff --git a/package/libtiff/patches/patch-libtiff-4_pc_in b/package/libtiff/patches/patch-libtiff-4_pc_in
new file mode 100644
index 000000000..4cd57a213
--- /dev/null
+++ b/package/libtiff/patches/patch-libtiff-4_pc_in
@@ -0,0 +1,14 @@
+--- tiff-4.3.0.orig/libtiff-4.pc.in 2021-03-05 14:01:43.000000000 +0100
++++ tiff-4.3.0/libtiff-4.pc.in 2021-11-06 16:42:35.662674034 +0100
+@@ -1,7 +1,7 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+
+ Name: libtiff
+ Description: Tag Image File Format (TIFF) library.
diff --git a/package/libtiff/patches/patch-libtiff-4_pc_in.orig b/package/libtiff/patches/patch-libtiff-4_pc_in.orig
new file mode 100644
index 000000000..0f2a0d925
--- /dev/null
+++ b/package/libtiff/patches/patch-libtiff-4_pc_in.orig
@@ -0,0 +1,11 @@
+--- tiff-4.3.0.orig/libtiff-4.pc.in 2021-03-05 14:01:43.000000000 +0100
++++ tiff-4.3.0/libtiff-4.pc.in 2021-11-06 16:38:54.408081670 +0100
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libtiff
+ Description: Tag Image File Format (TIFF) library.
+ Version: @VERSION@
+-Libs: -L${libdir} -ltiff
++Libs: -L${prefix}${libdir} -ltiff
+ Libs.private: @tiff_libs_private@
+-Cflags: -I${includedir}
++Cflags: -I${prefix}/${includedir}
--
cgit v1.2.3