mirror of
https://review.haiku-os.org/haiku
synced 2025-01-18 12:38:51 +01:00
Switch to tiff4 as system dependency.
This commit is contained in:
parent
0932b936eb
commit
d43720add9
2
Jamfile
2
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 {
|
||||
|
@ -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
|
||||
;
|
||||
|
||||
|
@ -81,7 +81,7 @@ requires {
|
||||
lib:libjpeg
|
||||
lib:libpng >= 16.0
|
||||
lib:libqrencode
|
||||
lib:libtiff
|
||||
lib:libtiff >= 5.2
|
||||
lib:libwebp
|
||||
#endif
|
||||
lib:libsolv
|
||||
|
@ -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%
|
||||
|
@ -80,7 +80,7 @@ requires {
|
||||
lib:libjpeg
|
||||
lib:libpng >= 16.0
|
||||
lib:libqrencode
|
||||
lib:libtiff
|
||||
lib:libtiff >= 5.2
|
||||
lib:libwebp
|
||||
#endif
|
||||
lib:libsolv
|
||||
|
@ -81,7 +81,7 @@ requires {
|
||||
lib:libjpeg
|
||||
lib:libpng >= 16.0
|
||||
lib:libqrencode
|
||||
lib:libtiff
|
||||
lib:libtiff >= 5.2
|
||||
lib:libwebp
|
||||
#endif
|
||||
lib:libsolv
|
||||
|
@ -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%
|
||||
|
Loading…
Reference in New Issue
Block a user