mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-30 09:22:57 +02:00
Merge b51ab5d4ea into 9f47aebee5
This commit is contained in:
zlice
GitHub
commit
8b0e704cbd
6 changed files with 84 additions and 48 deletions
|
|
@ -3130,7 +3130,7 @@ libsctp.so.1 lksctp-tools-1.0.17_1
|
|||
libwithsctp.so.1 lksctp-tools-1.0.17_1
|
||||
libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4
|
||||
libunshield.so.1 libunshield-1.6.2_1
|
||||
libMyGUIEngine.so.3.4.2 libmygui-3.4.2_1
|
||||
libMyGUIEngine.so.3.4.3 libmygui-3.4.3_1
|
||||
libcollada-dom2.5-dp.so.0 collada-dom-2.5.0_1
|
||||
libproj.so.25 proj-9.1.1_1
|
||||
libnlopt.so.1 nlopt-2.10.0_1
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# Template file for 'mygui'
|
||||
# Template file for 'libmygui'
|
||||
pkgname=libmygui
|
||||
version=3.4.2
|
||||
version=3.4.3
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DMYGUI_BUILD_DEMOS=OFF -DMYGUI_RENDERSYSTEM=1 -DMYGUI_BUILD_TOOLS=OFF"
|
||||
configure_args="-DMYGUI_BUILD_DEMOS=OFF -DMYGUI_RENDERSYSTEM=1 -DMYGUI_BUILD_TOOLS=OFF
|
||||
-DMYGUI_DONT_USE_OBSOLETE=ON"
|
||||
hostmakedepends="doxygen pkg-config"
|
||||
makedepends="libX11-devel ois-devel boost-devel freetype-devel"
|
||||
short_desc="Fast, flexible and simple GUI"
|
||||
|
|
@ -11,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
|
|||
license="MIT"
|
||||
homepage="http://mygui.info"
|
||||
distfiles="https://github.com/MyGUI/mygui/archive/MyGUI${version}.tar.gz"
|
||||
checksum=1cc45fb96c9438e3476778449af0378443d84794a458978a29c75306e45dd45a
|
||||
checksum=33c91b531993047e77cace36d6fea73634b8c17bd0ed193d4cd12ac7c6328abd
|
||||
|
||||
libmygui-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
|
|
|
|||
50
srcpkgs/openmw/patches/32bit.patch
Normal file
50
srcpkgs/openmw/patches/32bit.patch
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
diff --git a/components/esm/formid.hpp b/components/esm/formid.hpp
|
||||
index e9416e35c7..9fe89585c2 100644
|
||||
--- a/components/esm/formid.hpp
|
||||
+++ b/components/esm/formid.hpp
|
||||
@@ -51,10 +51,10 @@ namespace std
|
||||
{
|
||||
size_t operator()(const ESM::FormId& formId) const
|
||||
{
|
||||
- static_assert(sizeof(ESM::FormId) == sizeof(size_t));
|
||||
- size_t s;
|
||||
- memcpy(&s, &formId, sizeof(size_t));
|
||||
- return hash<size_t>()(s);
|
||||
+ static_assert(sizeof(ESM::FormId) == sizeof(uint64_t));
|
||||
+ uint64_t s;
|
||||
+ memcpy(&s, &formId, sizeof(ESM::FormId));
|
||||
+ return hash<uint64_t>()(s);
|
||||
}
|
||||
};
|
||||
|
||||
diff --git a/components/misc/strings/algorithm.hpp b/components/misc/strings/algorithm.hpp
|
||||
index 18f72104bd..8152499724 100644
|
||||
--- a/components/misc/strings/algorithm.hpp
|
||||
+++ b/components/misc/strings/algorithm.hpp
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "lower.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
@@ -85,14 +86,14 @@ namespace Misc::StringUtils
|
||||
{
|
||||
using is_transparent = void;
|
||||
|
||||
- constexpr std::size_t operator()(std::string_view str) const
|
||||
+ constexpr std::uint64_t operator()(std::string_view str) const
|
||||
{
|
||||
// FNV-1a
|
||||
- std::size_t hash{ 0xcbf29ce484222325ull };
|
||||
- constexpr std::size_t prime{ 0x00000100000001B3ull };
|
||||
+ std::uint64_t hash{ 0xcbf29ce484222325ull };
|
||||
+ constexpr std::uint64_t prime{ 0x00000100000001B3ull };
|
||||
for (char c : str)
|
||||
{
|
||||
- hash ^= static_cast<std::size_t>(toLower(c));
|
||||
+ hash ^= static_cast<std::uint64_t>(toLower(c));
|
||||
hash *= prime;
|
||||
}
|
||||
return hash;
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/components/bsa/bsa_file.cpp 2023-08-08 11:23:20.000000000 +0200
|
||||
+++ - 2025-04-22 10:55:08.517484675 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <components/files/constrainedfilestream.hpp>
|
||||
|
||||
#include <cassert>
|
||||
+#include <algorithm>
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <boost/filesystem/fstream.hpp>
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
#define MWGUI_CONTROLLERS_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <MyGUI_ControllerItem.h>
|
||||
#include <string>
|
||||
|
||||
--- a/apps/openmw/mwgui/itemselection.hpp
|
||||
+++ b/apps/openmw/mwgui/itemselection.hpp
|
||||
|
|
@ -39,32 +39,23 @@
|
|||
#include "../mwmechanics/stat.hpp"
|
||||
|
||||
#include <components/esm/effectlist.hpp>
|
||||
--- a/apps/openmw/mwinput/controlswitch.hpp
|
||||
+++ b/apps/openmw/mwinput/controlswitch.hpp
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef MWINPUT_CONTROLSWITCH_H
|
||||
#define MWINPUT_CONTROLSWITCH_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
--- a/components/misc/utf8stream.hpp
|
||||
+++ b/components/misc/utf8stream.hpp
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef MISC_UTF8ITER_HPP
|
||||
#define MISC_UTF8ITER_HPP
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
--- a/components/myguiplatform/myguidatamanager.cpp
|
||||
+++ b/components/myguiplatform/myguidatamanager.cpp
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "myguidatamanager.hpp"
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
--- a/components/esm3/variant.hpp
|
||||
+++ b/components/esm3/variant.hpp
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef OPENMW_ESM_VARIANT_H
|
||||
#define OPENMW_ESM_VARIANT_H
|
||||
|
||||
+#include <cstdint>
|
||||
#include <iosfwd>
|
||||
#include <string>
|
||||
#include <tuple>
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
# Template file for 'openmw'
|
||||
pkgname=openmw
|
||||
version=0.48.0
|
||||
revision=4
|
||||
version=0.49.0
|
||||
revision=1
|
||||
build_style=cmake
|
||||
_recast_commit=e75adf86f91eb3082220085e42dda62679f9a3ea
|
||||
_bullet_tag=3.17
|
||||
_recast_commit=c393777d26d2ff6519ac23612abf8af42678c9dd
|
||||
_bullet_tag=3.25
|
||||
# System bullet doesn't use double precision (double precision would break vdrift)
|
||||
# LTO gives a measurable performance boost, while not hurting compile time too much
|
||||
configure_args="-DDESIRED_QT_VERSION=5 -DOPENMW_USE_SYSTEM_BULLET=OFF
|
||||
configure_args="-DOPENMW_USE_SYSTEM_BULLET=OFF -DOPENMW_USE_SYSTEM_MYGUI=ON
|
||||
-DOPENMW_LTO_BUILD=ON -DFETCHCONTENT_FULLY_DISCONNECTED=On"
|
||||
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
|
||||
hostmakedepends="pkg-config qt6-base qt6-tools"
|
||||
makedepends="SDL2-devel boost-devel ffmpeg6-devel libXt-devel
|
||||
libmygui-devel libopenal-devel libunshield-devel osg-devel qt5-devel
|
||||
libmygui-devel libopenal-devel libunshield-devel osg-devel qt6-svg-devel
|
||||
liblz4-devel yaml-cpp-devel LuaJIT-devel"
|
||||
short_desc="Open Implementation of Morrowind's Engine"
|
||||
maintainer="John <me@johnnynator.dev>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="http://openmw.org"
|
||||
changelog="https://openmw.org/2023/openmw-0-48-0-released/"
|
||||
changelog="https://openmw.org/2025/openmw-0-49-0-released/"
|
||||
distfiles="https://gitlab.com/OpenMW/openmw/-/archive/openmw-${version}/openmw-openmw-${version}.tar.gz
|
||||
https://github.com/recastnavigation/recastnavigation/archive/${_recast_commit}.tar.gz
|
||||
https://github.com/bulletphysics/bullet3/archive/refs/tags/${_bullet_tag}.tar.gz"
|
||||
checksum="be97b8e900853c43dde8816f2ce49801fb672cffdf48ac7af9782abfb8a74af4
|
||||
c647e307d6cc62ba00bfd888e82da83844bf1e72f2c98bed2f1d95bac229b950
|
||||
baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61"
|
||||
checksum="5f31741d61cf7c736bbe522a1a33342773c7e1b713e7e20f3717eb8da2b1733d
|
||||
fa8b901651017b20a38996bbab2d205d244328ed11778b53224282e9884e6c91
|
||||
c45afb6399e3f68036ddb641c6bf6f552bf332d5ab6be62f7e6c54eda05ceb77"
|
||||
|
||||
skip_extraction="${_recast_commit}.tar.gz ${_bullet_tag}.tar.gz"
|
||||
|
||||
|
|
@ -31,6 +31,10 @@ if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then
|
|||
broken="https://gitlab.com/OpenMW/openmw/issues/564"
|
||||
fi
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
configure_args+=" -DRUN_RESULT_VAR=0"
|
||||
fi
|
||||
|
||||
post_extract() {
|
||||
mkdir -p build/fetched/recastnavigation \
|
||||
build/fetched/bullet \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue