From 4812fd2537862f562f33a0bf815904eea71462b1 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 29 Jul 2023 17:08:48 -0700 Subject: Updated to 0.48 --- 1870.patch | 43 -------------------------- 1941.patch | 24 -------------- 98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch | 39 ----------------------- PKGBUILD | 39 ++++++----------------- 4 files changed, 9 insertions(+), 136 deletions(-) delete mode 100644 1870.patch delete mode 100644 1941.patch delete mode 100644 98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch diff --git a/1870.patch b/1870.patch deleted file mode 100644 index 15caa2b..0000000 --- a/1870.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5f2e2823599b7d02b30957b2a4f8ec1ed2e12f5d Mon Sep 17 00:00:00 2001 -From: elsid -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 -+#include -+ - #include - --#include -+#include - #include - - #include -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 - -+#include -+ - namespace osgMyGUI - { - --- -GitLab - diff --git a/1941.patch b/1941.patch deleted file mode 100644 index cd5e6c7..0000000 --- a/1941.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp -index 0a9641635f..997b4e30c6 100644 ---- a/apps/openmw/mwsound/ffmpeg_decoder.cpp -+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp -@@ -18,11 +18,14 @@ int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size) - std::istream& stream = *static_cast(user_data)->mDataStream; - stream.clear(); - stream.read((char*)buf, buf_size); -- return stream.gcount(); -+ std::streamsize count = stream.gcount(); -+ if (count == 0) -+ return AVERROR_EOF; -+ return count; - } - catch (std::exception& ) - { -- return 0; -+ return AVERROR_UNKNOWN; - } - } - --- -GitLab - diff --git a/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch b/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch deleted file mode 100644 index ff0080e..0000000 --- a/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 98a7d90ee258ceef9c70b0b2955d0458ec46f048 Mon Sep 17 00:00:00 2001 -From: elsid -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 f4e5f45..1ec6fa3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,46 +10,25 @@ # Arch version segfaults when loading save games pkgname=openmw -pkgver=0.47.0 -pkgrel=11 +pkgver=0.48.0 +pkgrel=2 pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind" arch=('x86_64') url="http://www.openmw.org" license=('GPL3' 'MIT' 'custom') -depends=('openal' 'openscenegraph' 'mygui' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt' 'boost-libs' - 'recastnavigation-openmw' 'bullet-dp') -makedepends=('cmake' 'boost' 'doxygen' 'ninja' 'gcc12') +depends=('openal' 'openscenegraph' 'mygui' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' + 'libxt' 'boost-libs' 'bullet-dp' 'yaml-cpp' 'luajit' + 'recastnavigation-openmw') +makedepends=('cmake' 'boost' 'doxygen' 'ninja') options=(lto) -source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz" - 1870.patch - 1941.patch - 98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch) -sha512sums=('517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b' - '99f721bbeba43a0e259498bbf16ae24dba2a8554e5543fce265ef6c3cc544f4b28c6a13ed3aa51b1eea97fc0552fe056b028188f326dca0265096cf29988f504' - 'ca1b8601b4baca6929c928b9349e3b07d21992890d4c50c5ff4d537a5ab1b77f044c520af46e8f21480d37902e6329e5ec4459056ac9d8801ba0278d8391bcd7' - '37dfc5611523bf158fe2b6c19bdc11ebd0a70837943183b16b1ec36e06df37c7e089586935753c7442720349d5a7e356dc4f11e79666af0c4d5146f8f64d4853') -b2sums=('40e8b9670423259fa0cc03ef000c17ebe06d1d58c2527b51b25cea3b54978b8a698984371eac14ff212f9550253ab17d41b83d37426371f12f5ce2d30b240d3d' - '8989cd81b4a61eb91123d15da6c3cbbf7d0fcf1e70561a1691c82de2cfb479a594635a8a7437989e054e293427b800bae44b1155eedf860c9320e9382620ea0b' - '9f5511b5b8a02fbfa669367339db9b76d2e4c99c3d285be9c83b30ee040e88c09dc00ee5d404f33e43bce2735fe6d6e40799cbc1ec60fa1759f6c7b997eb255c' - '293027182d38b0b75aa46b9a4048bec3ccb57e1d200996c3340ba4b9a3512f5952d2b2da67be89e86c799312448b23ce5d4b56801002384b41428ac9f8fe77bd') +source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz") +sha512sums=('969c10b285c039b54810c56f202f9c33bd03c83d87fec722c3389525e87fc7104760ea12527be5fb19a3f7ae2dc9aef0e4c6b7375d8bbcd6eb726e1d7859b833') +b2sums=('6a6f710f06efc0e844115018365db8148e9f6acefd453df74904144f53f5e896e9ab4d4f563ab95a3231500a2c1a5e1f8c5b6d6ac5c1315805c61657d13a7aa8') -prepare () { - cd openmw-openmw-$pkgver - patch -Np1 -i "$srcdir"/1870.patch - patch -Np1 -i "$srcdir"/1941.patch - patch -Np1 -i "$srcdir"/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch -} build() { cd ${pkgname}-${pkgname}-${pkgver} - # Use gcc12 until build errors are fixed - export CC=gcc-12 - export CXX=g++-12 - export AR=gcc-ar-12 - export NM=gcc-nm-12 - export RANLIB=gcc-ranlib-12 - # gcc 10.2 + qt 5.15 + pie = segfault export CFLAGS="$CFLAGS -O3" export CXXFLAGS="$CXXFLAGS -O3" -- cgit v1.2.1