Fix compilation with ffmpeg 7.0

2 files changed, 10 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39249a458991..b0d7cfb54398 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openboard
 	pkgdesc = Interactive whiteboard software for schools and universities
 	pkgver = 1.7.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	arch = i686
@@ -21,8 +21,10 @@ pkgbase = openboard
 	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.7.1.tar.gz
 	source = openboard-c++20-support.patch::https://github.com/OpenBoard-org/OpenBoard/commit/6a0be1b4607da3c3eb9b7d8b547e7b489bc2d219.patch
 	source = openboard-use-c++20.patch::https://github.com/OpenBoard-org/OpenBoard/commit/ffeea1b662b012bd25a025f2130fa2c2044919f9.patch
+	source = openboard-add-ffmpeg-7-support.patch::https://patch-diff.githubusercontent.com/raw/OpenBoard-org/OpenBoard/pull/1017.patch
 	sha256sums = 5c9fcb54bc1598b4b7026e6ecca07137660dd3d45bda472a5710acf600a2a22f
 	sha256sums = ac8b4a37192454781216cf38b2fa702d3548a61b5e1c5ce419aa98bcdea77312
 	sha256sums = 8a0765cbc45f3e0e1c78f82d6c627afbb85bf17fbe1e256fec6e1c9ea2fd9313
+	sha256sums = d39d06b6b9152103efb6983c13f7d258b1eedd8e07d823a718ea816c849ba21d
 
 pkgname = openboard
diff --git a/PKGBUILD b/PKGBUILD
index 4a16ef3536ee..eb00b6781b25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ qt="qt${QT_VER}"
 pkgname=openboard
 pkgver=1.7.1
 _src_folder="OpenBoard-${pkgver}"
-pkgrel=2
+pkgrel=3
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
@@ -24,10 +24,12 @@ depends+=(poppler) #replace internal xpdf with poppler and drop freetype/xpdf fr
 makedepends=('cmake' ${qt}-tools)
 source=("https://github.com/OpenBoard-org/OpenBoard/archive/v${pkgver}.tar.gz"
         "openboard-c++20-support.patch::https://github.com/OpenBoard-org/OpenBoard/commit/6a0be1b4607da3c3eb9b7d8b547e7b489bc2d219.patch"
-        "openboard-use-c++20.patch::https://github.com/OpenBoard-org/OpenBoard/commit/ffeea1b662b012bd25a025f2130fa2c2044919f9.patch")
+        "openboard-use-c++20.patch::https://github.com/OpenBoard-org/OpenBoard/commit/ffeea1b662b012bd25a025f2130fa2c2044919f9.patch"
+        "openboard-add-ffmpeg-7-support.patch::https://patch-diff.githubusercontent.com/raw/OpenBoard-org/OpenBoard/pull/1017.patch")
 sha256sums=('5c9fcb54bc1598b4b7026e6ecca07137660dd3d45bda472a5710acf600a2a22f'
             'ac8b4a37192454781216cf38b2fa702d3548a61b5e1c5ce419aa98bcdea77312'
-            '8a0765cbc45f3e0e1c78f82d6c627afbb85bf17fbe1e256fec6e1c9ea2fd9313')
+            '8a0765cbc45f3e0e1c78f82d6c627afbb85bf17fbe1e256fec6e1c9ea2fd9313'
+            'd39d06b6b9152103efb6983c13f7d258b1eedd8e07d823a718ea816c849ba21d')
 
 prepare() {
   cd "$srcdir"/$_src_folder
@@ -35,6 +37,8 @@ prepare() {
   patch -p1 < "$srcdir"/openboard-c++20-support.patch
   echo "Enable use of C++20"
   patch -p1 < "$srcdir"/openboard-use-c++20.patch
+  echo "Add support for FFmpeg 7.0"
+  patch -p1 < "$srcdir"/openboard-add-ffmpeg-7-support.patch
 }
 
 build() {