CVS commit: pkgsrc/games/supertux

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/supertux
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 28 Sep 2025 15:58:14 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Sep 28 15:58:14 UTC 2025

Modified Files:
        pkgsrc/games/supertux: Makefile distinfo
Added Files:
        pkgsrc/games/supertux/patches: patch-CMakeLists.txt
            patch-src_audio_openal__sound__source.hpp
            patch-src_audio_sound__manager.hpp
Removed Files:
        pkgsrc/games/supertux: PLIST.Darwin

Log Message:
supertux: fix build with boost 1.89.0; fix packaging on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/games/supertux/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/games/supertux/PLIST.Darwin
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/supertux/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/supertux/patches/patch-CMakeLists.txt \
    pkgsrc/games/supertux/patches/patch-src_audio_openal__sound__source.hpp \
    pkgsrc/games/supertux/patches/patch-src_audio_sound__manager.hpp

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

Modified files:

Index: pkgsrc/games/supertux/Makefile
diff -u pkgsrc/games/supertux/Makefile:1.64 pkgsrc/games/supertux/Makefile:1.65
--- pkgsrc/games/supertux/Makefile:1.64 Sat Sep 27 09:57:18 2025
+++ pkgsrc/games/supertux/Makefile      Sun Sep 28 15:58:14 2025
@@ -1,43 +1,46 @@
-# $NetBSD: Makefile,v 1.64 2025/09/27 09:57:18 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2025/09/28 15:58:14 adam Exp $
 
-PKGNAME=               supertux-0.6.3
-PKGREVISION=           18
-DISTNAME=              SuperTux-v${PKGVERSION_NOREV}-Source
-CATEGORIES=            games
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=SuperTux/}
-GITHUB_RELEASE=                v${PKGVERSION_NOREV}
-
-MAINTAINER=            hernani%vecirex.net@localhost
-HOMEPAGE=              https://www.supertux.org/
-COMMENT=               2D jump and run game in the style of the Super Mario ones
-LICENSE=               gnu-gpl-v2
+PKGNAME=       supertux-0.6.3
+PKGREVISION=   18
+DISTNAME=      SuperTux-v${PKGVERSION_NOREV}-Source
+CATEGORIES=    games
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=SuperTux/}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
+
+MAINTAINER=    hernani%vecirex.net@localhost
+HOMEPAGE=      https://www.supertux.org/
+COMMENT=       2D jump and run game in the style of the Super Mario ones
+LICENSE=       gnu-gpl-v2
 
-CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUBDIR_BIN=bin
-CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=off
-CMAKE_CONFIGURE_ARGS+= -DBoost_INCLUDE_DIR=${BUILDLINK_DIR}/include/boost
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+USE_CXX_FEATURES=      c++14
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
-USE_LANGUAGES=         c c++14
 
-USE_CXX_FEATURES+=     c++14
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUBDIR_BIN=bin
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBoost_INCLUDE_DIR=${BUILDLINK_DIR}/include/boost
 
 # We already patch 'configure'...
 CHECK_PORTABILITY_SKIP+=       external/SDL_ttf/configure.in
 
-.include "../../devel/cmake/build.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.endif
+
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/physfs/buildlink3.mk"
+.include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glm/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/supertux/distinfo
diff -u pkgsrc/games/supertux/distinfo:1.9 pkgsrc/games/supertux/distinfo:1.10
--- pkgsrc/games/supertux/distinfo:1.9  Tue Aug 19 11:47:25 2025
+++ pkgsrc/games/supertux/distinfo      Sun Sep 28 15:58:14 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2025/08/19 11:47:25 wiz Exp $
+$NetBSD: distinfo,v 1.10 2025/09/28 15:58:14 adam Exp $
 
 BLAKE2s (SuperTux-v0.6.3-Source.tar.gz) = 9a3227e7426b437b3e529654897a95fd52b2c15135ff1ae08957c37704d62d24
 SHA512 (SuperTux-v0.6.3-Source.tar.gz) = c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798
 Size (SuperTux-v0.6.3-Source.tar.gz) = 182065428 bytes
+SHA1 (patch-CMakeLists.txt) = 5eb49b7df01402e08f744121dad4b4c533dbdc8f
 SHA1 (patch-external_SDL__ttf_CMakeLists.txt) = bc16239630b099b92f308497d052ff9352c2b8b7
 SHA1 (patch-external_SDL__ttf_configure) = da5e257847458e0a4410be3b03299062d167d441
 SHA1 (patch-external_partio__zip_zip__manager.hpp) = 9b91692444a55d8a4d3c5c7c82cc591ee52454c3
