From f2b4a6d1b309fdb3d6d2a76f572819dc562e781e Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Sun, 31 May 2020 12:53:21 +0000 Subject: [PATCH] Match changes of repositoy package --- .SRCINFO | 9 ++++++- 010-ffmpeg-fix-vmaf-model-path.patch | 11 +++++++++ PKGBUILD | 36 +++++++++++++++++----------- 3 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 010-ffmpeg-fix-vmaf-model-path.patch diff --git a/.SRCINFO b/.SRCINFO index 8c2f34e..4b628b8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,11 +1,12 @@ pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) - pkgver = 4.3.r96873.g3733a6bc20 + pkgver = 4.3.r98015.ga886785018 pkgrel = 1 url = https://www.ffmpeg.org/ arch = x86_64 license = GPL3 makedepends = git + makedepends = avisynthplus makedepends = ffnvcodec-headers makedepends = ladspa makedepends = nasm @@ -56,11 +57,15 @@ pkgbase = ffmpeg-git depends = opus depends = sdl2 depends = speex + depends = srt depends = v4l-utils + depends = vmaf depends = xz depends = zlib + optdepends = avisynthplus: for reading AviSynth scripts as input optdepends = intel-media-sdk: for Intel Quick Sync Video optdepends = ladspa: for LADSPA filters + optdepends = nvidia-utils: Nvidia NVDEC/NVENC support provides = libavcodec.so provides = libavdevice.so provides = libavfilter.so @@ -72,7 +77,9 @@ pkgbase = ffmpeg-git provides = ffmpeg conflicts = ffmpeg source = git+https://git.ffmpeg.org/ffmpeg.git + source = 010-ffmpeg-fix-vmaf-model-path.patch sha256sums = SKIP + sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02 pkgname = ffmpeg-git diff --git a/010-ffmpeg-fix-vmaf-model-path.patch b/010-ffmpeg-fix-vmaf-model-path.patch new file mode 100644 index 0000000..1e92c02 --- /dev/null +++ b/010-ffmpeg-fix-vmaf-model-path.patch @@ -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}, diff --git a/PKGBUILD b/PKGBUILD index 7f506aa..49aa468 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: DrZaius pkgname=ffmpeg-git -pkgver=4.3.r96873.g3733a6bc20 +pkgver=4.3.r98015.ga886785018 pkgrel=1 pkgdesc='Complete solution to record, convert and stream audio and video (git version)' arch=('x86_64') @@ -58,31 +58,37 @@ depends=( 'opus' 'sdl2' 'speex' + 'srt' 'v4l-utils' + 'vmaf' 'xz' 'zlib' ) -makedepends=('git' 'ffnvcodec-headers' 'ladspa' 'nasm') -optdepends=('intel-media-sdk: for Intel Quick Sync Video' - 'ladspa: for LADSPA filters') +makedepends=('git' 'avisynthplus' 'ffnvcodec-headers' 'ladspa' 'nasm') +optdepends=('avisynthplus: for reading AviSynth scripts as input' + 'intel-media-sdk: for Intel Quick Sync Video' + 'ladspa: for LADSPA filters' + 'nvidia-utils: Nvidia NVDEC/NVENC support') provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so' 'libswscale.so' 'ffmpeg') conflicts=('ffmpeg') -source=('git+https://git.ffmpeg.org/ffmpeg.git') -sha256sums=('SKIP') +source=('git+https://git.ffmpeg.org/ffmpeg.git' + '010-ffmpeg-fix-vmaf-model-path.patch') +sha256sums=('SKIP' + 'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02') + +prepare() { + patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch" +} pkgver() { - cd ffmpeg - local _version local _revision local _shorthash - - _version="$( git describe --tags --long | awk -F'-' '{ sub(/^n/, "", $1); print $1 }')" - _revision="$( git describe --tags --match 'N' | awk -F'-' '{ print $2 }')" - _shorthash="$(git rev-parse --short HEAD)" - + _version="$(git -C ffmpeg describe --tags --long | awk -F'-' '{ sub(/^n/, "", $1); print $1 }')" + _revision="$(git -C ffmpeg describe --tags --match 'N' | awk -F'-' '{ print $2 }')" + _shorthash="$(git -C ffmpeg rev-parse --short HEAD)" printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash" } @@ -96,6 +102,7 @@ build() { --disable-debug \ --disable-static \ --disable-stripping \ + --enable-avisynth \ --enable-fontconfig \ --enable-gmp \ --enable-gnutls \ @@ -121,10 +128,12 @@ build() { --enable-libpulse \ --enable-libsoxr \ --enable-libspeex \ + --enable-libsrt \ --enable-libssh \ --enable-libtheora \ --enable-libv4l2 \ --enable-libvidstab \ + --enable-libvmaf \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ @@ -138,7 +147,6 @@ build() { --enable-omx \ --enable-shared \ --enable-version3 - make make tools/qt-faststart }