Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package solarus for openSUSE:Factory checked in at 2025-11-24 14:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solarus (Old) and /work/SRC/openSUSE:Factory/.solarus.new.14147 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solarus" Mon Nov 24 14:10:39 2025 rev:13 rq:1319247 version:1.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/solarus/solarus.changes 2021-04-12 12:39:51.849543618 +0200 +++ /work/SRC/openSUSE:Factory/.solarus.new.14147/solarus.changes 2025-11-24 14:13:10.963348066 +0100 @@ -1,0 +2,8 @@ +Sat Nov 22 12:05:43 UTC 2025 - Antoine Belvire <[email protected]> + +- Add solarus-1.6.5-modplug.patch: Fix build against modplug + (gl#solarus-games/solarus#1947). +- Add solarus-1.6.5-glm.patch: Fix build against GLM, picked from + upstream. + +------------------------------------------------------------------- New: ---- solarus-1.6.5-glm.patch solarus-1.6.5-modplug.patch ----------(New B)---------- New: (gl#solarus-games/solarus#1947). - Add solarus-1.6.5-glm.patch: Fix build against GLM, picked from upstream. New: - Add solarus-1.6.5-modplug.patch: Fix build against modplug (gl#solarus-games/solarus#1947). ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solarus.spec ++++++ --- /var/tmp/diff_new_pack.BuYiWt/_old 2025-11-24 14:13:12.039393391 +0100 +++ /var/tmp/diff_new_pack.BuYiWt/_new 2025-11-24 14:13:12.043393560 +0100 @@ -1,7 +1,7 @@ # # spec file for package solarus # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,10 @@ Source0: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gl#solarus-games/solarus#1539 Patch0: solarus-1.6.5-ldl.patch +# PATCH-FIX-UPSTREAM gl#solarus-games/solarus#1947 +Patch1: solarus-1.6.5-modplug.patch +# PATCH-FIX-UPSTREAM fix build against GLM, picked from upstream +Patch2: solarus-1.6.5-glm.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme ++++++ solarus-1.6.5-glm.patch ++++++ >From 2200e0ccc8e2850d2a265cace96c3f548d988f2d Mon Sep 17 00:00:00 2001 From: Christopho <[email protected]> Date: Fri, 9 Feb 2024 16:21:19 +0100 Subject: [PATCH] Set GLM_ENABLE_EXPERIMENTAL no matter the GLM version We include some gtx headers so I think we always need this flag. --- cmake/modules/FindGLM.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake index 624e242404..4c0d957329 100644 --- a/cmake/modules/FindGLM.cmake +++ b/cmake/modules/FindGLM.cmake @@ -91,10 +91,8 @@ if(GLM_FOUND) set(GLM_INCLUDE_DIRS ${GLM_INCLUDE_DIR}) set(GLM_DEFINITIONS ${PC_GLM_CFLAGS_OTHER}) - # enable GLM experimental extensions for GLM 0.9.9.0 to 0.9.9.3 - if((GLM_VERSION VERSION_EQUAL 0.9.9.0 OR GLM_VERSION VERSION_GREATER 0.9.9.0) AND (GLM_VERSION VERSION_EQUAL 0.9.9.3 OR GLM_VERSION VERSION_LESS 0.9.9.3)) - list(APPEND GLM_DEFINITIONS "-DGLM_ENABLE_EXPERIMENTAL") - endif() + # enable GLM experimental extensions + list(APPEND GLM_DEFINITIONS "-DGLM_ENABLE_EXPERIMENTAL") endif() # create an imported target for GLM -- GitLab ++++++ solarus-1.6.5-modplug.patch ++++++ diff -up solarus/src/audio/ItDecoder.cpp.orig solarus/src/audio/ItDecoder.cpp --- solarus/src/audio/ItDecoder.cpp.orig 2025-11-22 13:09:49.755590544 +0100 +++ solarus/src/audio/ItDecoder.cpp 2025-11-22 13:10:08.079480570 +0100 @@ -16,6 +16,7 @@ */ #include "solarus/audio/ItDecoder.h" #include "solarus/core/Debug.h" +#include <cstdint> #include <stdafx.h> // These two headers are with the libmodplug ones. #include <sndfile.h>
