From 7027cb84945812159b776d2fd89675ed660944cd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 25 Sep 2018 23:04:25 -0400 Subject: [PATCH] package_infos: x86_gcc2/* depend on FFmpeg. 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. --- src/data/package_infos/x86_64/haiku | 2 -- src/data/package_infos/x86_gcc2/haiku | 7 +++++++ src/data/package_infos/x86_gcc2/haiku_secondary | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 85e28eb240..e4cba478cb 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -116,9 +116,7 @@ requires { lib:libavcodec >= 58 lib:libavfilter >= 7 lib:libavformat >= 58 - lib:libavresample >= 4 lib:libavutil >= 56 - lib:libswscale >= 5 lib:libswresample >= 3 #endif #ifdef HAIKU_BUILD_FEATURE_X86_64_ZSTD_ENABLED diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 56b668d2d3..a48d9f29ea 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -113,6 +113,13 @@ requires { lib:libssl >= 1.0.0 lib:libcrypto >= 1.0.0 #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 lib:libzstd >= 1 #endif diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary index c6a5433001..baf49eabd3 100644 --- a/src/data/package_infos/x86_gcc2/haiku_secondary +++ b/src/data/package_infos/x86_gcc2/haiku_secondary @@ -40,12 +40,19 @@ requires { 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: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 lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH%