Updated to version 4.2.3

This commit is contained in:
Daniel Bermond
2020-05-31 13:17:09 +00:00
parent 373af4348c
commit e2a43408a2
3 changed files with 55 additions and 36 deletions
+15 -10
View File
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-full pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac) pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
pkgver = 4.2.2 pkgver = 4.2.3
pkgrel = 5 pkgrel = 1
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
@@ -10,6 +10,7 @@ pkgbase = ffmpeg-full
makedepends = ffnvcodec-headers makedepends = ffnvcodec-headers
makedepends = decklink-sdk makedepends = decklink-sdk
depends = alsa-lib depends = alsa-lib
depends = avisynthplus
depends = bzip2 depends = bzip2
depends = frei0r-plugins depends = frei0r-plugins
depends = libgcrypt depends = libgcrypt
@@ -118,20 +119,24 @@ pkgbase = ffmpeg-full
provides = libswresample.so provides = libswresample.so
provides = ffmpeg provides = ffmpeg
conflicts = ffmpeg conflicts = ffmpeg
source = https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz source = https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz.asc source = https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz.asc
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 = 010-ffmpeg-fix-vmaf-model-path.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 = 011-ffmpeg-add-decklink-11.5-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234
source = ffmpeg-full-add-svt-av1-0.8.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.3/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch source = 012-ffmpeg-dont-adjust-mp3-start-time.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/460132c9980f8a1f501a1f69477bca49e1641233
source = ffmpeg-full-add-decklink-11.5-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234 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.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.3/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
source = LICENSE source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8 validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c sha256sums = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
sha256sums = SKIP sha256sums = SKIP
sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
sha256sums = d23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828
sha256sums = 269555538ec6d410b42ec43d22edd3eff2006208a1d4cbc8a028d9a432b81577
sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6 sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0 sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
sha256sums = d371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f sha256sums = d371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f
sha256sums = d23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36 sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-full pkgname = ffmpeg-full
+11
View File
@@ -0,0 +1,11 @@
--- a/libavfilter/vf_libvmaf.c
+++ b/libavfilter/vf_libvmaf.c
@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
static const AVOption libvmaf_options[] = {
- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
{"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
{"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
{"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+29 -26
View File
@@ -5,24 +5,25 @@ _svt_hevc_ver='1.4.3'
_svt_av1_ver='0.8.3' _svt_av1_ver='0.8.3'
pkgname=ffmpeg-full pkgname=ffmpeg-full
pkgver=4.2.2 pkgver=4.2.3
pkgrel=5 pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)' pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including 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:
'alsa-lib' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls' 'ladspa' 'libass' 'alsa-lib' 'avisynthplus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls'
'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt' 'libcdio-paranoia' 'codec2' 'ladspa' 'libass' 'aom' 'aribb24' 'libbluray' 'libbs2b' 'libcaca' 'celt'
'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac' 'fontconfig' 'freetype2' 'fribidi' 'libcdio-paranoia' 'codec2' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac'
'libgme' 'gsm' 'libiec61883' 'libilbc' 'jack' 'kvazaar' 'lensfun' 'libmodplug' 'fontconfig' 'freetype2' 'fribidi' 'libgme' 'gsm' 'libiec61883' 'libilbc'
'lame' 'opencore-amr' 'openjpeg2' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'jack' 'kvazaar' 'lensfun' 'libmodplug' 'lame' 'opencore-amr' 'openjpeg2'
'rtmpdump' 'snappy' 'libsoxr' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1' 'svt-vp9' 'opus' 'pulseaudio' 'librsvg' 'rubberband' 'rtmpdump' 'snappy' 'libsoxr'
'tensorflow' 'tesseract' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'vmaf' 'speex' 'srt' 'libssh' 'svt-hevc' 'svt-av1' 'svt-vp9' 'tensorflow' 'tesseract'
'libvorbis' 'libvpx' 'wavpack' 'libwebp' 'x264' 'x265' 'libxcb' 'xvidcore' 'libtheora' 'twolame' 'v4l-utils' 'vid.stab' 'vmaf' 'libvorbis' 'libvpx'
'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz' 'libmysofa' 'openal' 'ocl-icd' 'wavpack' 'libwebp' 'x264' 'x265' 'libxcb' 'xvidcore' 'libxml2' 'zimg'
'libgl' 'sndio' 'sdl2' 'vapoursynth' 'libxv' 'libx11' 'libxext' 'zlib' 'cuda' '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' 'libomxil-bellagio' 'libdrm' 'intel-media-sdk' 'libva' 'libvdpau'
# AUR: # AUR:
'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264' 'chromaprint-fftw' 'davs2' 'flite1-patched' 'libklvanc-git' 'openh264'
@@ -40,29 +41,32 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libswresample.so' 'ffmpeg') 'libswresample.so' 'ffmpeg')
conflicts=('ffmpeg') conflicts=('ffmpeg')
source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc} 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" '010-ffmpeg-fix-vmaf-model-path.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" '011-ffmpeg-add-decklink-11.5-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234'
"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" '012-ffmpeg-dont-adjust-mp3-start-time.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/460132c9980f8a1f501a1f69477bca49e1641233'
'ffmpeg-full-add-decklink-11.5-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234' "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-with-svt-hevc.patch"
'LICENSE') 'LICENSE')
sha256sums=('cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c' sha256sums=('9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31'
'SKIP' 'SKIP'
'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
'd23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828'
'269555538ec6d410b42ec43d22edd3eff2006208a1d4cbc8a028d9a432b81577'
'878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6' '878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
'1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0' '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
'd371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f' 'd371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f'
'd23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36') '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
prepare() { prepare() {
# add svt codec support for hevc and av1
rm -f "ffmpeg-${pkgver}/libavcodec/"libsvt_{hevc,av1}.c rm -f "ffmpeg-${pkgver}/libavcodec/"libsvt_{hevc,av1}.c
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-${_svt_hevc_ver}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-hevc-docs-${_svt_hevc_ver}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/011-ffmpeg-add-decklink-11.5-support.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-svt-av1-${_svt_av1_ver}.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/012-ffmpeg-dont-adjust-mp3-start-time.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"
# add decklink-sdk 11.5 support patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-decklink-11.5-support.patch" patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"
} }
build() { build() {
@@ -207,7 +211,6 @@ build() {
--enable-v4l2-m2m \ --enable-v4l2-m2m \
--enable-vaapi \ --enable-vaapi \
--enable-vdpau --enable-vdpau
make make
make tools/qt-faststart make tools/qt-faststart
} }