summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7252f666d2ec..4a3df1d6b750 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ffmpeg-obs
pkgdesc = Complete solution to record, convert and stream audio and video with fixes for OBS Studio. And various options in the PKGBUILD
pkgver = 5.1.2
- pkgrel = 1
+ pkgrel = 2
url = https://ffmpeg.org/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 5e4ae2b25907..380fa6acc3cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -55,7 +55,7 @@ DISTRIB_ID=`lsb_release --id | cut -f2 -d$'\t'`
pkgname=ffmpeg-obs
pkgver=5.1.2
-pkgrel=1
+pkgrel=2
pkgdesc='Complete solution to record, convert and stream audio and video with fixes for OBS Studio. And various options in the PKGBUILD'
arch=('i686' 'x86_64' 'aarch64')
url=https://ffmpeg.org/
@@ -433,6 +433,9 @@ prepare() {
## avdevice/v4l2: fix leak of timefilter
git cherry-pick -n 30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7
+ # Fix building with newer Vulkan versions
+ git cherry-pick -n eb0455d64690eed0068e5cb202f72ecdf899837c
+
### Arch Linux changes
## https://crbug.com/1251779