diff options
| author | Magnus Boman | 2023-10-13 09:05:26 +0200 |
|---|---|---|
| committer | Magnus Boman | 2023-10-13 09:05:26 +0200 |
| commit | 45e33d34a29e06fad1a9d01e8a8e8f477e675cea (patch) | |
| tree | 8aced82ce2a2514984b26a313889dfa9916caa77 | |
| parent | df6238679b36d5448a3c75f4afba5963ec599150 (diff) | |
| download | aur-45e33d34a29e06fad1a9d01e8a8e8f477e675cea.tar.gz | |
upgpkg: ffmpeg-headless 1:6.0-3
Fix build and sync with repos
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 19 |
2 files changed, 18 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = ffmpeg-headless pkgdesc = Complete solution to record, convert and stream audio and video; optimised for server (headless) systems pkgver = 6.0 - pkgrel = 2 + pkgrel = 3 epoch = 1 url = https://ffmpeg.org/ arch = i686 @@ -36,7 +36,6 @@ pkgbase = ffmpeg-headless depends = libfreetype.so depends = libiec61883 depends = libjxl.so - depends = libmfx depends = libmodplug depends = libopenmpt.so depends = librav1e.so @@ -58,6 +57,7 @@ pkgbase = ffmpeg-headless depends = libxvidcore.so depends = libzimg.so depends = ocl-icd + depends = onevpl depends = opencore-amr depends = openjpeg2 depends = opus @@ -70,7 +70,8 @@ pkgbase = ffmpeg-headless depends = xz depends = zlib optdepends = avisynthplus: AviSynthPlus support - optdepends = intel-media-sdk: Intel QuickSync support + optdepends = intel-media-sdk: Intel QuickSync support (legacy) + optdepends = onevpl-intel-gpu: Intel QuickSync support optdepends = ladspa: LADSPA filters optdepends = nvidia-utils: Nvidia NVDEC/NVENC support provides = libavcodec.so @@ -7,7 +7,7 @@ pkgname=ffmpeg-headless pkgver=6.0 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video; optimised for server (headless) systems' arch=(i686 x86_64 armv7h armv6h aarch64) @@ -31,7 +31,6 @@ depends=( libfreetype.so libiec61883 libjxl.so - libmfx libmodplug libopenmpt.so librav1e.so @@ -53,6 +52,7 @@ depends=( libxvidcore.so libzimg.so ocl-icd + onevpl opencore-amr openjpeg2 opus @@ -78,7 +78,8 @@ makedepends=( ) optdepends=( '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' 'nvidia-utils: Nvidia NVDEC/NVENC support' ) @@ -103,7 +104,15 @@ pkgver() { } prepare() { - git -C "${pkgname%-headless}" cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb # Fix assembling with binutil as >= 2.41 + cd "${pkgname%-headless}" + # 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 + # use non-deprecated nvenc GUID for conftest + git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f + git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500 + } build() { @@ -134,7 +143,6 @@ build() { --enable-libiec61883 \ --disable-libjack \ --enable-libjxl \ - --enable-libmfx \ --enable-libmodplug \ --enable-libmp3lame \ --enable-libopencore_amrnb \ @@ -155,6 +163,7 @@ build() { --enable-libvidstab \ --enable-libvmaf \ --enable-libvorbis \ + --enable-libvpl \ --enable-libvpx \ --enable-libwebp \ --enable-libx264 \ |