summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Boman2023-02-28 15:56:29 +0100
committerMagnus Boman2023-02-28 15:56:29 +0100
commitfd40d9c68a3064844a001bf96c21b618964bffc9 (patch)
treef8945ed80bca92c45e7a7b124fb60772b34d429c
parent153e62c45603cc57f164e28b1bd445fb9316c663 (diff)
downloadaur-fd40d9c68a3064844a001bf96c21b618964bffc9.tar.gz
upgpkg: ffmpeg-headless 1:6.0-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
2 files changed, 6 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87653c11ee1d..624d266bcfaf 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.1.2
- pkgrel = 2
+ pkgver = 6.0
+ pkgrel = 1
epoch = 1
url = https://ffmpeg.org/
arch = i686
@@ -81,7 +81,7 @@ pkgbase = ffmpeg-headless
provides = libswscale.so
provides = ffmpeg
conflicts = ffmpeg
- source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=1326fe9d4c85cca1ee774b072ef4fa337694f2e7
+ source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=3949db4d261748a9f34358a388ee255ad1a7f0c0
validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64
b2sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9b4cd7e6cba1..79215de24d92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg-headless
-pkgver=5.1.2
-pkgrel=2
+pkgver=6.0
+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)
@@ -92,7 +92,7 @@ provides=(
"${pkgname%-headless}"
)
conflicts=("${pkgname%-headless}")
-source=(git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=1326fe9d4c85cca1ee774b072ef4fa337694f2e7)
+source=(git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=3949db4d261748a9f34358a388ee255ad1a7f0c0)
b2sums=('SKIP')
validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
@@ -100,12 +100,6 @@ pkgver() {
git -C "${pkgname%-headless}" describe --tags | sed 's/^n//'
}
-prepare() {
- cd ${pkgname%-headless}
- git cherry-pick -n 412922cc6fa790897ef6bb2be5d6f9a5f030754d # remove default IPFS gateway
- git cherry-pick -n eb0455d64690eed0068e5cb202f72ecdf899837c # hwcontext_vulkan: remove optional encode/decode extensions from the list
-}
-
build() {
cd ${pkgname%-headless}
./configure \