i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to tiff4 as system dependency.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Jamfile
+1 -1
View File
@@ -32,7 +32,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
mesa mesa_devel mesa_swrast mesa mesa_devel mesa_swrast
netcat netcat
sed sharutils sed sharutils
tar tcpdump tiff unzip wget which zip tar tcpdump unzip wget which zip
}@ }@
] ; ] ;
if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 { if $(HAIKU_PACKAGING_ARCHS[1]) != x86_gcc2 {
build/jam/BuildFeatures
+4 -4
View File
@@ -504,13 +504,13 @@ if [ IsPackageAvailable qrencode_kdl_devel ] {
# tiff # tiff
if [ IsPackageAvailable tiff_devel ] { if [ IsPackageAvailable tiff4_devel ] {
ExtractBuildFeatureArchives tiff : ExtractBuildFeatureArchives tiff :
file: base tiff file: base tiff4
runtime: lib runtime: lib
file: devel tiff_devel file: devel tiff4_devel
depends: base depends: base
library: $(developLibDir)/libtiff.so.3 library: $(developLibDir)/libtiff.so.5
headers: $(developHeadersDir) $(developHeadersDir)/tiff headers: $(developHeadersDir) $(developHeadersDir)/tiff
; ;
src/data/package_infos/x86/haiku
+1 -1
View File
@@ -81,7 +81,7 @@ requires {
lib:libjpeg lib:libjpeg
lib:libpng >= 16.0 lib:libpng >= 16.0
lib:libqrencode lib:libqrencode
lib:libtiff lib:libtiff >= 5.2
lib:libwebp lib:libwebp
#endif #endif
lib:libsolv lib:libsolv
src/data/package_infos/x86/haiku_secondary
+2 -2
View File
@@ -36,8 +36,8 @@ requires {
lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif #endif
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%
src/data/package_infos/x86_64/haiku
+1 -1
View File
@@ -80,7 +80,7 @@ requires {
lib:libjpeg lib:libjpeg
lib:libpng >= 16.0 lib:libpng >= 16.0
lib:libqrencode lib:libqrencode
lib:libtiff lib:libtiff >= 5.2
lib:libwebp lib:libwebp
#endif #endif
lib:libsolv lib:libsolv
src/data/package_infos/x86_gcc2/haiku
+1 -1
View File
@@ -81,7 +81,7 @@ requires {
lib:libjpeg lib:libjpeg
lib:libpng >= 16.0 lib:libpng >= 16.0
lib:libqrencode lib:libqrencode
lib:libtiff lib:libtiff >= 5.2
lib:libwebp lib:libwebp
#endif #endif
lib:libsolv lib:libsolv
src/data/package_infos/x86_gcc2/haiku_secondary
+2 -2
View File
@@ -36,8 +36,8 @@ requires {
lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicns_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjasper_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif #endif
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%