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

package_infos: x86_gcc2/* depend on FFmpeg.

Browse Source 
Previously, secondary arch FFmpeg was not installed at all. This commit
fixes that.

Also pare down the dependencies a little to what we actually use.
This commit is contained in:
Augustin Cavalier 2018-09-25 23:04:25 -04:00
parent 8865af3950
commit 7027cb8494
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,9 +116,7 @@ requires {
lib:libavcodec >= 58 lib:libavcodec >= 58
lib:libavfilter >= 7 lib:libavfilter >= 7
lib:libavformat >= 58 lib:libavformat >= 58
lib:libavresample >= 4
lib:libavutil >= 56 lib:libavutil >= 56
lib:libswscale >= 5
lib:libswresample >= 3 lib:libswresample >= 3
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_64_ZSTD_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_64_ZSTD_ENABLED

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

@ -113,6 +113,13 @@ requires {
lib:libssl >= 1.0.0 lib:libssl >= 1.0.0
lib:libcrypto >= 1.0.0 lib:libcrypto >= 1.0.0
#endif #endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_FFMPEG_ENABLED
lib:libavcodec >= 58
lib:libavfilter >= 7
lib:libavformat >= 58
lib:libavutil >= 56
lib:libswresample >= 3
#endif
#ifdef HAIKU_BUILD_FEATURE_X86_GCC2_ZSTD_ENABLED #ifdef HAIKU_BUILD_FEATURE_X86_GCC2_ZSTD_ENABLED
lib:libzstd >= 1 lib:libzstd >= 1
#endif #endif

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

@ -40,12 +40,19 @@ requires {
lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2 lib:libtiff_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 5.2
lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libwebp_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libhalf_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libhalf_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiex_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libiex_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libiexmath_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libiexmath_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmthread_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libilmthread_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libimath_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libimath_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimf_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libilmimf_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libilmimfutil_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libilmimfutil_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libavcodec_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 58
lib:libavfilter_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 7
lib:libavformat_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 58
lib:libavutil_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 56
lib:libswresample_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 3
#endif #endif
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH%