From 3f953a2ddec7bb6ef86e6b906c149ac9ac57fa8f Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 30 Jan 2010 15:51:25 +0000
Subject: [PATCH] Move libtiff c++ bindings into it's own package

SVN-Revision: 19419
---
 libs/tiff/Makefile | 53 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index 252eb5b95..3bef86328 100644
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -15,11 +15,13 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.osgeo.org/libtiff
 PKG_MD5SUM:=93e56e421679c591de7552db13384cb8
-PKG_FIXUP:=libtool
 
-include $(INCLUDE_DIR)/package.mk
+PKG_FIXUP:=libtool-uclibcxx
+PKG_INSTALL:=1
+
+PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
 
-PKG_INSTALL=1
+include $(INCLUDE_DIR)/package.mk
 
 define Package/tiff/Default
   TITLE:=TIFF
@@ -30,10 +32,18 @@ define Package/libtiff
 $(call Package/tiff/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE+= libraries
+  TITLE+= library
   DEPENDS:=+zlib +libjpeg
 endef
 
+define Package/libtiffxx
+$(call Package/tiff/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE+= library(c++ bindings)
+  DEPENDS:=+libtiff +uclibcxx
+endef
+
 define Package/tiff-utils
 $(call Package/tiff/Default)
   SECTION:=utils
@@ -44,7 +54,32 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-CONFIGURE_ARGS += --without-x
+MAKE_FLAGS += \
+    CXX="g++-uc"
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		$(if $(CONFIG_PACKAGE_libtiffxx), \
+			--enable-cxx, \
+			--disable-cxx \
+		) \
+		--enable-ccitt \
+		--enable-packbits \
+		--enable-lzw \
+		--enable-thunder \
+		--enable-next \
+		--enable-logluv \
+		--enable-mdi \
+		--enable-zlib \
+		--enable-jpeg \
+		--disable-old-jpeg \
+		--disable-jbig \
+		--without-x \
+		--with-apple-opengl-framework \
+		, \
+		CXX="g++-uc" \
+	)
+endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/{lib,include}
@@ -54,7 +89,12 @@ endef
 
 define Package/libtiff/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiff.so.* $(1)/usr/lib/
+endef
+
+define Package/libtiffxx/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtiffxx.so.* $(1)/usr/lib/
 endef
 
 define Package/tiff-utils/install
@@ -63,4 +103,5 @@ define Package/tiff-utils/install
 endef
 
 $(eval $(call BuildPackage,libtiff))
+$(eval $(call BuildPackage,libtiffxx))
 $(eval $(call BuildPackage,tiff-utils))
-- 
2.30.2