hrev49699 adds 1 changeset to branch 'master'
old head: 0932b936eb7bd291f8af898869efdd576f1e25a0
new head: d43720add94bfca645b8297c72c0799a9d1c370f
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=d43720add94b+%5E0932b936eb7b
----------------------------------------------------------------------------
d43720add94b: Switch to tiff4 as system dependency.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49699
Commit: d43720add94bfca645b8297c72c0799a9d1c370f
URL: http://cgit.haiku-os.org/haiku/commit/?id=d43720add94b
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Sun Oct 18 08:00:02 2015 UTC
----------------------------------------------------------------------------
7 files changed, 12 insertions(+), 12 deletions(-)
Jamfile | 2 +-
build/jam/BuildFeatures | 8 ++++----
src/data/package_infos/x86/haiku | 2 +-
src/data/package_infos/x86/haiku_secondary | 4 ++--
src/data/package_infos/x86_64/haiku | 2 +-
src/data/package_infos/x86_gcc2/haiku | 2 +-
src/data/package_infos/x86_gcc2/haiku_secondary | 4 ++--
----------------------------------------------------------------------------
diff --git a/Jamfile b/Jamfile
index 67fa41b..5098859 100644
--- 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
index 38a57b7..dc941b7 100644
--- 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
index b15f70a..97f8eb7 100644
--- 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
index 576a1f1..ea8ce5e 100644
--- 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
index 1579da8..8e456e2 100644
--- 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
index f0ca21c..eae0aea 100644
--- 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
index e06dcf1..91e70e6 100644
--- 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%
