summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-05-31 12:33:22 +0000
committerDaniel Bermond2020-05-31 14:18:11 +0000
commit37e347f06adc0ee242c279c3604df0f4b8d0de18 (patch)
tree7336a5bbd7eb2886fd6fd4516bbfa8f88a58174b
parent301107bdac7cbf2bcf54170f5bf01daadb78f49b (diff)
downloadaur-37e347f06adc0ee242c279c3604df0f4b8d0de18.tar.gz
Updated to version 4.2.3
-rw-r--r--.SRCINFO20
-rw-r--r--010-ffmpeg-fix-vmaf-model-path.patch11
-rw-r--r--PKGBUILD29
3 files changed, 45 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1026af5309..f7a49bf9272 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-decklink
pkgdesc = Complete solution to record, convert and stream audio and video (decklink enabled)
- pkgver = 4.2.2
- pkgrel = 4
+ pkgver = 4.2.3
+ pkgrel = 1
epoch = 1
url = https://www.ffmpeg.org/
arch = x86_64
@@ -57,11 +57,15 @@ pkgbase = ffmpeg-decklink
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,14 +76,18 @@ pkgbase = ffmpeg-decklink
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz
- source = https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.xz.asc
- source = ffmpeg-full-add-decklink-11.5-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234
+ source = https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz
+ source = https://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz.asc
+ source = 010-ffmpeg-fix-vmaf-model-path.patch
+ source = 011-ffmpeg-add-decklink-11.5-support.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234
+ source = 012-ffmpeg-dont-adjust-mp3-start-time.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/460132c9980f8a1f501a1f69477bca49e1641233
source = LICENSE
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
- sha256sums = cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c
+ sha256sums = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
sha256sums = SKIP
+ sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
sha256sums = d23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828
+ sha256sums = 269555538ec6d410b42ec43d22edd3eff2006208a1d4cbc8a028d9a432b81577
sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
pkgname = ffmpeg-decklink
diff --git a/010-ffmpeg-fix-vmaf-model-path.patch b/010-ffmpeg-fix-vmaf-model-path.patch
new file mode 100644
index 00000000000..1e92c02e559
--- /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 0d85e80e777..266ec4001ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Jan Koppe <post@jankoppe.de>
pkgname=ffmpeg-decklink
-pkgver=4.2.2
-pkgrel=4
+pkgver=4.2.3
+pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (decklink enabled)'
arch=('x86_64')
@@ -57,7 +57,9 @@ depends=(
'opus'
'sdl2'
'speex'
+ 'srt'
'v4l-utils'
+ 'vmaf'
'xz'
'zlib'
)
@@ -67,24 +69,31 @@ makedepends=(
# AUR:
'decklink-sdk'
)
-optdepends=('intel-media-sdk: for Intel Quick Sync Video'
- 'ladspa: for LADSPA filters')
+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=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
- 'ffmpeg-full-add-decklink-11.5-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234'
+ '010-ffmpeg-fix-vmaf-model-path.patch'
+ '011-ffmpeg-add-decklink-11.5-support.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/f32f9231dd4f74d9f95eef575b838bdc3e06a234'
+ '012-ffmpeg-dont-adjust-mp3-start-time.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/460132c9980f8a1f501a1f69477bca49e1641233'
'LICENSE')
-sha256sums=('cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c'
+sha256sums=('9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31'
'SKIP'
+ 'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
'd23dedb5a275d1d753d30fd544a46d5b609868ad5d384b9c8c2ecc1a02281828'
+ '269555538ec6d410b42ec43d22edd3eff2006208a1d4cbc8a028d9a432b81577'
'04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
prepare() {
- # add decklink-sdk 11.5 support
- patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/ffmpeg-full-add-decklink-11.5-support.patch"
+ patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
+ patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/011-ffmpeg-add-decklink-11.5-support.patch"
+ patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/012-ffmpeg-dont-adjust-mp3-start-time.patch"
}
build() {
@@ -97,6 +106,7 @@ build() {
--disable-debug \
--disable-static \
--disable-stripping \
+ --enable-avisynth \
--enable-fontconfig \
--enable-gmp \
--enable-gnutls \
@@ -122,10 +132,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 \
@@ -141,7 +153,6 @@ build() {
--enable-version3 \
--enable-nonfree \
--enable-decklink
-
make
make tools/qt-faststart
}