summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlapicidae2024-04-22 21:54:42 +0200
committerlapicidae2024-04-22 21:54:42 +0200
commitd46187b1336e23547dfd99dc4ee0f6a5eb9bd0e1 (patch)
treed41b9e9d7f87bc46d30cd12dc1b8ddbe11fcbf14
parent4e23f1d57a40c75ff15bb9b3faa230b0ddb93f7e (diff)
downloadaur-d46187b1336e23547dfd99dc4ee0f6a5eb9bd0e1.tar.gz
avcodec/nvenc build fix
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1d981ca9e46..163c140ad56d 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 = 6.1.1
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://ffmpeg.org
arch = i686
@@ -94,7 +94,7 @@ pkgbase = ffmpeg-headless
conflicts = ffmpeg
source = ffmpeg-headless::git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=6f4048827982a8f48f71f551a6e1ed2362816eec
validpgpkeys = DD1EC9E8DE085C629B3E1846B18E8928B3948D64
- b2sums = SKIP
+ b2sums = 9c19bd6b68d4224af2a93fdce199fd0ce9b00432c8818801d124ca993ac45a01d3a7618b66804c02c1f26787a5ca88d2d9f682f3e819cee8c2b6b3dc77e64052
pkgname = ffmpeg-headless
depends = aom
diff --git a/PKGBUILD b/PKGBUILD
index 64e407cad578..21a83b48f960 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=ffmpeg-headless
pkgver=6.1.1
-pkgrel=1
+pkgrel=2
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)
@@ -106,7 +106,7 @@ provides=(
conflicts=('ffmpeg')
_tag='6f4048827982a8f48f71f551a6e1ed2362816eec'
source=("$pkgname::git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}")
-b2sums=('SKIP')
+b2sums=('9c19bd6b68d4224af2a93fdce199fd0ce9b00432c8818801d124ca993ac45a01d3a7618b66804c02c1f26787a5ca88d2d9f682f3e819cee8c2b6b3dc77e64052')
validpgpkeys=('DD1EC9E8DE085C629B3E1846B18E8928B3948D64') # Michael Niedermayer <michael@niedermayer.cc>
prepare() {
@@ -125,6 +125,10 @@ prepare() {
git cherry-pick -n 250471ea1745fc703eb346a2a662304536a311b1
# Fix build with latest vulkan headers
git cherry-pick -n fef22c87ada4517441701e6e61e062c9f4399c8e
+ # avcodec/nvenc: stop using long deprecated format specifiers
+ git cherry-pick -n 43b417d516b0fabbec1f02120d948f636b8a018e
+ # avcodec/nvenc: support SDK 12.2 bit depth API
+ git cherry-pick -n 06c2a2c425f22e7dba5cad909737a631cc676e3f
}
pkgver() {