ffmpeg: update to ffmpeg 6

Partial change, for testing on x86_64. You need to build with
-sHAIKU_NO_DOWNLOADS=1 and manually provide the needed packages in
generated/downloads.

Confirmed working on x86_64. Other platforms will need similar updates.

Change-Id: I81ca4b1d81bd18e64f50250970e00e0a072072d3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7278
Reviewed-by: Alex von Gluck IV <[email protected]>
This commit is contained in:
PulkoMandy
2024-03-26 21:44:17 +00:00
committed by Alex von Gluck IV
parent ce01e4ea9b
commit 5b5c8f7d41
5 changed files with 28 additions and 29 deletions
+3 -3
View File
@@ -25,7 +25,7 @@ AddHaikuImageSystemPackages [ FFilterByBuildFeatures
!gcc2 @{ coreutils icu74 }@
gcc2 @{ coreutils_x86 icu icu74_x86@secondary_x86 }@
regular_image @{
bzip2 expat ffmpeg glu gutenprint8 gzip
bzip2 expat ffmpeg6 glu gutenprint8 gzip
lame less libedit libicns
mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
netcat
@@ -47,7 +47,7 @@ AddHaikuImageSourcePackages [ FFilterByBuildFeatures
gcc2 @{ coreutils_x86 }@
regular_image @{
expat ffmpeg findutils grep gutenprint8 gzip
expat ffmpeg6 findutils grep gutenprint8 gzip
lame less libicns
sed sharutils
tar wget which
@@ -69,7 +69,7 @@ if $(HAIKU_PACKAGING_ARCHS[2]) {
freetype icu libsolv zlib
regular_image @{
ffmpeg glu jasper jpeg libavif libicns libpng16 libwebp mesa
ffmpeg6 glu jasper jpeg libavif libicns libpng16 libwebp mesa
}@
] ;
if $(TARGET_PACKAGING_ARCH) != x86_gcc2 {