From 0a56691110c2a92a26c7caf0db4c956f1328c484 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 5 May 2021 00:51:01 +0200 Subject: [PATCH] Update ffmpeg-custom to 4.4 --- ffmpeg/custom/PKGBUILD | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/ffmpeg/custom/PKGBUILD b/ffmpeg/custom/PKGBUILD index 2070c85f..5ad4e43f 100644 --- a/ffmpeg/custom/PKGBUILD +++ b/ffmpeg/custom/PKGBUILD @@ -9,10 +9,7 @@ _name=ffmpeg pkgname=ffmpeg-custom -pkgver=4.3.2 -_svt_hevc_ver='1.5.0' -_svt_av1_ver='0.8.4' -_svt_vp9_ver='0.3.0' +pkgver=4.4 pkgrel=1 epoch=1 pkgdesc='Complete solution to record, convert and stream audio and video (with more features enabled than regular ffmpeg)' @@ -42,6 +39,7 @@ depends=( libpulse librav1e.so libraw1394 + librsvg-2.so libsoxr libssh libtheora @@ -77,11 +75,8 @@ depends=( ocl-icd libfdk-aac librsvg - svt-av1 #glslang - see note below - svt-hevc svt-av1 - svt-vp9 vulkan-icd-loader ) makedepends=( @@ -116,23 +111,13 @@ provides=( ) conflicts=("$_name") -_tag=f719f869907764e6412a6af6e178c46e5f915d25 +_tag=dc91b913b6260e85e1304c74ff7bb3c22a8c9fb1 source=( git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag} 'vmaf-model-path.patch' - '017-ffmpeg-glslang-11.0-fix.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4dab04622a6cf2a31da26a51dedb60ec44ac89a4' - "020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch" - "030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch" - "040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch" - "050-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v${_svt_vp9_ver}/ffmpeg_plugin/n4.3.1-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch" ) sha256sums=('SKIP' - '8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d' - '5b6815fc088d4acdc046eb223350a964bc998b0759aef90acf0591f65e7c98cb' - 'b37d43d5d8692599347c6f1f316c13b9a9addc66d3ceb7e6e02341c494af7cdc' - '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0' - '5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719' - 'b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96') + '8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d') #pkgver() { # cd ffmpeg @@ -143,16 +128,6 @@ sha256sums=('SKIP' prepare() { cd ffmpeg - # fix glslang - patch -Np1 -i "${srcdir}/017-ffmpeg-glslang-11.0-fix.patch" - - # add support for svt libraries - rm -f libavcodec/libsvt_{hevc,av1,vp9}.c - patch -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch" - patch -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch" - patch -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch" - patch -Np1 -i "${srcdir}/050-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch" - patch -Np1 -i "${srcdir}"/vmaf-model-path.patch } @@ -191,6 +166,7 @@ build() { --enable-libopus \ --enable-libpulse \ --enable-librav1e \ + --enable-librsvg \ --enable-libsoxr \ --enable-libspeex \ --enable-libsrt \ @@ -213,11 +189,8 @@ build() { --enable-omx \ --enable-shared \ --enable-version3 \ - --enable-librsvg \ --enable-libfdk_aac \ --enable-libsvtav1 \ - --enable-libsvthevc \ - --enable-libsvtvp9 \ --enable-vaapi \ --enable-vdpau \ --enable-opencl \