Switch to tiff4 as system dependency.

This commit is contained in:
Jérôme Duval 2015-10-18 10:00:02 +02:00
parent 0932b936eb
commit d43720add9
7 changed files with 12 additions and 12 deletions

View File

@ -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 {

View File

@ -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
;

View File

@ -81,7 +81,7 @@ requires {
lib:libjpeg
lib:libpng >= 16.0
lib:libqrencode
lib:libtiff
lib:libtiff >= 5.2
lib:libwebp
#endif
lib:libsolv

View File

@ -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%

View File

@ -80,7 +80,7 @@ requires {
lib:libjpeg
lib:libpng >= 16.0
lib:libqrencode
lib:libtiff
lib:libtiff >= 5.2
lib:libwebp
#endif
lib:libsolv

View File

@ -81,7 +81,7 @@ requires {
lib:libjpeg
lib:libpng >= 16.0
lib:libqrencode
lib:libtiff
lib:libtiff >= 5.2
lib:libwebp
#endif
lib:libsolv

View File

@ -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%