summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Boman2022-07-23 12:35:33 +0200
committerMagnus Boman2022-07-23 12:35:33 +0200
commitc3a0124f12993445c278de816a957c43fd75f1bd (patch)
tree72c3fa8b06d90d836860c77c407f3eb438240d1f
parent93ba8c6ff3ba393edf1b45d6617991a9b89e394b (diff)
downloadaur-c3a0124f12993445c278de816a957c43fd75f1bd.tar.gz
upgpkg: ffmpeg-headless 1:5.1-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 022edfc3ae69..dd6934fb7a52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-headless
pkgdesc = Complete solution to record, convert and stream audio and video; optimised for server (headless) systems
- pkgver = 5.0.1
- pkgrel = 3
+ pkgver = 5.1
+ pkgrel = 1
epoch = 1
url = https://ffmpeg.org/
arch = i686
@@ -76,9 +76,7 @@ pkgbase = ffmpeg-headless
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = git+https://git.ffmpeg.org/ffmpeg.git#tag=9687cae2b468e09e35df4cea92cc2e6a0e6c93b3
- source = ffmpeg-vmaf2.x.patch
+ source = git+https://git.ffmpeg.org/ffmpeg.git#tag=e0723b7e4e22492275d476fcd30d759e1198bc5b
b2sums = SKIP
- b2sums = 65039aac811bfd143359e32720cd6ca64124f1789c1b624bd28a5bd75b37362b2a3b6b402203c4e9d137fb1d00895114f3789df40f8381091d38c98e7876cc8a
pkgname = ffmpeg-headless
diff --git a/PKGBUILD b/PKGBUILD
index ec63a499a569..acfd53d1b811 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg-headless
-pkgver=5.0.1
-pkgrel=3
+pkgver=5.1
+pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video; optimised for server (headless) systems'
arch=(i686 x86_64 armv7h armv6h aarch64)
@@ -87,10 +87,8 @@ provides=(
"${pkgname%-headless}"
)
conflicts=("${pkgname%-headless}")
-source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=9687cae2b468e09e35df4cea92cc2e6a0e6c93b3
- ffmpeg-vmaf2.x.patch)
-b2sums=('SKIP'
- '65039aac811bfd143359e32720cd6ca64124f1789c1b624bd28a5bd75b37362b2a3b6b402203c4e9d137fb1d00895114f3789df40f8381091d38c98e7876cc8a')
+source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=e0723b7e4e22492275d476fcd30d759e1198bc5b)
+b2sums=('SKIP')
pkgver() {
git -C "${pkgname%-headless}" describe --tags | sed 's/^n//'
@@ -99,7 +97,6 @@ pkgver() {
prepare() {
cd ${pkgname%-headless}
git cherry-pick -n 988f2e9eb063db7c1a678729f58aab6eba59a55b # fix nvenc on older gpus
- patch -Np1 -i ../ffmpeg-vmaf2.x.patch # vmaf 2.x support
}
build() {