Sync ffmpeg-custom with regular ffmpeg
This commit is contained in:
parent
ad67b9dcad
commit
5cd5071f2f
|
@ -10,7 +10,7 @@
|
||||||
_name=ffmpeg
|
_name=ffmpeg
|
||||||
pkgname=ffmpeg-custom
|
pkgname=ffmpeg-custom
|
||||||
pkgver=6.0
|
pkgver=6.0
|
||||||
pkgrel=2
|
pkgrel=3
|
||||||
epoch=1
|
epoch=1
|
||||||
pkgdesc='Complete solution to record, convert and stream audio and video (with more features enabled than regular ffmpeg)'
|
pkgdesc='Complete solution to record, convert and stream audio and video (with more features enabled than regular ffmpeg)'
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
@ -37,7 +37,6 @@ depends=(
|
||||||
libgl
|
libgl
|
||||||
libiec61883
|
libiec61883
|
||||||
libjxl.so
|
libjxl.so
|
||||||
libmfx
|
|
||||||
libmodplug
|
libmodplug
|
||||||
libopenmpt.so
|
libopenmpt.so
|
||||||
libpulse
|
libpulse
|
||||||
|
@ -55,7 +54,6 @@ depends=(
|
||||||
libvorbis.so
|
libvorbis.so
|
||||||
libvorbisenc.so
|
libvorbisenc.so
|
||||||
libvpx.so
|
libvpx.so
|
||||||
libvulkan.so
|
|
||||||
libwebp
|
libwebp
|
||||||
libx11
|
libx11
|
||||||
libx264.so
|
libx264.so
|
||||||
|
@ -67,6 +65,7 @@ depends=(
|
||||||
libxvidcore.so
|
libxvidcore.so
|
||||||
libzimg.so
|
libzimg.so
|
||||||
ocl-icd
|
ocl-icd
|
||||||
|
onevpl
|
||||||
opencore-amr
|
opencore-amr
|
||||||
openjpeg2
|
openjpeg2
|
||||||
opus
|
opus
|
||||||
|
@ -76,6 +75,7 @@ depends=(
|
||||||
svt-av1
|
svt-av1
|
||||||
v4l-utils
|
v4l-utils
|
||||||
vmaf
|
vmaf
|
||||||
|
vulkan-icd-loader
|
||||||
xz
|
xz
|
||||||
zlib
|
zlib
|
||||||
|
|
||||||
|
@ -98,7 +98,8 @@ makedepends=(
|
||||||
)
|
)
|
||||||
optdepends=(
|
optdepends=(
|
||||||
'avisynthplus: AviSynthPlus support'
|
'avisynthplus: AviSynthPlus support'
|
||||||
'intel-media-sdk: Intel QuickSync support'
|
'intel-media-sdk: Intel QuickSync support (legacy)'
|
||||||
|
'onevpl-intel-gpu: Intel QuickSync support'
|
||||||
'ladspa: LADSPA filters'
|
'ladspa: LADSPA filters'
|
||||||
'nvidia-utils: Nvidia NVDEC/NVENC support'
|
'nvidia-utils: Nvidia NVDEC/NVENC support'
|
||||||
)
|
)
|
||||||
|
@ -129,6 +130,10 @@ validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <m
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd ffmpeg
|
cd ffmpeg
|
||||||
|
# FS#79281: fix assembling with binutil as >= 2.41
|
||||||
|
git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb
|
||||||
|
# FS#77813: fix playing ogg files with mplayer
|
||||||
|
git cherry-pick -n cbcc817353a019da4332ad43deb7bbc4e695d02a
|
||||||
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
|
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,7 +169,6 @@ build() {
|
||||||
--enable-libiec61883 \
|
--enable-libiec61883 \
|
||||||
--enable-libjack \
|
--enable-libjack \
|
||||||
--enable-libjxl \
|
--enable-libjxl \
|
||||||
--enable-libmfx \
|
|
||||||
--enable-libmodplug \
|
--enable-libmodplug \
|
||||||
--enable-libgsm \
|
--enable-libgsm \
|
||||||
--enable-libmp3lame \
|
--enable-libmp3lame \
|
||||||
|
@ -186,6 +190,7 @@ build() {
|
||||||
--enable-libvidstab \
|
--enable-libvidstab \
|
||||||
--enable-libvmaf \
|
--enable-libvmaf \
|
||||||
--enable-libvorbis \
|
--enable-libvorbis \
|
||||||
|
--enable-libvpl \
|
||||||
--enable-libvpx \
|
--enable-libvpx \
|
||||||
--enable-libwebp \
|
--enable-libwebp \
|
||||||
--enable-libx264 \
|
--enable-libx264 \
|
||||||
|
|
Loading…
Reference in New Issue