Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package RigelEngine for openSUSE:Factory checked in at 2021-10-04 18:40:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/RigelEngine (Old) and /work/SRC/openSUSE:Factory/.RigelEngine.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "RigelEngine" Mon Oct 4 18:40:29 2021 rev:8 rq:922950 version:0.8.1beta Changes: -------- --- /work/SRC/openSUSE:Factory/RigelEngine/RigelEngine.changes 2021-08-24 10:55:47.080248487 +0200 +++ /work/SRC/openSUSE:Factory/.RigelEngine.new.2443/RigelEngine.changes 2021-10-04 18:42:20.806289665 +0200 @@ -1,0 +2,7 @@ +Sun Sep 26 09:30:00 UTC 2021 - Martin Hauke <mar...@gmx.de> + +- Add patches: + * 749.patch (Fix threads not found on Tumbleweed) + * fix-find-boost-program_options.patch + +------------------------------------------------------------------- New: ---- 749.patch fix-find-boost-program_options.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ RigelEngine.spec ++++++ --- /var/tmp/diff_new_pack.AXijAz/_old 2021-10-04 18:42:21.298290464 +0200 +++ /var/tmp/diff_new_pack.AXijAz/_new 2021-10-04 18:42:21.298290464 +0200 @@ -25,6 +25,10 @@ Group: Amusements/Games/Action/Arcade URL: https://github.com/lethal-guitar/RigelEngine Source: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM: 749.patch - Fix "threads" not found on Tumbleweed +Patch0: https://patch-diff.githubusercontent.com/raw/lethal-guitar/RigelEngine/pull/749.patch +# PATCH-FIX-OPENSUSE: fix-find-boost-program_options +Patch1: fix-find-boost-program_options.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.12 BuildRequires: libboost_program_options-devel @@ -47,6 +51,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %if 0%{?sle_version} >= 150100 && 0%{?is_opensuse} ++++++ 749.patch ++++++ >From b3cddf23087754e46fb221e7d67f689e7a0bc86a Mon Sep 17 00:00:00 2001 From: lethal-guitar <lethal_guitar...@web.de> Date: Thu, 30 Sep 2021 14:04:37 +0200 Subject: [PATCH] Fix openSUSE Tumbleweed build According to the CMake docs [1], CMAKE_THREAD_LIBS_INIT may be empty even if threads are available. Therefore, we should use Threads_FOUND instead. This fixes the build on openSUSE Tumbleweed. [1] https://cmake.org/cmake/help/latest/module/FindThreads.html --- cmake/Modules/FindSDL2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/FindSDL2.cmake b/cmake/Modules/FindSDL2.cmake index 5f84690c..2c86179f 100644 --- a/cmake/Modules/FindSDL2.cmake +++ b/cmake/Modules/FindSDL2.cmake @@ -227,7 +227,7 @@ endif() # But for non-OSX systems, I will use the CMake Threads package. if(NOT APPLE AND NOT MSVC) find_package(Threads QUIET) - if(NOT CMAKE_THREAD_LIBS_INIT) + if(NOT Threads_FOUND) set(SDL2_THREADS_NOT_FOUND "Could NOT find Threads (Threads is required by SDL2).") if(SDL2_FIND_REQUIRED) message(FATAL_ERROR ${SDL2_THREADS_NOT_FOUND}) ++++++ fix-find-boost-program_options.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 405533e..084da2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Emscripten") rigel_define_wasm_targets_for_dependencies() else() - set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_LIBS OFF) find_package(Boost 1.65 COMPONENTS program_options) find_package(SDL2 REQUIRED) find_package(SDL2_mixer REQUIRED)
