tiff: use the outsourced packages.

* packages for secondary architectures would be welcomed.
This commit is contained in:
Jérôme Duval 2014-06-02 23:45:19 +02:00
parent da76d8da0c
commit 9cd7c6a433
11 changed files with 25 additions and 12 deletions

View File

@ -18,7 +18,7 @@ AddHaikuImagePackages [ FFilterByBuildFeatures
regular_image @{
bzip2 ctags ffmpeg findutils gawk glu grep gutenprint jpeg less libpng
mesa mesa_devel mesa_swrast sed sharutils tar wget which
mesa mesa_devel mesa_swrast sed sharutils tar tiff wget which
}@
] ;
# secondary architectures

View File

@ -385,6 +385,23 @@ if [ IsPackageAvailable qrencode_devel ] {
}
# tiff
if [ IsPackageAvailable tiff_devel ] {
ExtractBuildFeatureArchives tiff :
file: base tiff
runtime: lib
file: devel tiff_devel
depends: base
library: $(developLibDir)/libtiff.so.3
headers: $(developHeadersDir) $(developHeadersDir)/tiff
;
EnableBuildFeatures tiff ;
} else {
Echo "Tiff support not available on $(TARGET_PACKAGING_ARCH)" ;
}
# GPL add-ons
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {

View File

@ -73,7 +73,6 @@ rule HaikuImageGetSystemLibs
libpackage.so
libscreensaver.so
libtextencoding.so libtracker.so libtranslation.so
libtiff.so
] ]
;
}

View File

@ -2,8 +2,6 @@ SubDir HAIKU_TOP src add-ons translators tiff ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders tiff ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources TIFFTranslator : TIFFTranslator.rdef ;
@ -11,6 +9,8 @@ AddResources TIFFTranslator : TIFFTranslator.rdef ;
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
UseBuildFeatureHeaders tiff ;
Translator [ MultiArchDefaultGristFiles TIFFTranslator ] :
# [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ]
@ -19,11 +19,15 @@ for architectureObject in [ MultiArchSubDirSetup ] {
TIFFTranslator.cpp
TIFFView.cpp
: be libtiff.so translation
: be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
[ BuildFeatureAttribute tiff : library ]
$(TARGET_LIBSUPC++) localestub
: true
;
Includes [ FGristFiles TIFFTranslator.cpp TIFFView.cpp ]
: [ BuildFeatureAttribute tiff : headers ] ;
}
}

View File

@ -167,7 +167,6 @@ provides {
cmd:zipsplit
cmd:zmore
cmd:znew
lib:libtiff = 3.9.4 compat >= 3
}
requires {

View File

@ -167,7 +167,6 @@ provides {
cmd:zipsplit
cmd:zmore
cmd:znew
lib:libtiff = 3.9.4 compat >= 3
}
requires {

View File

@ -167,7 +167,6 @@ provides {
cmd:zipsplit
cmd:zmore
cmd:znew
lib:libtiff = 3.9.4 compat >= 3
}
requires {

View File

@ -167,7 +167,6 @@ provides {
cmd:zipsplit
cmd:zmore
cmd:znew
lib:libtiff = 3.9.4 compat >= 3
}
requires {

View File

@ -166,7 +166,6 @@ provides {
cmd:zipsplit
cmd:zmore
cmd:znew
lib:libtiff = 3.9.4 compat >= 3
}
requires {

View File

@ -167,7 +167,6 @@ provides {
cmd:zipsplit
cmd:zmore
cmd:znew
lib:libtiff = 3.9.4 compat >= 3
}
requires {

View File

@ -21,7 +21,6 @@ SubInclude HAIKU_TOP src libs posix_error_mapper ;
SubInclude HAIKU_TOP src libs print ;
SubInclude HAIKU_TOP src libs stdc++ ;
SubInclude HAIKU_TOP src libs termcap ;
SubInclude HAIKU_TOP src libs tiff ;
SubInclude HAIKU_TOP src libs udis86 ;
SubInclude HAIKU_TOP src libs util ;