summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-01-03 22:31:46 +0000
committerDaniel Bermond2020-01-03 22:33:09 +0000
commit361d393e4fc4097549d145af3a1b5cd608499942 (patch)
tree90c4d06d46311a648dba99c0c550630348b41c7f
parent484fd6e55e5384a7d3320093de9caeb28728a65a (diff)
downloadaur-361d393e4fc4097549d145af3a1b5cd608499942.tar.gz
New option --enable-cuda-llvm. Update svt versions. Update deps.
References ---------- https://git.videolan.org/?p=ffmpeg.git;a=commit;h=01994c93db43e50c01349203a76c0b7111d1d2f3
-rw-r--r--.SRCINFO33
-rw-r--r--PKGBUILD46
2 files changed, 39 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 51d8faa79a1..6c4f136555c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,18 @@
pkgbase = ffmpeg-full-git
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)
- pkgver = 4.3.r95713.g0e49560806
+ pkgver = 4.3.r96259.g944203270d
pkgrel = 1
url = https://www.ffmpeg.org/
arch = x86_64
license = custom: nonfree and unredistributable
makedepends = git
makedepends = nasm
- makedepends = vmaf
makedepends = opencl-headers
makedepends = ffnvcodec-headers
- makedepends = blackmagic-decklink-sdk
+ makedepends = clang
+ makedepends = decklink-sdk
makedepends = amf-headers-git
- depends = glibc
depends = alsa-lib
- depends = jack
- depends = libpng
depends = bzip2
depends = frei0r-plugins
depends = libgcrypt
@@ -40,8 +37,9 @@ pkgbase = ffmpeg-full-git
depends = fribidi
depends = libgme
depends = gsm
- depends = libilbc
depends = libiec61883
+ depends = libilbc
+ depends = jack
depends = kvazaar
depends = lensfun
depends = libmodplug
@@ -58,17 +56,21 @@ pkgbase = ffmpeg-full-git
depends = speex
depends = srt
depends = libssh
+ depends = svt-hevc
+ depends = svt-av1
+ depends = svt-vp9
depends = tensorflow
depends = tesseract
depends = libtheora
depends = twolame
depends = v4l-utils
depends = vid.stab
+ depends = vmaf
depends = libvorbis
depends = libvpx
depends = wavpack
depends = libwebp
- depends = libx264.so
+ depends = x264
depends = x265
depends = libxcb
depends = xvidcore
@@ -96,8 +98,6 @@ pkgbase = ffmpeg-full-git
depends = intel-media-sdk
depends = libva
depends = libvdpau
- depends = svt-hevc
- depends = svt-av1
depends = chromaprint-fftw
depends = davs2
depends = flite1-patched
@@ -111,7 +111,6 @@ pkgbase = ffmpeg-full-git
depends = xavs2
depends = pocketsphinx
depends = rockchip-mpp
- depends = svt-vp9-git
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@@ -126,15 +125,15 @@ pkgbase = ffmpeg-full-git
provides = ffmpeg-git
conflicts = ffmpeg
source = git+https://git.ffmpeg.org/ffmpeg.git
- source = ffmpeg-full-git-add-svt-hevc-1.4.1.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.1/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
- source = ffmpeg-full-git-add-svt-hevc-docs-1.4.1.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.1/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
- source = ffmpeg-full-git-add-svt-av1-0.6.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.6.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
- source = ffmpeg-full-git-add-svt-vp9-gce24589.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/ce245894c6fc1c5d1439c41a7dda8d6dc61784c4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
+ source = ffmpeg-full-git-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 = ffmpeg-full-git-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 = ffmpeg-full-git-add-svt-av1-0.8.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
+ source = ffmpeg-full-git-add-svt-vp9-0.1.0.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v0.1.0/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
source = LICENSE
sha256sums = SKIP
- sha256sums = d2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883
+ sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
- sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c
+ sha256sums = efbe348e0dad6b5f9fc501a34ff8304d82c2745ec9ac952e72f8549775c2fe78
sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
diff --git a/PKGBUILD b/PKGBUILD
index e4f03654667..7e41ab3ad94 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
-_svt_hevc_ver='1.4.1'
-_svt_av1_ver='0.6.0'
-_svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4'
+_svt_hevc_ver='1.4.3'
+_svt_av1_ver='0.8.0'
+_svt_vp9_ver='0.1.0'
pkgname=ffmpeg-full-git
-pkgver=4.3.r95713.g0e49560806
+pkgver=4.3.r96259.g944203270d
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('x86_64')
@@ -13,28 +13,27 @@ url='https://www.ffmpeg.org/'
license=('custom: nonfree and unredistributable')
depends=(
# official repositories:
- 'glibc' 'alsa-lib' 'jack' 'libpng'
- 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'aom'
- 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'codec2'
+ 'alsa-lib' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass'
+ 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'codec2'
'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi'
- 'libgme' 'gsm' 'libilbc' 'libiec61883' 'kvazaar' 'lensfun' 'libmodplug' 'lame'
- 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump'
- 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'tensorflow' 'tesseract' 'libtheora'
- 'twolame' 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp'
- 'libx264.so' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2'
- 'lilv' 'xz' 'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
- 'libxv' 'libx11' 'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libdrm'
- 'intel-media-sdk' 'libva' 'libvdpau' 'svt-hevc' 'svt-av1'
+ 'libgme' 'gsm' 'libiec61883' 'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug'
+ 'lame' 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband'
+ 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' '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' 'libmysofa' 'openal' 'ocl-icd'
+ 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11' 'libxext' 'zlib' 'cuda'
+ 'libomxil-bellagio' 'libdrm' 'intel-media-sdk' 'libva' 'libvdpau'
# AUR:
'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
'libopenmpt-svn' 'rav1e' 'shine' 'vo-amrwbenc' 'xavs' 'xavs2' 'pocketsphinx'
- 'rockchip-mpp' 'svt-vp9-git'
+ 'rockchip-mpp'
)
makedepends=(
# official repositories:
- 'git' 'nasm' 'vmaf' 'opencl-headers' 'ffnvcodec-headers'
+ 'git' 'nasm' 'opencl-headers' 'ffnvcodec-headers' 'clang'
# AUR:
- 'blackmagic-decklink-sdk' 'amf-headers-git'
+ 'decklink-sdk' 'amf-headers-git'
)
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so'
@@ -44,12 +43,12 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
"ffmpeg-full-git-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"
"ffmpeg-full-git-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"
"ffmpeg-full-git-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-with-svt-hevc.patch"
- "ffmpeg-full-git-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch"
+ "ffmpeg-full-git-add-svt-vp9-${_svt_vp9_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/v${_svt_vp9_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch"
'LICENSE')
sha256sums=('SKIP'
- 'd2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883'
+ '878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
- '102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c'
+ 'efbe348e0dad6b5f9fc501a34ff8304d82c2745ec9ac952e72f8549775c2fe78'
'7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
@@ -60,7 +59,7 @@ prepare() {
git apply --index "${srcdir}/ffmpeg-full-git-add-svt-hevc-${_svt_hevc_ver}.patch"
patch -Np1 -i "${srcdir}/ffmpeg-full-git-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
git apply --index "${srcdir}/ffmpeg-full-git-add-svt-av1-${_svt_av1_ver}.patch"
- git apply --index "${srcdir}/ffmpeg-full-git-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
+ git apply --index "${srcdir}/ffmpeg-full-git-add-svt-vp9-${_svt_vp9_ver}.patch"
}
pkgver() {
@@ -211,6 +210,7 @@ build() {
\
--enable-amf \
--enable-cuda-nvcc \
+ --enable-cuda-llvm \
--enable-cuvid \
--enable-ffnvcodec \
--enable-libdrm \