Update svt versions. Update dependencies. General improvements.

This commit is contained in:
Daniel Bermond
2020-01-03 22:37:48 +00:00
parent 1517dab1ff
commit 4829a64813
2 changed files with 50 additions and 59 deletions
+20 -22
View File
@@ -1,19 +1,15 @@
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac) pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)
pkgver = 4.2.1 pkgver = 4.2.1
pkgrel = 2 pkgrel = 3
url = https://www.ffmpeg.org/ url = https://www.ffmpeg.org/
arch = x86_64 arch = x86_64
license = custom: nonfree and unredistributable license = custom: nonfree and unredistributable
makedepends = nasm makedepends = nasm
makedepends = opencl-headers makedepends = opencl-headers
makedepends = ffnvcodec-headers makedepends = ffnvcodec-headers
makedepends = vmaf makedepends = decklink-sdk
makedepends = blackmagic-decklink-sdk
depends = glibc
depends = alsa-lib depends = alsa-lib
depends = jack
depends = libpng
depends = bzip2 depends = bzip2
depends = frei0r-plugins depends = frei0r-plugins
depends = libgcrypt depends = libgcrypt
@@ -28,6 +24,7 @@ pkgbase = ffmpeg-full
depends = libcaca depends = libcaca
depends = celt depends = celt
depends = libcdio-paranoia depends = libcdio-paranoia
depends = codec2
depends = dav1d depends = dav1d
depends = libdc1394 depends = libdc1394
depends = libavc1394 depends = libavc1394
@@ -38,6 +35,9 @@ pkgbase = ffmpeg-full
depends = libgme depends = libgme
depends = gsm depends = gsm
depends = libiec61883 depends = libiec61883
depends = libilbc
depends = jack
depends = kvazaar
depends = lensfun depends = lensfun
depends = libmodplug depends = libmodplug
depends = lame depends = lame
@@ -53,17 +53,21 @@ pkgbase = ffmpeg-full
depends = speex depends = speex
depends = srt depends = srt
depends = libssh depends = libssh
depends = svt-hevc
depends = svt-av1
depends = svt-vp9
depends = tensorflow depends = tensorflow
depends = tesseract depends = tesseract
depends = libtheora depends = libtheora
depends = twolame depends = twolame
depends = v4l-utils depends = v4l-utils
depends = vid.stab depends = vid.stab
depends = vmaf
depends = libvorbis depends = libvorbis
depends = libvpx depends = libvpx
depends = wavpack depends = wavpack
depends = libwebp depends = libwebp
depends = libx264.so depends = x264
depends = x265 depends = x265
depends = libxcb depends = libxcb
depends = xvidcore depends = xvidcore
@@ -74,6 +78,7 @@ pkgbase = ffmpeg-full
depends = lv2 depends = lv2
depends = lilv depends = lilv
depends = xz depends = xz
depends = libmysofa
depends = openal depends = openal
depends = ocl-icd depends = ocl-icd
depends = libgl depends = libgl
@@ -86,29 +91,22 @@ pkgbase = ffmpeg-full
depends = zlib depends = zlib
depends = cuda depends = cuda
depends = libomxil-bellagio depends = libomxil-bellagio
depends = libva
depends = libdrm depends = libdrm
depends = intel-media-sdk
depends = libva
depends = libvdpau depends = libvdpau
depends = svt-hevc
depends = svt-av1
depends = chromaprint-fftw depends = chromaprint-fftw
depends = codec2
depends = davs2 depends = davs2
depends = flite1-patched depends = flite1-patched
depends = libilbc
depends = libklvanc-git depends = libklvanc-git
depends = kvazaar
depends = openh264 depends = openh264
depends = libopenmpt-svn depends = libopenmpt-svn
depends = shine depends = shine
depends = vo-amrwbenc depends = vo-amrwbenc
depends = xavs depends = xavs
depends = xavs2 depends = xavs2
depends = libmysofa
depends = pocketsphinx depends = pocketsphinx
depends = intel-media-sdk
depends = rockchip-mpp depends = rockchip-mpp
depends = svt-vp9-git
provides = libavcodec.so provides = libavcodec.so
provides = libavdevice.so provides = libavdevice.so
provides = libavfilter.so provides = libavfilter.so
@@ -122,17 +120,17 @@ pkgbase = ffmpeg-full
conflicts = ffmpeg conflicts = ffmpeg
source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz.asc source = https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.xz.asc
source = ffmpeg-full-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-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-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-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-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-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-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-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 source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4 sha256sums = cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4
sha256sums = SKIP sha256sums = SKIP
sha256sums = d2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883 sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0 sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
sha256sums = 102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c sha256sums = efbe348e0dad6b5f9fc501a34ff8304d82c2745ec9ac952e72f8549775c2fe78
sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7 sha256sums = 7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
+30 -37
View File
@@ -1,42 +1,40 @@
# Maintainer : Daniel Bermond < gmail-com: danielbermond > # Maintainer : Daniel Bermond <dbermond@archlinux.org>
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it> # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
_svt_hevc_ver='1.4.1' _svt_hevc_ver='1.4.3'
_svt_av1_ver='0.6.0' _svt_av1_ver='0.8.0'
_svt_vp9_ver='ce245894c6fc1c5d1439c41a7dda8d6dc61784c4' _svt_vp9_ver='0.1.0'
pkgname=ffmpeg-full pkgname=ffmpeg-full
pkgver=4.2.1 pkgver=4.2.1
pkgrel=2 pkgrel=3
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac)'
arch=('x86_64') arch=('x86_64')
url='https://www.ffmpeg.org/' url='https://www.ffmpeg.org/'
license=('custom: nonfree and unredistributable') license=('custom: nonfree and unredistributable')
depends=( depends=(
# official repositories: # official repositories:
'glibc' 'alsa-lib' 'jack' 'libpng' 'alsa-lib' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass'
'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'aom' 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'codec2'
'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'dav1d' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi'
'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883' 'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug'
'libgme' 'gsm' 'libiec61883' 'lensfun' 'libmodplug' 'lame' 'opencore-amr' 'lame' 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband'
'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1' 'svt-vp9'
'libsoxr' 'speex' 'srt' 'libssh' 'tensorflow' 'tesseract' 'libtheora' 'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'vmaf'
'twolame' 'v4l-utils' 'vid.stab' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'x264' 'x265' 'libxcb' 'xvidcore'
'libx264.so' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz' 'libmysofa' 'openal' 'ocl-icd'
'lv2' 'lilv' 'xz' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11' 'libxext' 'zlib' 'cuda'
'libxv' 'libx11' 'libxext' 'zlib' 'cuda' 'libomxil-bellagio' 'libva' 'libomxil-bellagio' 'libdrm' 'intel-media-sdk' 'libva' 'libvdpau'
'libdrm' 'libvdpau' 'svt-hevc' 'svt-av1'
# AUR: # AUR:
'chromaprint-fftw' 'codec2' 'davs2' 'flite1-patched' 'libilbc' 'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
'libklvanc-git' 'kvazaar' 'openh264' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'libopenmpt-svn' 'shine' 'vo-amrwbenc' 'xavs' 'xavs2' 'pocketsphinx'
'xavs' 'xavs2' 'libmysofa' 'pocketsphinx' 'intel-media-sdk' 'rockchip-mpp' 'rockchip-mpp'
'svt-vp9-git'
) )
makedepends=( makedepends=(
# official repositories: # official repositories:
'nasm' 'opencl-headers' 'ffnvcodec-headers' 'nasm' 'opencl-headers' 'ffnvcodec-headers'
# AUR: # AUR:
'vmaf' 'blackmagic-decklink-sdk' 'decklink-sdk'
) )
provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so' 'libavutil.so' 'libpostproc.so' 'libavresample.so' 'libswscale.so'
@@ -46,25 +44,23 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
"ffmpeg-full-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-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-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-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-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-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-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-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') 'LICENSE')
sha256sums=('cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4' sha256sums=('cec7c87e9b60d174509e263ac4011b522385fd0775292e1670ecc1180c9bb6d4'
'SKIP' 'SKIP'
'd2db0acbdb0773f3883746cd25996905ff0a3f539d9b434fe314f883856ad883' '878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0' '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
'102a70c5c453875f5806ce02cc83fdc74e53c078cf5be2657f3dd1dd4438868c' 'efbe348e0dad6b5f9fc501a34ff8304d82c2745ec9ac952e72f8549775c2fe78'
'7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7' '7690a4f6bdc4a57e35c7ff5b6e87f2fe6d056d452eff9e767eaccff41832f4d7'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
prepare() { prepare() {
cd "ffmpeg-${pkgver}"
# add svt codec support for hevc, av1 and vp9 # add svt codec support for hevc, av1 and vp9
patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-${_svt_hevc_ver}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-${_svt_hevc_ver}.patch"
patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-docs-${_svt_hevc_ver}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-av1-${_svt_av1_ver}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-av1-${_svt_av1_ver}.patch"
patch -Np1 -i "${srcdir}/ffmpeg-full-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-vp9-${_svt_vp9_ver}.patch"
} }
build() { build() {
@@ -218,10 +214,7 @@ build() {
} }
package() { package() {
cd "ffmpeg-${pkgver}" make -C "ffmpeg-${pkgver}" DESTDIR="$pkgdir" install
install -D -m755 "ffmpeg-${pkgver}/tools/qt-faststart" -t "${pkgdir}/usr/bin"
make DESTDIR="$pkgdir" install install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -D -m755 tools/qt-faststart -t "${pkgdir}/usr/bin"
install -D -m644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
} }