Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Merge ilmbase and openexr build features.

Browse Source 
Also only declare dependencies on OpenEXR libraries,
and let the ilmbase ones (which are now in the same package anyway)
get pulled in implicitly.
This commit is contained in:
Augustin Cavalier 2020-04-19 17:59:57 -04:00
parent b8aadcd2df
commit 14af814156
9 changed files with 10 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/jam/BuildFeatures
View File

@ -551,8 +551,7 @@ if [ IsPackageAvailable tiff4_devel ] {
# openexr
if [ IsPackageAvailable openexr_devel ]
&& [ IsPackageAvailable ilmbase_devel ] {
if [ IsPackageAvailable openexr_devel ] {
ExtractBuildFeatureArchives openexr :
file: base openexr
runtime: lib
@ -561,23 +560,6 @@ if [ IsPackageAvailable openexr_devel ]
libraries:
$(developLibDir)/libIlmImf.so
$(developLibDir)/libIlmImfUtil.so
headers: $(developHeadersDir) $(developHeadersDir)/OpenEXR
;
EnableBuildFeatures openexr ;
} else {
unavailableBuildFeatures += openexr ;
}
# ilmbase
if [ IsPackageAvailable ilmbase_devel ] {
ExtractBuildFeatureArchives ilmbase :
file: base ilmbase
runtime: lib
file: devel ilmbase_devel
depends: base
libraries:
$(developLibDir)/libHalf.so
$(developLibDir)/libIex.so
$(developLibDir)/libIexMath.so
@ -586,9 +568,9 @@ if [ IsPackageAvailable ilmbase_devel ] {
headers: $(developHeadersDir) $(developHeadersDir)/OpenEXR
;
EnableBuildFeatures ilmbase ;
EnableBuildFeatures openexr ;
} else {
unavailableBuildFeatures += ilmbase ;
unavailableBuildFeatures += openexr ;
}

2
build/jam/images/definitions/regular
View File

@ -124,7 +124,7 @@ SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
SYSTEM_ADD_ONS_TRANSLATORS += [ FFilterByBuildFeatures
BMPTranslator
EXRTranslator@ilmbase,openexr
EXRTranslator@openexr
GIFTranslator
HVIFTranslator
ICOTranslator ICNSTranslator@libicns

5
src/add-ons/translators/exr/Jamfile
View File

@ -8,11 +8,9 @@ local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
UseBuildFeatureHeaders openexr ;
UseBuildFeatureHeaders ilmbase ;
Includes [ FGristFiles ConfigView.cpp EXRTranslator.cpp EXRGamma.cpp
IStreamWrapper.cpp ]
: [ BuildFeatureAttribute openexr : headers ]
[ BuildFeatureAttribute ilmbase : headers ] ;
: [ BuildFeatureAttribute openexr : headers ] ;
Translator [ MultiArchDefaultGristFiles EXRTranslator ] :
main.cpp
@ -22,7 +20,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
IStreamWrapper.cpp
: be translation textencoding [ TargetLibstdc++ ]
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
[ BuildFeatureAttribute ilmbase : libraries ]
[ BuildFeatureAttribute openexr : libraries ]
localestub
: true

7
src/data/package_infos/riscv64/haiku
View File

@ -97,13 +97,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_RISCV64_LIBWEBP_ENABLED
lib:libwebp
#endif
#ifdef HAIKU_BUILD_FEATURE_RISCV64_ILMBASE_ENABLED
lib:libhalf
lib:libiex
lib:libiexmath
lib:libilmthread
lib:libimath
#endif
#ifdef HAIKU_BUILD_FEATURE_RISCV64_OPENEXR_ENABLED
lib:libilmimf
lib:libilmimfutil

7
src/data/package_infos/sparc/haiku
View File

@ -97,13 +97,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_SPARC_LIBWEBP_ENABLED
lib:libwebp
#endif
#ifdef HAIKU_BUILD_FEATURE_SPARC_ILMBASE_ENABLED
lib:libhalf
lib:libiex
lib:libiexmath
lib:libilmthread
lib:libimath
#endif
#ifdef HAIKU_BUILD_FEATURE_SPARC_OPENEXR_ENABLED
lib:libilmimf
lib:libilmimfutil

7
src/data/package_infos/x86/haiku
View File

@ -98,13 +98,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_LIBWEBP_ENABLED
lib:libwebp
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_ILMBASE_ENABLED
lib:libhalf
lib:libiex
lib:libiexmath
lib:libilmthread
lib:libimath
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_OPENEXR_ENABLED
lib:libilmimf
lib:libilmimfutil

11
src/data/package_infos/x86_64/haiku
View File

@ -98,16 +98,9 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_64_LIBWEBP_ENABLED
lib:libwebp
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_ILMBASE_ENABLED
lib:libhalf
lib:libiex
lib:libiexmath
lib:libilmthread
lib:libimath
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_OPENEXR_ENABLED
lib:libilmimf
lib:libilmimfutil
lib:libilmimf_2_4
lib:libilmimfutil_2_4
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_OPENSSL_ENABLED
lib:libssl

7
src/data/package_infos/x86_gcc2/haiku
View File

@ -98,13 +98,6 @@ requires {
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_LIBWEBP_ENABLED
lib:libwebp
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_ILMBASE_ENABLED
lib:libhalf
lib:libiex
lib:libiexmath
lib:libilmthread
lib:libimath
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_OPENEXR_ENABLED
lib:libilmimf
lib:libilmimfutil

9
src/data/package_infos/x86_gcc2/haiku_secondary
View File

@ -39,14 +39,9 @@ requires {
lib:libpng16_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 16.0
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libhalf_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiex_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiexmath_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmthread_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libimath_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimf_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimfutil_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimf_2_4_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimfutil_2_4_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libavcodec_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 58
lib:libavfilter_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 7