summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD17
2 files changed, 10 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3d9980a4ea1..ae559394d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
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.3
+ pkgdesc = Complete solution to record, convert and stream audio/video (w/ gl-transition patch)
+ pkgver = 4.3.1
pkgrel = 1
epoch = 1
url = https://ffmpeg.org/
@@ -35,6 +35,7 @@ pkgbase = ffmpeg-gl-transition
depends = libmodplug
depends = libomxil-bellagio
depends = libpulse
+ depends = librav1e.so
depends = libraw1394
depends = libsoxr
depends = libssh
@@ -81,7 +82,7 @@ pkgbase = ffmpeg-gl-transition
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fdb
source = vmaf-model-path.patch
source = https://raw.githubusercontent.com/transitive-bullshit/ffmpeg-gl-transition/master/vf_gltransition.c
source = ffmpeg_vf_gltransition.patch
diff --git a/PKGBUILD b/PKGBUILD
index a687714966b..352d7b202e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg-gl-transition
-pkgver=4.2.3
+pkgver=4.3.1
pkgrel=1
epoch=1
-pkgdesc='Complete solution to record, convert and stream audio and video, with support for GL-transitions video filters'
+pkgdesc='Complete solution to record, convert and stream audio/video (w/ gl-transition patch)'
arch=(x86_64)
url=https://ffmpeg.org/
license=(GPL3)
@@ -38,6 +38,7 @@ depends=(
libmodplug
libomxil-bellagio
libpulse
+ librav1e.so
libraw1394
libsoxr
libssh
@@ -96,8 +97,9 @@ provides=(
ffmpeg
)
conflicts=(ffmpeg)
+_tag=6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fdb
source=(
- git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+ git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
vmaf-model-path.patch
https://raw.githubusercontent.com/transitive-bullshit/ffmpeg-gl-transition/master/vf_gltransition.c
ffmpeg_vf_gltransition.patch)
@@ -115,14 +117,6 @@ pkgver() {
prepare() {
cd ffmpeg
- # 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/
@@ -163,6 +157,7 @@ build() {
--enable-libopenjpeg \
--enable-libopus \
--enable-libpulse \
+ --enable-librav1e \
--enable-libsoxr \
--enable-libspeex \
--enable-libsrt \