[EmptyEpsilon] Cherry-pick the upstream commit enhancing GLM debundling

commit 82bb1db77c658e8a15eec645d1302534724b26ac Author: Michal Schorm <mschorm(a)redhat.com&gt; Date: Wed Jun 30 01:14:22 2021 +0200 Cherry-pick the upstream commit enhancing GLM debundling EmptyEpsilon.spec | 5 ++++- upstream_SP_005_0d1ac45b73.patch | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) --- diff --git a/EmptyEpsilon.spec b/EmptyEpsilon.spec index 297479d..d8f23e5 100644 --- a/EmptyEpsilon.spec +++ b/EmptyEpsilon.spec @@ -42,7 +42,7 @@ Patch60: upstream_SP_001_32509f2db9.patch Patch61: upstream_SP_002_d52a1b1b61.patch Patch62: upstream_SP_003_ec30d87c22.patch Patch63: upstream_SP_004_adbba45fd9.patch - +Patch64: upstream_SP_005_0d1ac45b73.patch Recommends: xclip @@ -70,6 +70,8 @@ Note: Network play require port 35666 UDP and TCP allowed in firewall. %patch61 -p1 -d SeriousProton-EE-%{version} %patch62 -p1 -d SeriousProton-EE-%{version} %patch63 -p1 -d SeriousProton-EE-%{version} +%patch64 -p1 -d SeriousProton-EE-%{version} + %build %cmake3 \ @@ -78,6 +80,7 @@ Note: Network play require port 35666 UDP and TCP allowed in firewall. -DCPACK_PACKAGE_VERSION_MINOR=%{version_minor} \ -DCPACK_PACKAGE_VERSION_PATCH=%{version_patch} \ -DWITH_JSON="system" \ + -DWITH_GLM="system" \ -DCONFIG_DIR=%{_sysconfdir}/emptyepsilon/ diff --git a/upstream_SP_005_0d1ac45b73.patch b/upstream_SP_005_0d1ac45b73.patch new file mode 100644 index 0000000..ffcbed6 --- /dev/null +++ b/upstream_SP_005_0d1ac45b73.patch @@ -0,0 +1,44 @@ +From 0d1ac45b738195db5e2785531db713328f547e60 Mon Sep 17 00:00:00 2001 +From: FaramosCZ <mschorm(a)redhat.com&gt; +Date: Tue, 29 Jun 2021 18:08:36 +0200 +Subject: [PATCH] CMake: Enhance logic around GLM (#133) + +* CMake: Add a status message regarding GLM used (system / bundled) + +* CMake: Introduce logic and variable WITH_GLM to control which GLM version should be used (system / bundled / auto) +--- + CMakeLists.txt | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b96f83..200de46 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -89,8 +89,22 @@ if(NOT ${SFML_FOUND}) + endif() + + +-find_package(glm QUIET) +-if(NOT ${glm_FOUND}) ++# GLM - OpenGL Mathematic library ++SET(WITH_GLM "auto" CACHE STRING "Which GLM to use (possible values are 'bundled', 'system' or 'auto')") ++ ++if(WITH_GLM STREQUAL "system" OR WITH_GLM STREQUAL "auto") ++ find_package(glm QUIET) ++ ++ if(glm_FOUND) ++ message(STATUS "GLM version used: SYSTEM") ++ elseif(WITH_GLM STREQUAL "system") ++ message(FATAL_ERROR "GLM: system package is not found or is unusable") ++ endif() ++endif() ++ ++if(WITH_GLM STREQUAL "bundled" OR (WITH_GLM STREQUAL "auto" AND NOT glm_FOUND)) ++ message(STATUS "GLM version used: BUNDLED") ++ + set(GLM_BASE_PATH "${EXTERNALS_DIR}") + + if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt") +-- +libgit2 1.0.1 +