Skip to content

Commit d43720a

Browse files
committed
Switch to tiff4 as system dependency.
1 parent 0932b93 commit d43720a

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

Jamfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
3232
mesa mesa_devel mesa_swrast
3333
netcat
3434
sed sharutils
35-
tar tcpdump tiff unzip wget which zip
35+
tar tcpdump unzip wget which zip
3636
}@
3737
] ;
3838
if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {

build/jam/BuildFeatures

+4-4
Original file line numberDiff line numberDiff line change
@@ -504,13 +504,13 @@ if [ IsPackageAvailable qrencode_kdl_devel ] {
504504

505505

506506
# tiff
507-
if [ IsPackageAvailable tiff_devel ] {
507+
if [ IsPackageAvailable tiff4_devel ] {
508508
ExtractBuildFeatureArchives tiff :
509-
file: base tiff
509+
file: base tiff4
510510
runtime: lib
511-
file: devel tiff_devel
511+
file: devel tiff4_devel
512512
depends: base
513-
library: $(developLibDir)/libtiff.so.3
513+
library: $(developLibDir)/libtiff.so.5
514514
headers: $(developHeadersDir) $(developHeadersDir)/tiff
515515
;
516516

src/data/package_infos/x86/haiku

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ requires {
8181
lib:libjpeg
8282
lib:libpng >= 16.0
8383
lib:libqrencode
84-
lib:libtiff
84+
lib:libtiff >= 5.2
8585
lib:libwebp
8686
#endif
8787
lib:libsolv

src/data/package_infos/x86/haiku_secondary

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ requires {
3636
lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
3737
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
3838
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
39-
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
40-
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
39+
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
40+
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
4141
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
4242
#endif
4343
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%

src/data/package_infos/x86_64/haiku

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ requires {
8080
lib:libjpeg
8181
lib:libpng >= 16.0
8282
lib:libqrencode
83-
lib:libtiff
83+
lib:libtiff >= 5.2
8484
lib:libwebp
8585
#endif
8686
lib:libsolv

src/data/package_infos/x86_gcc2/haiku

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ requires {
8181
lib:libjpeg
8282
lib:libpng >= 16.0
8383
lib:libqrencode
84-
lib:libtiff
84+
lib:libtiff >= 5.2
8585
lib:libwebp
8686
#endif
8787
lib:libsolv

src/data/package_infos/x86_gcc2/haiku_secondary

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ requires {
3636
lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
3737
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
3838
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
39-
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
40-
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH%
39+
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
40+
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
4141
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
4242
#endif
4343
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%

0 commit comments

Comments
 (0)