- Version 2022.03.16
* DeliverAmbassador * Update warpJammer.cpp * update setting translation scenario_50_gaps.lua (#1656) * Tweak warp vs jump stats a bit so they are more equal. * Correct description discrepancy - the enemies are Exuari, not Kraylor. * Add estimated duration of one hour to description * Add descriptions and simple scan parameters for life pod and warp jammer * Increase the number of attacking hornets gradually while waiting for transport retrieval * New function for adding shields on Playership in scenarios * made your point clear in the documentation OBS-URL: https://build.opensuse.org/package/show/games/emptyepsilon?expand=0&rev=5
This commit is contained in:
parent
2cc3fbe6eb
commit
fbbd7b1f5d
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:878f36330a95a76039671a980a2fd680e7ddbdc5e22ff6ca046010b03d3efd01
|
||||
size 285211647
|
3
EmptyEpsilon-2022.03.16.tar.gz
Normal file
3
EmptyEpsilon-2022.03.16.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1279a385874522c626807f4f04124220922d3c216a178e1427fdf764b6e627ff
|
||||
size 258014053
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4c79b358ad310c773dd0db265393fba829df10a6f284240acbb383288d4f33d5
|
||||
size 1181117
|
3
SeriousProton-2022.03.16.tar.gz
Normal file
3
SeriousProton-2022.03.16.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dde2abefb90e61095c60a9c764086659ab7dd9179c0bd8ec69e62ea4d200a62e
|
||||
size 2671635
|
3
basis_universal.zip
Normal file
3
basis_universal.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d4798699488684ad2863f5dbc449b438eed3830639c916272553e58a38b005c7
|
||||
size 13299816
|
@ -9,7 +9,12 @@ wget https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz -O EmptyE
|
||||
tmp=$(mktemp -d)
|
||||
|
||||
tar xzvf EmptyEpsilon-${version}.tar.gz -C "$tmp" EmptyEpsilon-EE-${version}/CMakeLists.txt
|
||||
glm_url=$(grep -A1 glm.zip "${tmp}/EmptyEpsilon-EE-${version}/CMakeLists.txt" | grep "https://" | awk -F '"' '{print $2}')
|
||||
wget "$glm_url" -O glm.zip
|
||||
MESHOPTIMIZER_VERSION=$(grep "MESHOPTIMIZER_VERSION" "${tmp}/EmptyEpsilon-EE-${version}/CMakeLists.txt" | head -1 | cut -d' ' -f2 | cut -d')' -f1)
|
||||
wget "https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MESHOPTIMIZER_VERSION}.zip" -O meshoptimizer.zip
|
||||
|
||||
tar xzvf SeriousProton-${version}.tar.gz -C "$tmp" SeriousProton-EE-${version}/libs/basis_universal/CMakeLists.txt
|
||||
BASIS_VERSION=$(grep "BASIS_VERSION" "${tmp}/SeriousProton-EE-${version}/libs/basis_universal/CMakeLists.txt" | head -1 | cut -d'"' -f2)
|
||||
BASIS_URL=$(grep "BASIS_URL" "${tmp}/SeriousProton-EE-${version}/libs/basis_universal/CMakeLists.txt" | head -1 | cut -d'"' -f2)
|
||||
wget "${BASIS_URL}/archive/refs/tags/${BASIS_VERSION}.zip" -O basis_universal.zip
|
||||
|
||||
rm -r "$tmp"
|
||||
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 14 09:17:05 UTC 2022 - Dominik Heidler <dheidler@suse.de>
|
||||
|
||||
- Version 2022.03.16
|
||||
* DeliverAmbassador
|
||||
* Update warpJammer.cpp
|
||||
* update setting translation scenario_50_gaps.lua (#1656)
|
||||
* Tweak warp vs jump stats a bit so they are more equal.
|
||||
* Correct description discrepancy - the enemies are Exuari, not Kraylor.
|
||||
* Add estimated duration of one hour to description
|
||||
* Add descriptions and simple scan parameters for life pod and warp jammer
|
||||
* Increase the number of attacking hornets gradually while waiting for transport retrieval
|
||||
* New function for adding shields on Playership in scenarios
|
||||
* made your point clear in the documentation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 20 13:03:24 UTC 2021 - Dominik Heidler <dheidler@suse.de>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package emptyepsilon
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: emptyepsilon
|
||||
Version: 2021.06.23
|
||||
Version: 2022.03.16
|
||||
Release: 0
|
||||
Summary: Open source spaceship bridge simulator
|
||||
License: GPL-2.0-only
|
||||
@ -25,12 +25,20 @@ Group: Amusements/Games/Other
|
||||
URL: https://daid.github.io/EmptyEpsilon/
|
||||
Source: EmptyEpsilon-%{version}.tar.gz
|
||||
Source1: SeriousProton-%{version}.tar.gz
|
||||
Source2: glm.zip
|
||||
Source3: download.sh
|
||||
Source4: basis_universal.zip
|
||||
Source5: use_bundled_basis_universal.patch
|
||||
Source6: meshoptimizer.zip
|
||||
Source7: use_bundled_meshoptimizer.patch
|
||||
Source8: fix_unique_ptr_in_namespace_std_does_not_name_a_template_type.patch
|
||||
Source9: fix_getLocalAddress_SEGV.patch
|
||||
BuildRequires: SDL2-devel
|
||||
BuildRequires: bsdtar
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glm-devel
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: sfml2-devel
|
||||
BuildRequires: xorg-x11
|
||||
BuildRequires: xorg-x11-devel
|
||||
@ -47,10 +55,16 @@ Each officer fills a unique role: Captain, Helms, Weapons, Relay, Science, and E
|
||||
cd $RPM_SOURCE_DIR
|
||||
tar xf SeriousProton-%{version}.tar.gz
|
||||
tar xf EmptyEpsilon-%{version}.tar.gz
|
||||
patch -p0 < use_bundled_basis_universal.patch
|
||||
patch -p0 < use_bundled_meshoptimizer.patch
|
||||
patch -p0 < fix_unique_ptr_in_namespace_std_does_not_name_a_template_type.patch
|
||||
patch -p0 < fix_getLocalAddress_SEGV.patch
|
||||
|
||||
%build
|
||||
mkdir externals
|
||||
bsdtar xvf $RPM_SOURCE_DIR/glm.zip -C externals
|
||||
mkdir -p SeriousProton/externals/basis
|
||||
bsdtar xvf $RPM_SOURCE_DIR/basis_universal.zip --strip-components=1 -C SeriousProton/externals/basis
|
||||
mkdir -p externals/meshoptimizer
|
||||
bsdtar xvf $RPM_SOURCE_DIR/meshoptimizer.zip --strip-components=1 -C externals/meshoptimizer
|
||||
%if 0%{?sle_version:1}
|
||||
# if sle_version is defined, this is not tumbleweed
|
||||
export CC=gcc-10
|
||||
@ -75,5 +89,9 @@ install -Dvm 644 $RPM_SOURCE_DIR/EmptyEpsilon-EE-%{version}/README.md -t "%{buil
|
||||
%{_bindir}/EmptyEpsilon
|
||||
%{_datadir}/doc/EmptyEpsilon/
|
||||
%{_datadir}/emptyepsilon/
|
||||
%{_datadir}/applications/EmptyEpsilon.desktop
|
||||
%{_datadir}/icons/hicolor/1024x1024/apps/EmptyEpsilon.png
|
||||
%dir %{_datadir}/icons/hicolor/1024x1024/apps
|
||||
%dir %{_datadir}/icons/hicolor/1024x1024
|
||||
|
||||
%changelog
|
||||
|
13
fix_getLocalAddress_SEGV.patch
Normal file
13
fix_getLocalAddress_SEGV.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- SeriousProton-EE-2022.03.16/src/io/network/address.cpp 2022-03-15 23:05:53.000000000 +0100
|
||||
+++ /tmp/address.cpp 2022-09-15 12:23:30.305529074 +0200
|
||||
@@ -130,6 +130,10 @@
|
||||
{
|
||||
continue;
|
||||
}
|
||||
+ //printf("addr->ifa_addr is %p\n", (void *)addr->ifa_addr);
|
||||
+ if (addr->ifa_addr == nullptr) {
|
||||
+ continue;
|
||||
+ }
|
||||
if (addr->ifa_addr->sa_family == AF_INET)
|
||||
{
|
||||
::getnameinfo(addr->ifa_addr, sizeof(struct sockaddr_in), buffer, sizeof(buffer), nullptr, 0, NI_NUMERICHOST);
|
@ -0,0 +1,10 @@
|
||||
--- SeriousProton-EE-2022.03.16/src/io/http/websocket.h 2022-03-15 23:05:53.000000000 +0100
|
||||
+++ /var/tmp/build-root/openSUSE_Tumbleweed-x86_64/home/abuild/rpmbuild/SOURCES/SeriousProton-EE-2022.03.16/src/io/http/websocket.h 2022-09-14 17:02:50.866384537 +0200
|
||||
@@ -4,6 +4,7 @@
|
||||
#include <nonCopyable.h>
|
||||
#include <io/network/tcpSocket.h>
|
||||
#include <unordered_map>
|
||||
+#include <memory>
|
||||
|
||||
|
||||
namespace sp {
|
3
glm.zip
3
glm.zip
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c
|
||||
size 5670692
|
3
meshoptimizer.zip
Normal file
3
meshoptimizer.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b31562e37aa3209fda372a0abd3c2dea3e609679c54f47725b0f8fb1cde7979
|
||||
size 368849
|
21
use_bundled_basis_universal.patch
Normal file
21
use_bundled_basis_universal.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- SeriousProton-EE-2022.03.16/libs/basis_universal/CMakeLists.txt 2022-03-15 23:05:53.000000000 +0100
|
||||
+++ /var/tmp/build-root/openSUSE_Tumbleweed-x86_64//home/abuild/rpmbuild/SOURCES/SeriousProton-EE-2022.03.16/libs/basis_universal/CMakeLists.txt 2022-09-14 16:11:34.683294183 +0200
|
||||
@@ -30,8 +30,10 @@
|
||||
|
||||
if(NOT basis_POPULATED)
|
||||
if(COMMAND FetchContent_Populate)
|
||||
- FetchContent_Populate(basis)
|
||||
endif()
|
||||
+ set(BASIS_BASE_PATH "${EXTERNALS_DIR}")
|
||||
+ set(basis_SOURCE_DIR "${BASIS_BASE_PATH}/basis")
|
||||
+ message("${basis_SOURCE_DIR}/encoder/basisu_backend.cpp")
|
||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
set(BUILD_X64 FALSE CACHE BOOL "")
|
||||
endif()
|
||||
@@ -117,4 +119,4 @@
|
||||
)
|
||||
target_compile_features(basisu-transcoder PUBLIC cxx_std_11)
|
||||
target_include_directories(basisu-transcoder INTERFACE "${basis_SOURCE_DIR}")
|
||||
-endif()
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
+endif()
|
15
use_bundled_meshoptimizer.patch
Normal file
15
use_bundled_meshoptimizer.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- EmptyEpsilon-EE-2022.03.16/CMakeLists.txt 2022-03-16 07:43:41.000000000 +0100
|
||||
+++ /var/tmp/build-root/openSUSE_Tumbleweed-x86_64/home/abuild/rpmbuild/SOURCES/EmptyEpsilon-EE-2022.03.16/CMakeLists.txt 2022-09-14 15:54:47.874043178 +0200
|
||||
@@ -134,8 +134,11 @@
|
||||
|
||||
if(NOT meshoptimizer_POPULATED)
|
||||
if(COMMAND FetchContent_Populate)
|
||||
- FetchContent_Populate(meshoptimizer)
|
||||
endif()
|
||||
+ set(MESHOPTIMIZER_BASE_PATH "${EXTERNALS_DIR}")
|
||||
+ set(meshoptimizer_SOURCE_DIR "${MESHOPTIMIZER_BASE_PATH}/meshoptimizer")
|
||||
+ set(meshoptimizer_BINARY_DIR "${PROJECT_BINARY_DIR}/externals/meshoptimizer")
|
||||
+ message("add_subdirectory(${meshoptimizer_SOURCE_DIR} ${meshoptimizer_BINARY_DIR} EXCLUDE_FROM_ALL)")
|
||||
add_subdirectory(${meshoptimizer_SOURCE_DIR} ${meshoptimizer_BINARY_DIR} EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue
Block a user