summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMusee Ullah2020-06-11 17:31:52 -0500
committerMusee Ullah2020-06-11 17:31:52 -0500
commitbf7a49662af58061f7f81197a6abe78296e64510 (patch)
treeef1669da57e07752c396b8ff36a334e5ade4837b
parentf1dd81c47eff912061c7d2fe8fb3d823bc4e8672 (diff)
downloadaur-bf7a49662af58061f7f81197a6abe78296e64510.tar.gz
upgpkg: ffmpeg-gl-transition 14.2.3-1
sync to ffmpeg 4.2.3-5 arch release
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD40
-rw-r--r--vmaf-model-path.patch13
3 files changed, 55 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4bcefd9e2e2..3d9980a4ea1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = ffmpeg-gl-transition
pkgdesc = Complete solution to record, convert and stream audio and video, with support for GL-transitions video filters
- pkgver = 4.2.2
+ pkgver = 4.2.3
pkgrel = 1
epoch = 1
url = https://ffmpeg.org/
arch = x86_64
license = GPL3
+ makedepends = avisynthplus
makedepends = ffnvcodec-headers
makedepends = git
makedepends = ladspa
@@ -21,7 +22,6 @@ pkgbase = ffmpeg-gl-transition
depends = gmp
depends = gnutls
depends = gsm
- depends = intel-media-sdk
depends = jack
depends = lame
depends = libass.so
@@ -31,6 +31,7 @@ pkgbase = ffmpeg-gl-transition
depends = libdrm
depends = libfreetype.so
depends = libiec61883
+ depends = libmfx
depends = libmodplug
depends = libomxil-bellagio
depends = libpulse
@@ -61,10 +62,15 @@ pkgbase = ffmpeg-gl-transition
depends = opus
depends = sdl2
depends = speex
+ depends = srt
depends = v4l-utils
+ depends = vmaf
depends = xz
depends = zlib
+ optdepends = avisynthplus: AviSynthPlus support
+ optdepends = intel-media-sdk: Intel QuickSync support
optdepends = ladspa: LADSPA filters
+ optdepends = nvidia-utils: Nvidia NVDEC/NVENC support
provides = libavcodec.so
provides = libavdevice.so
provides = libavfilter.so
@@ -75,10 +81,12 @@ pkgbase = ffmpeg-gl-transition
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+ source = vmaf-model-path.patch
source = https://raw.githubusercontent.com/transitive-bullshit/ffmpeg-gl-transition/master/vf_gltransition.c
source = ffmpeg_vf_gltransition.patch
sha256sums = SKIP
+ sha256sums = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
sha256sums = 4d044f161913805236dbf5e78188bb5a17af10a43dbd3269d0284b12f78aee3e
sha256sums = 4853e888cb3fbda247e05faa591d45b640bdadf0115db3669ef08493258a0cb4
diff --git a/PKGBUILD b/PKGBUILD
index 9e0dd1774c1..a687714966b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg-gl-transition
-pkgver=4.2.2
+pkgver=4.2.3
pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video, with support for GL-transitions video filters'
@@ -25,7 +25,6 @@ depends=(
gmp
gnutls
gsm
- intel-media-sdk
jack
lame
libass.so
@@ -35,6 +34,7 @@ depends=(
libdrm
libfreetype.so
libiec61883
+ libmfx
libmodplug
libomxil-bellagio
libpulse
@@ -65,17 +65,25 @@ depends=(
opus
sdl2
speex
+ srt
v4l-utils
+ vmaf
xz
zlib
)
makedepends=(
+ avisynthplus
ffnvcodec-headers
git
ladspa
nasm
)
-optdepends=('ladspa: LADSPA filters')
+optdepends=(
+ 'avisynthplus: AviSynthPlus support'
+ 'intel-media-sdk: Intel QuickSync support'
+ 'ladspa: LADSPA filters'
+ 'nvidia-utils: Nvidia NVDEC/NVENC support'
+)
provides=(
libavcodec.so
libavdevice.so
@@ -88,12 +96,15 @@ provides=(
ffmpeg
)
conflicts=(ffmpeg)
-source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0
- https://raw.githubusercontent.com/transitive-bullshit/ffmpeg-gl-transition/master/vf_gltransition.c
- ffmpeg_vf_gltransition.patch)
+source=(
+ git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+ vmaf-model-path.patch
+ https://raw.githubusercontent.com/transitive-bullshit/ffmpeg-gl-transition/master/vf_gltransition.c
+ ffmpeg_vf_gltransition.patch)
sha256sums=(SKIP
- 4d044f161913805236dbf5e78188bb5a17af10a43dbd3269d0284b12f78aee3e
- 4853e888cb3fbda247e05faa591d45b640bdadf0115db3669ef08493258a0cb4)
+ 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+ 4d044f161913805236dbf5e78188bb5a17af10a43dbd3269d0284b12f78aee3e
+ 4853e888cb3fbda247e05faa591d45b640bdadf0115db3669ef08493258a0cb4)
pkgver() {
cd ffmpeg
@@ -104,7 +115,15 @@ pkgver() {
prepare() {
cd ffmpeg
- git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
+ # lavf/mp3dec: don't adjust start time; packets are not adjusted
+ # https://crbug.com/1062037
+ git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
+
+ # backport avisynthplus support
+ git show 6d8cddd1c67758636843f6a08295b3896c2e9ef8 -- libavformat/avisynth.c | git apply -
+ git show 56f59246293de417d27ea7e27cb9a7727ee579fb -- libavformat/avisynth.c | git apply -
+
+ patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
cp "${srcdir}/vf_gltransition.c" libavfilter/
git apply "${srcdir}/ffmpeg_vf_gltransition.patch"
@@ -120,6 +139,7 @@ build() {
--disable-debug \
--disable-static \
--disable-stripping \
+ --enable-avisynth \
--enable-fontconfig \
--enable-gmp \
--enable-gnutls \
@@ -145,10 +165,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 \
diff --git a/vmaf-model-path.patch b/vmaf-model-path.patch
new file mode 100644
index 00000000000..abd65cdf730
--- /dev/null
+++ b/vmaf-model-path.patch
@@ -0,0 +1,13 @@
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 249e50c720..9b791e19b1 100644
+--- 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},