Switch to tiff4 as system dependency.

sailfish009 · Oct 18, 2015 · d43720a · d43720a
1 parent 0932b93
commit d43720a
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/Jamfile b/Jamfile
@@ -32,7 +32,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
 		mesa mesa_devel mesa_swrast
 		netcat
 		sed sharutils
-		tar tcpdump tiff unzip wget which zip
+		tar tcpdump unzip wget which zip
 	}@
 ] ;
 if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
@@ -504,13 +504,13 @@ if [ IsPackageAvailable qrencode_kdl_devel ] {
 
 
 # tiff
-if [ IsPackageAvailable tiff_devel ] {
+if [ IsPackageAvailable tiff4_devel ] {
 	ExtractBuildFeatureArchives tiff :
-		file: base tiff
+		file: base tiff4
 			runtime: lib
-		file: devel tiff_devel
+		file: devel tiff4_devel
 			depends: base
-			library: $(developLibDir)/libtiff.so.3
+			library: $(developLibDir)/libtiff.so.5
 			headers: $(developHeadersDir) $(developHeadersDir)/tiff
 		;
 

diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
@@ -81,7 +81,7 @@ requires {
 	lib:libjpeg
 	lib:libpng >= 16.0
 	lib:libqrencode
-	lib:libtiff
+	lib:libtiff >= 5.2
 	lib:libwebp
 #endif
 	lib:libsolv

diff --git a/src/data/package_infos/x86/haiku_secondary b/src/data/package_infos/x86/haiku_secondary
@@ -36,8 +36,8 @@ requires {
 	lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
+	lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
+	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
 	lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
 #endif
 	lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%

diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku
@@ -80,7 +80,7 @@ requires {
 	lib:libjpeg
 	lib:libpng >= 16.0
 	lib:libqrencode
-	lib:libtiff
+	lib:libtiff >= 5.2
 	lib:libwebp
 #endif
 	lib:libsolv

diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku
@@ -81,7 +81,7 @@ requires {
 	lib:libjpeg
 	lib:libpng >= 16.0
 	lib:libqrencode
-	lib:libtiff
+	lib:libtiff >= 5.2
 	lib:libwebp
 #endif
 	lib:libsolv

diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary
@@ -36,8 +36,8 @@ requires {
 	lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
-	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
+	lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
+	lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
 	lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
 #endif
 	lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%