summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3ada2c01e559..19b5e35e79f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
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 = 6.0.r12.ga6dc929
- pkgrel = 5
+ pkgrel = 6
url = https://ffmpeg.org/
- arch = i686
arch = x86_64
arch = aarch64
license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index c751a8c5887c..1a28c96e13bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,9 +52,9 @@ fi
pkgname=ffmpeg-obs
pkgver=6.0.r12.ga6dc929
-pkgrel=5
+pkgrel=6
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')
+arch=('x86_64' 'aarch64')
url=https://ffmpeg.org/
license=(GPL3)
# To manage dependency rebuild easily, this will prevent you to rebuild FFmpeg on non-updated system
@@ -400,6 +400,9 @@ prepare() {
## https://crbug.com/1251779
patch -Np1 -i "${srcdir}"/add-av_stream_get_first_dts-for-chromium.patch
+ ## Fix building with binutils 2.41
+ git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb
+
### OBS changes
## Patch for FFmpeg from obs-deps repository