Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

ffmpeg: update to ffmpeg 6

Browse Source 
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 <kallisti5@unixzen.com>
This commit is contained in:
PulkoMandy 2023-12-29 15:47:56 +01:00 committed by Alex von Gluck IV
parent ce01e4ea9b
commit 5b5c8f7d41
5 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jamfile
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 {

6
build/jam/BuildFeatures
View File

@ -235,14 +235,14 @@ if [ IsPackageAvailable mesa_devel ] {
# FFmpeg
if [ IsPackageAvailable ffmpeg_devel ] {
if [ IsPackageAvailable ffmpeg6_devel ] {
local ffmpegLibs = libavformat.so libavcodec.so libavfilter.so libswscale.so
libavutil.so libswresample.so ;
ExtractBuildFeatureArchives ffmpeg :
file: base ffmpeg
file: base ffmpeg6
runtime: lib
file: devel ffmpeg_devel
file: devel ffmpeg6_devel
depends: base
libraries: $(developLibDir)/$(ffmpegLibs)
headers: $(developHeadersDir)

25
build/jam/repositories/HaikuPorts/x86_64
View File

@ -56,16 +56,16 @@ RemotePackageRepository HaikuPorts
ctags-5.8-5
curl-8.1.2-1
curl_devel-8.1.2-1
dav1d-1.2.1-1
dav1d_devel-1.2.1-1
dav1d-1.3.0-1
dav1d_devel-1.3.0-1
diffutils-3.10-3
enca-1.19-3
enca_devel-1.19-3
expat-2.5.0-2
expat_devel-2.5.0-2
fdk_aac-2.0.2-4
ffmpeg-4.2.9-1
ffmpeg_devel-4.2.9-1
ffmpeg6-6.1.1-2
ffmpeg6_devel-6.1.1-2
file-5.43-1
file_data-5.43-1
findutils-4.9.0-2
@ -96,7 +96,7 @@ RemotePackageRepository HaikuPorts
git_svn-2.37.3-1
glu-9.0.0-8
glu_devel-9.0.0-8
gmp-6.2.1-3
gmp-6.3.0-1
graphite2-1.3.14-2
graphite2_devel-1.3.14-2
grep-3.8-1
@ -121,8 +121,8 @@ RemotePackageRepository HaikuPorts
less-581.2-1
libass-0.17.1-1
libass_devel-0.17.1-1
libavif1.0-1.0.3-1
libavif1.0_devel-1.0.3-1
libavif1.0-1.0.4-1
libavif1.0_devel-1.0.4-1
libbluray-1.3.1-2
libbluray_devel-1.3.1-2
libdvdnav-6.1.1-2
@ -145,8 +145,7 @@ RemotePackageRepository HaikuPorts
libmodplug-0.8.9.0-2
libogg-1.3.5-2
libogg_devel-1.3.5-2
libopenmpt-0.6.2-1
libopenmpt_devel-0.6.2-1
libopenmpt-0.7.2-1
libpcap-1.10.4-1
libpcap_devel-1.10.4-1
libpcre2-10.39-2
@ -169,13 +168,13 @@ RemotePackageRepository HaikuPorts
libunistring-1.0-2
libvorbis-1.3.7-1
libvorbis_devel-1.3.7-1
libvpx-1.11.0-3
libvpx_devel-1.11.0-3
libvpx-1.13.1-1
libvpx_devel-1.13.1-1
libuuid-1.3.1-5
libwebp-1.3.2-1
libwebp_devel-1.3.2-1
libxml2-2.10.4-4
libxml2_devel-2.10.4-4
libxml2-2.12.5-1
libxml2_devel-2.12.5-1
libxslt-1.1.39-2
live555-2016.06.22-5
live555_devel-2016.06.22-5

10
src/data/package_infos/generic/haiku_datatranslators
View File

@ -19,11 +19,11 @@ requires {
#ifdef HAIKU_REGULAR_BUILD
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED
lib:libavcodec >= 58
lib:libavfilter >= 7
lib:libavformat >= 58
lib:libavutil >= 56
lib:libswresample >= 3
lib:libavcodec >= 60
lib:libavfilter >= 9
lib:libavformat >= 60
lib:libavutil >= 58
lib:libswresample >= 4
#endif
#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libicns_ENABLED
lib:libicns

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

@ -39,11 +39,11 @@ requires {
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
lib:libavformat_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 58
lib:libavutil_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 56
lib:libswresample_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 3
lib:libavcodec_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 60
lib:libavfilter_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 9
lib:libavformat_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 60
lib:libavutil_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 58
lib:libswresample_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 4
lib:libzstd_%HAIKU_SECONDARY_PACKAGING_ARCH% >= 1
#endif
lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%