9:31 a.m.
commit 693f54757b390aaf000d8382a27af641765d798b
Author: Michal Schorm <mschorm(a)redhat.com>
Date: Sun Aug 11 11:27:21 2024 +0200
Rebase to 2024.08.09
.gitignore | 3 +++
EmptyEpsilon-avoid_basis_libs_downloading.patch | 8 +++---
EmptyEpsilon-avoid_glm_libs_downloading.patch | 4 +--
EmptyEpsilon.spec | 35 ++++++++++++++-----------
sources | 6 ++---
5 files changed, 31 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61eb2d0..a9deaa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
/basis_universal-1_15_update2.tar.gz
/glm-0.9.9.8.tar.gz
/meshoptimizer-0.16.tar.gz
+/EmptyEpsilon-EE-2024.08.09.tar.gz
+/SeriousProton-EE-2024.08.09.tar.gz
+/0.9.9.8.tar.gz
diff --git a/EmptyEpsilon-avoid_basis_libs_downloading.patch
b/EmptyEpsilon-avoid_basis_libs_downloading.patch
index 3391b01..5a1f944 100644
--- a/EmptyEpsilon-avoid_basis_libs_downloading.patch
+++ b/EmptyEpsilon-avoid_basis_libs_downloading.patch
@@ -1,5 +1,5 @@
---- a/SeriousProton-EE-2023.06.12PR/libs/basis_universal/CMakeLists.orig.txt 2023-06-09
10:35:14.000000000 +0200
-+++ b/SeriousProton-EE-2023.06.12PR/libs/basis_universal/CMakeLists.txt 2024-03-10
19:04:39.372885921 +0100
+--- a/SeriousProton-EE-2024.08.09/libs/basis_universal/CMakeLists.orig.txt 2023-06-09
10:35:14.000000000 +0200
++++ b/SeriousProton-EE-2024.08.09/libs/basis_universal/CMakeLists.txt 2024-03-10
19:04:39.372885921 +0100
@@ -3,35 +3,8 @@
find_package(Threads REQUIRED)
@@ -43,8 +43,8 @@
target_include_directories(basisu-transcoder INTERFACE
"${basis_SOURCE_DIR}")
-endif()
\ No newline at end of file
---- a/SeriousProton-EE-2023.06.12PR/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000
+0200
-+++ b/SeriousProton-EE-2023.06.12PR/CMakeLists.txt 2024-03-10 20:05:58.833718666 +0100
+--- a/SeriousProton-EE-2024.08.09/CMakeLists.orig.txt 2023-06-09 10:35:14.000000000
+0200
++++ b/SeriousProton-EE-2024.08.09/CMakeLists.txt 2024-03-10 20:05:58.833718666 +0100
@@ -132,7 +132,7 @@
endif()
diff --git a/EmptyEpsilon-avoid_glm_libs_downloading.patch
b/EmptyEpsilon-avoid_glm_libs_downloading.patch
index 67b58cb..dc68bd8 100644
--- a/EmptyEpsilon-avoid_glm_libs_downloading.patch
+++ b/EmptyEpsilon-avoid_glm_libs_downloading.patch
@@ -1,5 +1,5 @@
---- a/SeriousProton-EE-2023.06.12PR/CMakeLists.txt.backup_basis 2023-06-09
10:35:14.000000000 +0200
-+++ b/SeriousProton-EE-2023.06.12PR/CMakeLists.txt 2024-03-12 18:50:31.811860098 +0100
+--- a/SeriousProton-EE-2024.08.09/CMakeLists.txt.backup_basis 2023-06-09
10:35:14.000000000 +0200
++++ b/SeriousProton-EE-2024.08.09/CMakeLists.txt 2024-03-12 18:50:31.811860098 +0100
@@ -55,23 +55,8 @@
# * 'auto', if we failed to find a suitable system package,
# * 'bundled'
diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec
index e063238..fa8e43f 100644
--- a/EmptyEpsilon.spec
+++ b/EmptyEpsilon.spec
@@ -1,11 +1,11 @@
-%global version_major 2023
-%global version_minor 06
-%global version_patch 17
+%global version_major 2024
+%global version_minor 08
+%global version_patch 09
Name: EmptyEpsilon
Summary: Spaceship bridge simulator game
Version: %{version_major}.%{version_minor}.%{version_patch}
-Release: 2%{?dist}
+Release: 1%{?dist}
# Apache-2.0, BSD-3-Clause and Zlib are used in basis_universal
# MIT is used by meshoptimizer and GLM
License: GPL-2.0-only AND Apache-2.0 AND BSD-3-Clause AND Zlib AND MIT
@@ -25,14 +25,14 @@ ExcludeArch: %{power64}
URL: http://emptyepsilon.org/
Source0:
https://github.com/daid/EmptyEpsilon/archive/EE-%{version}/EmptyEpsilon-E...
-Source1:
https://github.com/daid/SeriousProton/archive/EE-2023.06.12/SeriousProton...
+Source1:
https://github.com/daid/SeriousProton/archive/EE-%{version}/SeriousProton...
# Upstream wants to download following libraries; we need to bundle them
Source2:
https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v1_15_up...
Source3:
https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.16/meshoptimiz...
# EmptyEpsilon is not compatible with GLM-1.0.1 yet
-Source4:
https://github.com/g-truc/glm/archive/refs/tags/0.9.9.8.tar.gz/glm-0.9.9....
+Source4: https://github.com/g-truc/glm/archive/refs/tags/0.9.9.8.tar.gz
Patch0: EmptyEpsilon-avoid_basis_libs_downloading.patch
Patch1: EmptyEpsilon-avoid_meshoptimizer_libs_downloading.patch
@@ -58,7 +58,7 @@ Note: Network play require port 35666 UDP and TCP allowed in firewall.
%if 0%{?fedora} > 40
%patch -P 2 -p1 -b .backup_glm
%endif
-pushd SeriousProton-EE-2023.06.12PR/libs/basis_universal
+pushd SeriousProton-EE-%{version}/libs/basis_universal
tar -xf %{SOURCE2}
mv basis_universal-1_15_update2 basis
mv basis/LICENSE basis/basis-LICENSE
@@ -71,7 +71,7 @@ popd
tar -xf %{SOURCE4}
mv glm-0.9.9.8 glm
mv glm/copying.txt glm/glm-copying.txt
-mv glm SeriousProton-EE-2023.06.12PR/
+mv glm SeriousProton-EE-%{version}/
%endif
# meshoptimizer
@@ -82,17 +82,17 @@ mv meshoptimizer/LICENSE.md meshoptimizer/meshoptimizer-LICENSE.md
%build
%global __cmake_in_source_build 1
-pushd SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis
+pushd SeriousProton-EE-%{version}/libs/basis_universal/basis
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
-%cmake
+%cmake
%cmake_build
popd
-export CXXFLAGS="%{optflags}
-I../SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis"
-export LDFLAGS="%{__global_ldflags}
-L../SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis"
+export CXXFLAGS="%{optflags}
-I../SeriousProton-EE-%{version}/libs/basis_universal/basis"
+export LDFLAGS="%{__global_ldflags}
-L../SeriousProton-EE-%{version}/libs/basis_universal/basis"
%cmake \
- -DSERIOUS_PROTON_DIR=SeriousProton-EE-2023.06.12PR/ \
+ -DSERIOUS_PROTON_DIR=SeriousProton-EE-%{version}/ \
-DCPACK_PACKAGE_VERSION_MAJOR=%{version_major} \
-DCPACK_PACKAGE_VERSION_MINOR=%{version_minor} \
-DCPACK_PACKAGE_VERSION_PATCH=%{version_patch} \
@@ -134,9 +134,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{name}.desktop
%files
%license LICENSE meshoptimizer/meshoptimizer-LICENSE.md
-%license SeriousProton-EE-2023.06.12PR/libs/basis_universal/basis/basis-LICENSE
+%license SeriousProton-EE-%{version}/libs/basis_universal/basis/basis-LICENSE
%if 0%{?fedora} > 40
-%license SeriousProton-EE-2023.06.12PR/glm/glm-copying.txt
+%license SeriousProton-EE-%{version}/glm/glm-copying.txt
%endif
%{_bindir}/%{name}
%{_datadir}/emptyepsilon
@@ -146,6 +146,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{name}.desktop
%{_docdir}/EmptyEpsilon/
%changelog
+* Sun Aug 11 2024 Michal Schorm <mschorm(a)redhat.com> - 2024.08.09-1
+- Rebase to 2024.08.09
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
2023.06.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
@@ -156,7 +159,7 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{name}.desktop
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Aug 11 2023 Leigh Scott <leigh123linux(a)gmail.com> - 2021.06.23-6
-- Build bundled libjson11 as a static lib
+- Build bundled libjson11 as a static lib
* Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
2021.06.23-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index c249817..fb53218 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (EmptyEpsilon-EE-2023.06.17.tar.gz) =
d03740f5ed59cf0b8e111eb907ea56a6a92076816808a1289352ddc158d28faa692f5a164d23449ff37570adde2552d7f92a7d30caf8584bfdae03c83766872c
-SHA512 (SeriousProton-EE-2023.06.12PR.tar.gz) =
1152fd1246e524ac0f34ad59cc00016e98b20ec8c6ff3634ee0b75b708c944d8e8aa46c456720036d5c12927e5e42a7231dcd14fee9f388061bf2398beb80fc7
+SHA512 (EmptyEpsilon-EE-2024.08.09.tar.gz) =
06f2845f0fae506508f923d3f401ba1f4525b6b85fe95c9fda2673102b7c5f179815afcfa677eb06601b6d3150ca97148cfbeb0256c373648c028429e822cc42
+SHA512 (SeriousProton-EE-2024.08.09.tar.gz) =
510848573e1784e6b627b70635dea713e81fbb65d3504c01101f815e2619b1fef23a232347678d7568455d9352fdce78f39a022471ac931fb4142eac707ad330
SHA512 (basis_universal-1_15_update2.tar.gz) =
a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32
-SHA512 (glm-0.9.9.8.tar.gz) =
9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
+SHA512 (0.9.9.8.tar.gz) =
9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8
SHA512 (meshoptimizer-0.16.tar.gz) =
cc6d28359fb99a615e1046a4af1b247cbc6ea0266d9e7f41ea0516c1fc09fa1e67376071daf138a126c77bca3baf9d565636ed0e3adf045f1a08498c38b7a7e7