Skip to content

Commit 21644bc

Browse files
committed
openmw: update to 0.49.0
1 parent b51861e commit 21644bc

File tree

3 files changed

+28
-43
lines changed

3 files changed

+28
-43
lines changed

srcpkgs/openmw/patches/algorithm.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

srcpkgs/openmw/patches/musl-cstdint.patch

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#define MWGUI_CONTROLLERS_H
66

77
+#include <cstdint>
8-
#include <string>
98
#include <MyGUI_ControllerItem.h>
9+
#include <string>
1010

1111
--- a/apps/openmw/mwgui/itemselection.hpp
1212
+++ b/apps/openmw/mwgui/itemselection.hpp
@@ -39,32 +39,23 @@
3939
#include "../mwmechanics/stat.hpp"
4040

4141
#include <components/esm/effectlist.hpp>
42-
--- a/apps/openmw/mwinput/controlswitch.hpp
43-
+++ b/apps/openmw/mwinput/controlswitch.hpp
44-
@@ -1,6 +1,7 @@
45-
#ifndef MWINPUT_CONTROLSWITCH_H
46-
#define MWINPUT_CONTROLSWITCH_H
4742

48-
+#include <cstdint>
49-
#include <map>
50-
#include <string>
51-
52-
--- a/components/misc/utf8stream.hpp
53-
+++ b/components/misc/utf8stream.hpp
54-
@@ -1,6 +1,7 @@
55-
#ifndef MISC_UTF8ITER_HPP
56-
#define MISC_UTF8ITER_HPP
57-
58-
+#include <cstdint>
59-
#include <cstring>
60-
#include <string>
61-
#include <string_view>
6243
--- a/components/myguiplatform/myguidatamanager.cpp
6344
+++ b/components/myguiplatform/myguidatamanager.cpp
6445
@@ -1,5 +1,6 @@
6546
#include "myguidatamanager.hpp"
6647

6748
+#include <cstdint>
68-
#include <memory>
69-
#include <string>
7049
#include <stdexcept>
50+
#include <string>
51+
52+
--- a/components/esm3/variant.hpp
53+
+++ b/components/esm3/variant.hpp
54+
@@ -1,6 +1,7 @@
55+
#ifndef OPENMW_ESM_VARIANT_H
56+
#define OPENMW_ESM_VARIANT_H
57+
58+
+#include <cstdint>
59+
#include <iosfwd>
60+
#include <string>
61+
#include <tuple>

srcpkgs/openmw/template

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
# Template file for 'openmw'
22
pkgname=openmw
3-
version=0.48.0
4-
revision=4
3+
version=0.49.0
4+
revision=1
55
build_style=cmake
6-
_recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea
7-
_bullet_tag=3.17
6+
_recast_commit=c393777d26d2ff6519ac23612abf8af42678c9dd
7+
_bullet_tag=3.25
88
# System bullet doesn't use double precision (double precision would break vdrift)
99
# LTO gives a measurable performance boost, while not hurting compile time too much
10-
configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF
10+
configure_args="-DOPENMW_USE_SYSTEM_BULLET=OFF -DOPENMW_USE_SYSTEM_MYGUI=ON
1111
-DOPENMW_LTO_BUILD=ON -DFETCHCONTENT_FULLY_DISCONNECTED=On"
12-
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
12+
hostmakedepends="pkg-config qt6-base qt6-tools"
1313
makedepends="SDL2-devel boost-devel ffmpeg6-devel libXt-devel
14-
libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel
14+
libmygui-devel libopenal-devel libunshield-devel osg-devel qt6-svg-devel
1515
liblz4-devel yaml-cpp-devel LuaJIT-devel"
1616
short_desc="Open Implementation of Morrowind's Engine"
1717
maintainer="John <me@johnnynator.dev>"
1818
license="GPL-3.0-or-later"
1919
homepage="http://openmw.org"
20-
changelog="https://openmw.org/2023/openmw-0-48-0-released/"
20+
changelog="https://openmw.org/2025/openmw-0-49-0-released/"
2121
distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz
2222
https://github.com/recastnavigation/recastnavigation/archive/${_recast_commit}.tar.gz
2323
https://github.com/bulletphysics/bullet3/archive/refs/tags/${_bullet_tag}.tar.gz"
24-
checksum="be97b8e900853c43dde8816f2ce49801fb672cffdf48ac7af9782abfb8a74af4
25-
c647e307d6cc62ba00bfd888e82da83844bf1e72f2c98bed2f1d95bac229b950
26-
baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61"
24+
checksum="5f31741d61cf7c736bbe522a1a33342773c7e1b713e7e20f3717eb8da2b1733d
25+
fa8b901651017b20a38996bbab2d205d244328ed11778b53224282e9884e6c91
26+
c45afb6399e3f68036ddb641c6bf6f552bf332d5ab6be62f7e6c54eda05ceb77"
2727

2828
skip_extraction="${_recast_commit}.tar.gz ${_bullet_tag}.tar.gz"
2929

3030
if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
3131
broken="https://gitlab.com/OpenMW/openmw/issues/564"
3232
fi
3333

34+
if [ "$CROSS_BUILD" ]; then
35+
configure_args+=" -DRUN_RESULT_VAR=0"
36+
fi
37+
3438
post_extract() {
3539
mkdir -p build/fetched/recastnavigation \
3640
build/fetched/bullet \

0 commit comments

Comments
 (0)