Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openmw for openSUSE:Factory checked in at 2021-10-23 23:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmw (Old) and /work/SRC/openSUSE:Factory/.openmw.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmw" Sat Oct 23 23:14:08 2021 rev:11 rq:927103 version:0.46.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openmw/openmw.changes 2021-07-03 20:50:57.168720742 +0200 +++ /work/SRC/openSUSE:Factory/.openmw.new.1890/openmw.changes 2021-10-23 23:14:19.068991111 +0200 @@ -1,0 +2,9 @@ +Fri Oct 22 17:39:23 UTC 2021 - Adam Mizerski <a...@mizerski.pl> + +- Added patches: + - openmw-sigaltstack.patch + - openmw-cast-float-to-btScalar.patch +- Updated patches: + - openmw-add-missing-include.patch + +------------------------------------------------------------------- New: ---- openmw-cast-float-to-btScalar.patch openmw-sigaltstack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmw.spec ++++++ --- /var/tmp/diff_new_pack.alxQYc/_old 2021-10-23 23:14:19.812991475 +0200 +++ /var/tmp/diff_new_pack.alxQYc/_new 2021-10-23 23:14:19.816991477 +0200 @@ -26,10 +26,14 @@ URL: https://www.openmw.org Source: https://github.com/OpenMW/openmw/archive/%{name}-%{version}.tar.gz Source2: %{name}.rpmlintrc -# PATCH-FIX-UPSTREAM: openmw-add-missing-include.patch gh#OpenMW/openmw!2817 malcolmle...@opensuse.org -- Add missing algorithm include for later boost releases. +# PATCH-FIX-UPSTREAM openmw-add-missing-include.patch gh#OpenMW/openmw!2817 malcolmle...@opensuse.org -- Add missing algorithm include for later boost releases. Patch0: openmw-add-missing-include.patch -# OPENSUSE-FIX: Fix build on GCC 11 due to new required includes for std::numeric_limit. +# PATCH-FIX-UPSTREAM 0001-add-GCC-11-needed-includes.patch https://gitlab.com/OpenMW/openmw/-/issues/6357 a...@mizerski.pl -- Fix build on GCC 11 due to new required includes for std::numeric_limit. Patch1: 0001-add-GCC-11-needed-includes.patch +# PATCH-FIX-UPSTREAM openmw-sigaltstack.patch https://gitlab.com/OpenMW/openmw/-/issues/6356 a...@mizerski.pl -- fix error: size of array 'altstack' is not an integral constant-expression +Patch2: openmw-sigaltstack.patch +# PATCH-FIX-UPSTREAM openmw-cast-float-to-btScalar.patch a...@mizerski.pl -- this will be included in 0.47.0 release +Patch3: openmw-cast-float-to-btScalar.patch BuildRequires: MyGUI-devel >= 3.2.1 BuildRequires: cmake BuildRequires: doxygen @@ -92,8 +96,7 @@ %prep %setup -q -n openmw-openmw-%{version} -%patch0 -p2 -%patch1 -p1 +%autopatch -p1 cp 'files/mygui/DejaVu Font License.txt' ./DejaVuFontLicense.txt ## fix __DATE__ and __TIME__ @@ -108,7 +111,11 @@ done %build -%cmake -DGLOBAL_DATA_PATH="%{_datadir}/" \ +# -DBT_USE_DOUBLE_PRECISION should be discovered by cmake from bullet config, but it's not. +%cmake \ + -DCMAKE_C_FLAGS="%{optflags} -DBT_USE_DOUBLE_PRECISION" \ + -DCMAKE_CXX_FLAGS="%{optflags} -DBT_USE_DOUBLE_PRECISION" \ + -DGLOBAL_DATA_PATH="%{_datadir}/" \ -DMORROWIND_DATA_FILES="%{_datadir}/%{name}/data/" \ -DOPENMW_RESOURCE_FILES="%{_datadir}/%{name}/resources/" \ -DUSE_SYSTEM_TINYXML="ON" \ ++++++ openmw-add-missing-include.patch ++++++ --- /var/tmp/diff_new_pack.alxQYc/_old 2021-10-23 23:14:19.848991493 +0200 +++ /var/tmp/diff_new_pack.alxQYc/_new 2021-10-23 23:14:19.848991493 +0200 @@ -1,6 +1,7 @@ -diff -Naur a/openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp b/openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp ---- a/openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp 2020-06-08 04:11:24.000000000 -0500 -+++ b/openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp 2020-11-15 20:03:09.136071793 -0600 +Index: openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp +=================================================================== +--- openmw-openmw-0.46.0.orig/components/detournavigator/offmeshconnectionsmanager.hpp ++++ openmw-openmw-0.46.0/components/detournavigator/offmeshconnectionsmanager.hpp @@ -13,6 +13,7 @@ #include <boost/optional.hpp> @@ -9,3 +10,15 @@ #include <map> #include <mutex> #include <unordered_map> +Index: openmw-openmw-0.46.0/components/vfs/filesystemarchive.cpp +=================================================================== +--- openmw-openmw-0.46.0.orig/components/vfs/filesystemarchive.cpp ++++ openmw-openmw-0.46.0/components/vfs/filesystemarchive.cpp +@@ -1,5 +1,7 @@ + #include "filesystemarchive.hpp" + ++#include <algorithm> ++ + #include <boost/filesystem.hpp> + + #include <components/debug/debuglog.hpp> ++++++ openmw-cast-float-to-btScalar.patch ++++++ >From 14d0ca4cd3e9aa9e329590913d5f8fb55077587d Mon Sep 17 00:00:00 2001 From: elsid <elsid.m...@gmail.com> Date: Sun, 25 Nov 2018 11:42:26 +0300 Subject: [PATCH] Cast float to btScalar --- .../detournavigator/recastmeshbuilder.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/detournavigator/recastmeshbuilder.cpp b/components/detournavigator/recastmeshbuilder.cpp index d96ba2f29cf..f613683571b 100644 --- a/components/detournavigator/recastmeshbuilder.cpp +++ b/components/detournavigator/recastmeshbuilder.cpp @@ -163,15 +163,15 @@ namespace DetourNavigator transformBoundingBox(transform, aabbMin, aabbMax); - aabbMin.setX(std::max(mBounds.mMin.x(), aabbMin.x())); - aabbMin.setX(std::min(mBounds.mMax.x(), aabbMin.x())); - aabbMin.setY(std::max(mBounds.mMin.y(), aabbMin.y())); - aabbMin.setY(std::min(mBounds.mMax.y(), aabbMin.y())); - - aabbMax.setX(std::max(mBounds.mMin.x(), aabbMax.x())); - aabbMax.setX(std::min(mBounds.mMax.x(), aabbMax.x())); - aabbMax.setY(std::max(mBounds.mMin.y(), aabbMax.y())); - aabbMax.setY(std::min(mBounds.mMax.y(), aabbMax.y())); + aabbMin.setX(std::max(static_cast<btScalar>(mBounds.mMin.x()), aabbMin.x())); + aabbMin.setX(std::min(static_cast<btScalar>(mBounds.mMax.x()), aabbMin.x())); + aabbMin.setY(std::max(static_cast<btScalar>(mBounds.mMin.y()), aabbMin.y())); + aabbMin.setY(std::min(static_cast<btScalar>(mBounds.mMax.y()), aabbMin.y())); + + aabbMax.setX(std::max(static_cast<btScalar>(mBounds.mMin.x()), aabbMax.x())); + aabbMax.setX(std::min(static_cast<btScalar>(mBounds.mMax.x()), aabbMax.x())); + aabbMax.setY(std::max(static_cast<btScalar>(mBounds.mMin.y()), aabbMax.y())); + aabbMax.setY(std::min(static_cast<btScalar>(mBounds.mMax.y()), aabbMax.y())); transformBoundingBox(transform.inverse(), aabbMin, aabbMax); ++++++ openmw-sigaltstack.patch ++++++ Fix error: size of array 'altstack' is not an integral constant-expression Index: openmw-openmw-0.46.0/components/crashcatcher/crashcatcher.cpp =================================================================== --- openmw-openmw-0.46.0.orig/components/crashcatcher/crashcatcher.cpp +++ openmw-openmw-0.46.0/components/crashcatcher/crashcatcher.cpp @@ -56,8 +56,6 @@ static const char exec_err[] = "!!! Fail static char argv0[PATH_MAX]; -static char altstack[SIGSTKSZ]; - static struct { int signum; @@ -467,9 +465,9 @@ int crashCatcherInstallHandlers(int argc /* Set an alternate signal stack so SIGSEGVs caused by stack overflows * still run */ - altss.ss_sp = altstack; + altss.ss_sp = malloc(SIGSTKSZ); altss.ss_flags = 0; - altss.ss_size = sizeof(altstack); + altss.ss_size = SIGSTKSZ; sigaltstack(&altss, nullptr); memset(&sa, 0, sizeof(sa));