@@ -10,3 +11,5 @@ SHA1 (patch-external_physfs_src_physfs__
 SHA1 (patch-external_squirrel_CMakeLists.txt) = 5e294e66a85b4bec48f2c28a38aacb543a9ee389
 SHA1 (patch-external_tinygettext_CMakeLists.txt) = 63ee77cfad60ba524a9fbd6076a48f7d5b48034d
 SHA1 (patch-external_tinygettext_include_tinygettext_iconv.hpp) = 4e9cf8c227af45ca2ae149fb18f29a9ad2a31b98
+SHA1 (patch-src_audio_openal__sound__source.hpp) = 03e62244d028b215c4c173e0f71a2f2667065e48
+SHA1 (patch-src_audio_sound__manager.hpp) = 702188e8f2e4e9f0d515a1bc2943ac0dd42d6563

Added files:

Index: pkgsrc/games/supertux/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/games/supertux/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sun Sep 28 15:58:14 2025
+++ pkgsrc/games/supertux/patches/patch-CMakeLists.txt  Sun Sep 28 15:58:14 2025
@@ -0,0 +1,34 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/09/28 15:58:14 adam Exp $
+
+Do not look for boost_system library.
+Fix packaging on Darwin.
+
+--- CMakeLists.txt.orig        2021-12-22 23:01:57.000000000 +0000
++++ CMakeLists.txt
+@@ -39,7 +39,7 @@ project(SUPERTUX)
+ 
+ ### CMake configuration
+ 
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 NEW)
+   cmake_policy(SET CMP0008 NEW)
+@@ -171,7 +171,7 @@ if(ENABLE_BOOST_STATIC_LIBS)
+ else(ENABLE_BOOST_STATIC_LIBS)
+   set(Boost_USE_STATIC_LIBS FALSE)
+ endif(ENABLE_BOOST_STATIC_LIBS)
+-find_package(Boost REQUIRED COMPONENTS filesystem system date_time locale)
++find_package(Boost REQUIRED COMPONENTS filesystem date_time locale)
+ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
+ link_directories(${Boost_LIBRARY_DIRS})
+ 
+@@ -1188,7 +1188,7 @@ configure_file(data/levels/misc/menu.stl
+ include(InstallRequiredSystemLibraries)
+ set(DIRS ${Boost_LIBRARY_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/external/squirrel ${CMAKE_CURRENT_BINARY_DIR}/external/tinygettext)
+ 
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT DISABLE_CPACK_BUNDLING)
++if(FALSE)
+   set(INFOPLIST_CFBUNDLEEXECUTABLE "SuperTux")
+ 
+   find_package(png)
Index: pkgsrc/games/supertux/patches/patch-src_audio_openal__sound__source.hpp
diff -u /dev/null pkgsrc/games/supertux/patches/patch-src_audio_openal__sound__source.hpp:1.1
--- /dev/null   Sun Sep 28 15:58:14 2025
+++ pkgsrc/games/supertux/patches/patch-src_audio_openal__sound__source.hpp     Sun Sep 28 15:58:14 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_audio_openal__sound__source.hpp,v 1.1 2025/09/28 15:58:14 adam Exp $
+
+Fix build on Darwin.
+
+--- src/audio/openal_sound_source.hpp.orig     2025-09-28 15:35:30.674258557 +0000
++++ src/audio/openal_sound_source.hpp
+@@ -17,7 +17,7 @@
+ #ifndef HEADER_SUPERTUX_AUDIO_OPENAL_SOUND_SOURCE_HPP
+ #define HEADER_SUPERTUX_AUDIO_OPENAL_SOUND_SOURCE_HPP
+ 
+-#include <al.h>
++#include <AL/al.h>
+ 
+ #include "audio/sound_source.hpp"
+ 
Index: pkgsrc/games/supertux/patches/patch-src_audio_sound__manager.hpp
diff -u /dev/null pkgsrc/games/supertux/patches/patch-src_audio_sound__manager.hpp:1.1
--- /dev/null   Sun Sep 28 15:58:14 2025
+++ pkgsrc/games/supertux/patches/patch-src_audio_sound__manager.hpp    Sun Sep 28 15:58:14 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_audio_sound__manager.hpp,v 1.1 2025/09/28 15:58:14 adam Exp $
+
+Fix build on Darwin.
+
+--- src/audio/sound_manager.hpp.orig   2025-09-28 15:34:52.973835904 +0000
++++ src/audio/sound_manager.hpp
+@@ -22,8 +22,8 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <al.h>
+-#include <alc.h>
++#include <AL/al.h>
++#include <AL/alc.h>
+ 
+ #include "math/vector.hpp"
+ #include "util/currenton.hpp"

Prev by Date: CVS commit: pkgsrc/devel/at-spi2-core
Next by Date: CVS commit: pkgsrc/graphics/gource/patches
Previous by Thread: CVS commit: pkgsrc/devel/at-spi2-core
Next by Thread: CVS commit: pkgsrc/graphics/gource/patches
Indexes:

Home | Main Index | Thread Index | Old Index