Rebuild for ffmpeg

3 files changed, 87 insertions, 5 deletions

diff --git a/1870.patch b/1870.patch
new file mode 100644
index 0000000..15caa2b
--- /dev/null
+++ b/1870.patch
@@ -0,0 +1,43 @@
+From 5f2e2823599b7d02b30957b2a4f8ec1ed2e12f5d Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail@gmail.com>
+Date: Tue, 17 May 2022 00:58:24 +0200
+Subject: [PATCH] Add includes for used types and functions
+
+---
+ components/myguiplatform/myguidatamanager.cpp | 5 ++++-
+ components/myguiplatform/myguidatamanager.hpp | 2 ++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/components/myguiplatform/myguidatamanager.cpp b/components/myguiplatform/myguidatamanager.cpp
+index fc5d2bf953..1aa16946a4 100644
+--- a/components/myguiplatform/myguidatamanager.cpp
++++ b/components/myguiplatform/myguidatamanager.cpp
+@@ -1,8 +1,11 @@
+ #include "myguidatamanager.hpp"
+ 
++#include <memory>
++#include <string>
++
+ #include <MyGUI_DataFileStream.h>
+ 
+-#include <boost/filesystem.hpp>
++#include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ 
+ #include <components/debug/debuglog.hpp>
+diff --git a/components/myguiplatform/myguidatamanager.hpp b/components/myguiplatform/myguidatamanager.hpp
+index da24763d7b..e0c4e6c436 100644
+--- a/components/myguiplatform/myguidatamanager.hpp
++++ b/components/myguiplatform/myguidatamanager.hpp
+@@ -3,6 +3,8 @@
+ 
+ #include <MyGUI_DataManager.h>
+ 
++#include <string>
++
+ namespace osgMyGUI
+ {
+ 
+-- 
+GitLab
+
diff --git a/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch b/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch
new file mode 100644
index 0000000..ff0080e
--- /dev/null
+++ b/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch
@@ -0,0 +1,39 @@
+From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail@gmail.com>
+Date: Fri, 24 Sep 2021 19:40:29 +0200
+Subject: [PATCH] Assume SIGSTKSZ is not a constant
+
+SIGSTKSZ is not defined as constant since glibc 2.34:
+https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53
+---
+ components/crashcatcher/crashcatcher.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/components/crashcatcher/crashcatcher.cpp b/components/crashcatcher/crashcatcher.cpp
+index 86571e1e3a..c828e1ca81 100644
+--- a/components/crashcatcher/crashcatcher.cpp
++++ b/components/crashcatcher/crashcatcher.cpp
+@@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Failed to exec debug process\n";
+ 
+ static char argv0[PATH_MAX];
+ 
+-static char altstack[SIGSTKSZ];
+-
+ 
+ static struct {
+     int signum;
+@@ -475,9 +473,10 @@ int crashCatcherInstallHandlers(int argc, char **argv, int num_signals, int *sig
+ 
+     /* Set an alternate signal stack so SIGSEGVs caused by stack overflows
+      * still run */
++    static char* altstack = new char [SIGSTKSZ];
+     altss.ss_sp = altstack;
+     altss.ss_flags = 0;
+-    altss.ss_size = sizeof(altstack);
++    altss.ss_size = SIGSTKSZ;
+     sigaltstack(&altss, nullptr);
+ 
+     memset(&sa, 0, sizeof(sa));
+-- 
+GitLab
+
diff --git a/PKGBUILD b/PKGBUILD
index 645ca8f..6f2c55a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=openmw
 pkgver=0.47.0
-pkgrel=9
+pkgrel=10
 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind"
 arch=('x86_64')
 url="http://www.openmw.org"
@@ -21,9 +21,9 @@ depends=('openal' 'openscenegraph' 'mygui' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield'
 makedepends=('cmake' 'boost' 'doxygen' 'ninja')
 options=(lto)
 source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz"
-        openmw-1870.patch::"https://gitlab.com/OpenMW/openmw/-/merge_requests/1870.patch"
+        1870.patch
         1941.patch
-        openmw-98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch::"https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch")
+        98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch)
 sha512sums=('517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b'
             '99f721bbeba43a0e259498bbf16ae24dba2a8554e5543fce265ef6c3cc544f4b28c6a13ed3aa51b1eea97fc0552fe056b028188f326dca0265096cf29988f504'
             'ca1b8601b4baca6929c928b9349e3b07d21992890d4c50c5ff4d537a5ab1b77f044c520af46e8f21480d37902e6329e5ec4459056ac9d8801ba0278d8391bcd7'
@@ -35,9 +35,9 @@ b2sums=('40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a6989843
 
 prepare () {
   cd openmw-openmw-$pkgver
-  patch -Np1 -i "$srcdir"/openmw-1870.patch
+  patch -Np1 -i "$srcdir"/1870.patch
   patch -Np1 -i "$srcdir"/1941.patch
-  patch -Np1 -i "$srcdir"/openmw-98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch
+  patch -Np1 -i "$srcdir"/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch
 }
 
 build() {