summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2023-02-11 13:45:51 -0300
committerDaniel Bermond2023-02-11 13:45:51 -0300
commit4a6486dfa72d015fcf9ff36858d7cc9ab6f34c56 (patch)
tree0dd7c856b41f950ddf9d4fbf94959b1a926b2de6
parenta4cba2526f4a16e153d4185c4540e4b4a5a20e3e (diff)
downloadaur-4a6486dfa72d015fcf9ff36858d7cc9ab6f34c56.tar.gz
Fix svt-vp9
libavcodec/libsvt_vp9.c: At top level: libavcodec/libsvt_vp9.c:692:46: error: ‘AV_CODEC_CAP_AUTO_THREADS’ undeclared here (not in a function); did you mean ‘FF_CODEC_CAP_AUTO_THREADS’? 692 | .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS, | ^~~~~~~~~~~~~~~~~~~~~~~~~ | FF_CODEC_CAP_AUTO_THREADS References ---------- https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/10c9a0874cb361336237557391d306d26d43f137
-rw-r--r--.SRCINFO4
-rw-r--r--006-ffmpeg-add-svt-vp9-gd9ef3cc.patch11
-rw-r--r--PKGBUILD7
3 files changed, 20 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fdf024393e39..b3c8d4090fe1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
- pkgver = 5.2.r109655.g20b96494de
+ pkgver = 5.2.r109824.g27315dc345
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -134,6 +134,7 @@ pkgbase = ffmpeg-full-git
conflicts = ffmpeg
source = git+https://git.ffmpeg.org/ffmpeg.git
source = 005-ffmpeg-add-svt-hevc-g7771d7c.patch
+ source = 006-ffmpeg-add-svt-vp9-gd9ef3cc.patch
source = 010-ffmpeg-add-svt-hevc-g7771d7c.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/7771d7c1ec60cf21d84894260a4b14e9034c7156/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-vp9-gd9ef3cc.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/d9ef3cc13159143b9afc776c04f67cdfa6284046/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
@@ -141,6 +142,7 @@ pkgbase = ffmpeg-full-git
source = LICENSE
sha256sums = SKIP
sha256sums = 797fd82276b9c31267412105d663eca9c3dcef6d823b228487a14b70565b8563
+ sha256sums = 6e2b0b2da4e7db2c3d66a2796c5eed2d986a9ef404ad0323e2581c02e5c6aeb7
sha256sums = e9ae5d753169f56bbc7fe53615398032f985caaeae6b89bd952c4e4bc9ec8531
sha256sums = e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c
sha256sums = 3f4d677da3efdc3d2a1cbd36257d626b7e4c05d685ed82bd1a7e2eb7e3ac6ee4
diff --git a/006-ffmpeg-add-svt-vp9-gd9ef3cc.patch b/006-ffmpeg-add-svt-vp9-gd9ef3cc.patch
new file mode 100644
index 000000000000..a5c817173a98
--- /dev/null
+++ b/006-ffmpeg-add-svt-vp9-gd9ef3cc.patch
@@ -0,0 +1,11 @@
+--- a/030-ffmpeg-add-svt-vp9-gd9ef3cc.patch
++++ b/030-ffmpeg-add-svt-vp9-gd9ef3cc.patch
+@@ -773,7 +773,7 @@ index 0000000000..a7da7023d2
+ + .init = eb_enc_init,
+ + FF_CODEC_RECEIVE_PACKET_CB(eb_receive_packet),
+ + .close = eb_enc_close,
+-+ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
+++ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
+ + .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
+ + AV_PIX_FMT_NONE },
+ + .p.priv_class = &class,
diff --git a/PKGBUILD b/PKGBUILD
index 76d2e9b5991b..4863330b523b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=ffmpeg-full-git
-pkgver=5.2.r109655.g20b96494de
+pkgver=5.2.r109824.g27315dc345
pkgrel=1
_svt_hevc_ver='7771d7c1ec60cf21d84894260a4b14e9034c7156'
_svt_vp9_ver='d9ef3cc13159143b9afc776c04f67cdfa6284046'
@@ -126,6 +126,7 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
conflicts=('ffmpeg')
source=('git+https://git.ffmpeg.org/ffmpeg.git'
"005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+ "006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
"010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
#"020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
"030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
@@ -134,6 +135,7 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
'LICENSE')
sha256sums=('SKIP'
'797fd82276b9c31267412105d663eca9c3dcef6d823b228487a14b70565b8563'
+ '6e2b0b2da4e7db2c3d66a2796c5eed2d986a9ef404ad0323e2581c02e5c6aeb7'
'e9ae5d753169f56bbc7fe53615398032f985caaeae6b89bd952c4e4bc9ec8531'
'e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c'
'3f4d677da3efdc3d2a1cbd36257d626b7e4c05d685ed82bd1a7e2eb7e3ac6ee4'
@@ -144,7 +146,10 @@ prepare() {
rm -f ffmpeg/libavcodec/libsvt_{hevc,vp9}.c
cp --remove-destination "$(readlink "010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch")" \
"010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+ cp --remove-destination "$(readlink "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch")" \
+ "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
patch -Np1 -i "005-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
+ patch -Np1 -i "006-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-add-svt-hevc-g${_svt_hevc_ver:0:7}.patch"
#patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-docs-g${_svt_hevc_ver:0:7}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"