summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Demers2019-09-18 02:37:47 -0400
committerAlexandre Demers2019-09-18 02:37:47 -0400
commit9e98d405a8936eadc7c4b5fc66de328075177d19 (patch)
treefbbcded7ec757fd3e542c8040a6b8980d07c8212
parent79eeee5a2c8b0d99cb81336ec04fd44b379f247d (diff)
downloadaur-9e98d405a8936eadc7c4b5fc66de328075177d19.tar.gz
Update to 4.2.1 and make dav1d the default av1 decoder
Update to 4.2.1 and bring in latest patch from official ffmpeg package. Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d6a6bbc2a5a..2f0a2a5b49d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lib32-ffmpeg
pkgdesc = Complete solution to record, convert and stream audio and video (32 bit)
- pkgver = 4.2
- pkgrel = 2
+ pkgver = 4.2.1
+ pkgrel = 1
epoch = 1
url = http://ffmpeg.org/
arch = x86_64
@@ -64,7 +64,7 @@ pkgbase = lib32-ffmpeg
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=n4.2.1
validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e37bca4f194..9b33611e337 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
_pkgbasename=ffmpeg
pkgname=lib32-$_pkgbasename
-pkgver=4.2
-pkgrel=2
+pkgver=4.2.1
+pkgrel=1
epoch=1
pkgdesc="Complete solution to record, convert and stream audio and video (32 bit)"
arch=('x86_64')
@@ -87,6 +87,7 @@ prepare() {
cd ${_pkgbasename}
# Patching if needed
+ git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
}
build() {