summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-07-23 01:37:27 +0000
committerDaniel Bermond2020-07-23 01:39:45 +0000
commit7508d7fb66f6ec8e76540e808b6618e22a9af508 (patch)
treed230bd5113fab329f65e94acbf0dcafd1de5b538
parent0610034cad918327fd01862bece7b5f60ddbb2a9 (diff)
downloadaur-7508d7fb66f6ec8e76540e808b6618e22a9af508.tar.gz
Add patch for cuda 11.0. Bring back svt-vp9 support.
cuda 11.0 minimum supported architecture is 5.2 (compute_52/sm_52). svt-vp9 support is better now with the current upstream stable version.
-rw-r--r--.SRCINFO7
-rw-r--r--015-ffmpeg-cuda11.0-fix.patch15
-rw-r--r--PKGBUILD14
3 files changed, 32 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4c07c1c0d5a..1f30156a976 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 = 4.4.r98461.g4dab04622a
+ pkgver = 4.4.r98534.g5eb4405fc5
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -62,6 +62,7 @@ pkgbase = ffmpeg-full-git
depends = libssh
depends = svt-hevc
depends = svt-av1
+ depends = svt-vp9
depends = tensorflow
depends = tesseract
depends = libtheora
@@ -129,15 +130,19 @@ pkgbase = ffmpeg-full-git
conflicts = ffmpeg
source = git+https://git.ffmpeg.org/ffmpeg.git
source = 010-ffmpeg-fix-vmaf-model-path.patch
+ source = 015-ffmpeg-cuda11.0-fix.patch
source = 020-ffmpeg-add-svt-hevc-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-hevc-docs-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
source = 040-ffmpeg-add-svt-av1-0.8.4.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
+ source = 050-ffmpeg-add-svt-vp9-0.2.2.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v0.2.2/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
source = LICENSE
sha256sums = SKIP
sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
+ sha256sums = 64fd049ac276e7676c6eb18f19f9fe2a0396e12832cbe6e0ca2f634e8ddf6120
sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
sha256sums = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719
+ sha256sums = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full-git
diff --git a/015-ffmpeg-cuda11.0-fix.patch b/015-ffmpeg-cuda11.0-fix.patch
new file mode 100644
index 00000000000..62049a2f2d6
--- /dev/null
+++ b/015-ffmpeg-cuda11.0-fix.patch
@@ -0,0 +1,15 @@
+--- a/configure
++++ b/configure
+@@ -4317,10 +4317,10 @@ fi
+
+ if enabled cuda_nvcc; then
+ nvcc_default="nvcc"
+- nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
++ nvccflags_default="-gencode arch=compute_52,code=sm_52 -O2"
+ else
+ nvcc_default="clang"
+- nvccflags_default="--cuda-gpu-arch=sm_30 -O2"
++ nvccflags_default="--cuda-gpu-arch=sm_52 -O2"
+ NVCC_C=""
+ fi
+
diff --git a/PKGBUILD b/PKGBUILD
index df668f69f44..81ede30c0cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,10 @@
_svt_hevc_ver='1.4.3'
_svt_av1_ver='0.8.4'
+_svt_vp9_ver='0.2.2'
pkgname=ffmpeg-full-git
-pkgver=4.4.r98461.g4dab04622a
+pkgver=4.4.r98534.g5eb4405fc5
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
arch=('x86_64')
@@ -18,7 +19,7 @@ depends=(
'fontconfig' 'freetype2' 'fribidi' 'glslang' 'libgme' 'gsm' 'libiec61883'
'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug' 'lame' 'opencore-amr'
'openjpeg2' 'opus' 'pulseaudio' 'librabbitmq-c' 'rav1e' 'librsvg' 'rubberband'
- 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'libssh' 'svt-hevc' 'svt-av1'
+ 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'libssh' 'svt-hevc' 'svt-av1' 'svt-vp9'
'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils'
'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'x264' 'x265'
'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
@@ -42,23 +43,29 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
conflicts=('ffmpeg')
source=('git+https://git.ffmpeg.org/ffmpeg.git'
'010-ffmpeg-fix-vmaf-model-path.patch'
+ '015-ffmpeg-cuda11.0-fix.patch'
"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/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
'LICENSE')
sha256sums=('SKIP'
'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
+ '64fd049ac276e7676c6eb18f19f9fe2a0396e12832cbe6e0ca2f634e8ddf6120'
'878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
'5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719'
+ 'b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
prepare() {
- rm -f ffmpeg/libavcodec/libsvt_{hevc,av1}.c
+ rm -f ffmpeg/libavcodec/libsvt_{hevc,av1,vp9}.c
patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
+ patch -d ffmpeg -Np1 -i "${srcdir}/015-ffmpeg-cuda11.0-fix.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"
+ patch -d ffmpeg -Np1 -i "${srcdir}/050-ffmpeg-add-svt-vp9-${_svt_vp9_ver}.patch"
}
pkgver() {
@@ -162,6 +169,7 @@ build() {
--enable-libvo-amrwbenc \
--enable-libvorbis \
--enable-libvpx \
+ --enable-libsvtvp9 \
--enable-libwavpack \
--enable-libwebp \
--enable-libx264 \