CVS commit: pkgsrc/games/solarus

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 31 08:07:01 UTC 2025

Modified Files:
        pkgsrc/games/solarus: Makefile distinfo
Added Files:
        pkgsrc/games/solarus/patches: patch-src_audio_ItDecoder.cpp

Log Message:
solarus: fix build

Add include for hicolor-icon-themes.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/games/solarus/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/games/solarus/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/solarus/patches/patch-src_audio_ItDecoder.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/solarus/Makefile
diff -u pkgsrc/games/solarus/Makefile:1.75 pkgsrc/games/solarus/Makefile:1.76
--- pkgsrc/games/solarus/Makefile:1.75  Thu Nov 14 22:19:58 2024
+++ pkgsrc/games/solarus/Makefile       Fri Jan 31 08:07:01 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2024/11/14 22:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2025/01/31 08:07:01 wiz Exp $
 
 VERSION=       1.6.5
 DISTNAME=      solarus-${VERSION}-src
 PKGNAME=       ${DISTNAME:S/-src//1}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=solarus-games/}
 GITLAB_PROJECT=        solarus
@@ -22,6 +22,9 @@ USE_LANGUAGES=        c c++
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
 USE_CXX_FEATURES+=     c++11
+FORCE_CXX_STD=         c++11
+
+CXXFLAGS+=     -DGLM_ENABLE_EXPERIMENTAL
 
 .include "options.mk"
 .include "../../devel/cmake/build.mk"
@@ -37,6 +40,7 @@ BUILDLINK_API_DEPENDS.SDL2_image+=    SDL2_
 .include "../../graphics/SDL2_image/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glm+=    glm>=1.0.0
 .include "../../graphics/glm/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/games/solarus/distinfo
diff -u pkgsrc/games/solarus/distinfo:1.14 pkgsrc/games/solarus/distinfo:1.15
--- pkgsrc/games/solarus/distinfo:1.14  Fri Aug 16 15:35:12 2024
+++ pkgsrc/games/solarus/distinfo       Fri Jan 31 08:07:01 2025
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2024/08/16 15:35:12 bsiegert Exp $
+$NetBSD: distinfo,v 1.15 2025/01/31 08:07:01 wiz Exp $
 
 BLAKE2s (solarus-1.6.5-src.tar.gz) = 81383463cf2f7eac384f28c523aa53d5a50dcc572c45bda7f5a2ba439320fdc6
 SHA512 (solarus-1.6.5-src.tar.gz) = 3fc7473f1b7dd80cbcb0a7a639701f8b12bd40ee918a7853805bd54f877e752b4c31c26828e62248ca4594b3aed41a8c61a16be3b14b293f08d9ba938a723e91
 Size (solarus-1.6.5-src.tar.gz) = 15010899 bytes
-SHA1 (patch-cmake_modules_FindGLM.cmake) = e31842de643ddbef8624b8d8a337ffa24aed7758
-SHA1 (patch-src_audio_ItDecoder.cpp) = 331c4a41680d6ffc0b3605739e5b21ad5b97b6e5
+SHA1 (patch-src_audio_ItDecoder.cpp) = fde61c522b7a2b95a481552fc1fb2d3974f9d633

Added files:

Index: pkgsrc/games/solarus/patches/patch-src_audio_ItDecoder.cpp
diff -u /dev/null pkgsrc/games/solarus/patches/patch-src_audio_ItDecoder.cpp:1.1
--- /dev/null   Fri Jan 31 08:07:02 2025
+++ pkgsrc/games/solarus/patches/patch-src_audio_ItDecoder.cpp  Fri Jan 31 08:07:01 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_audio_ItDecoder.cpp,v 1.1 2025/01/31 08:07:01 wiz Exp $
+
+Make sure to find correct header.
+
+--- src/audio/ItDecoder.cpp.orig       2025-01-31 08:01:28.552555139 +0000
++++ src/audio/ItDecoder.cpp
+@@ -17,7 +17,7 @@
+ #include "solarus/audio/ItDecoder.h"
+ #include "solarus/core/Debug.h"
+ #include <stdafx.h>  // These two headers are with the libmodplug ones.
+-#include <sndfile.h>
++#include <libmodplug/sndfile.h>
+ 
+ namespace Solarus {
+