pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/58292: update games/solarus
>Number: 58292
>Category: pkg
>Synopsis: update games/solarus
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Mon May 27 23:15:00 +0000 2024
>Originator: Malte Dehling
>Release: NetBSD 10.0
>Organization:
>Environment:
NetBSD 10.0 (GENERIC) #4: Wed Apr 24 12:21:26 PDT 2024
mdehling@nb-base-dev:/scratch/obj/sys/arch/amd64/compile/GENERIC amd64
>Description:
Update games/solarus from v1.5.1 -> v1.6.5
cmake/modules/FindLuaJIT.cmake was updated to find LuaJIT v2.1, so
this should be done before updating lang/LuaJIT2
>How-To-Repeat:
>Fix:
? games/solarus/patches
(added below)
Index: games/solarus/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/solarus/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- games/solarus/Makefile 6 Apr 2024 08:05:38 -0000 1.70
+++ games/solarus/Makefile 27 May 2024 22:21:59 -0000
@@ -1,11 +1,12 @@
# $NetBSD: Makefile,v 1.70 2024/04/06 08:05:38 wiz Exp $
-VERSION= 1.5.1
+VERSION= 1.6.5
DISTNAME= solarus-${VERSION}-src
PKGNAME= ${DISTNAME:S/-src//1}
-PKGREVISION= 46
CATEGORIES= games
-MASTER_SITES= http://www.solarus-games.org/downloads/solarus/
+MASTER_SITES= ${MASTER_SITE_GITLAB:=solarus-games/}
+GITLAB_PROJECT= solarus
+GITLAB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.solarus-games.org/solarus/
@@ -14,8 +15,7 @@
TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-WRKSRC= ${WRKDIR}/solarus-${VERSION}
-USE_CMAKE= yes
+WRKSRC= ${WRKDIR}/${GITLAB_PROJECT}-${GITLAB_TAG}
USE_LANGUAGES= c c++
LDFLAGS.SunOS+= -lsocket -lnsl
@@ -23,17 +23,20 @@
USE_CXX_FEATURES+= c++11
.include "options.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../devel/physfs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../audio/libmodplug/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
+BUILDLINK_API_DEPENDS.SDL2+= SDL2>=2.0.14
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/physfs/buildlink3.mk"
BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12
.include "../../fonts/SDL2_ttf/buildlink3.mk"
BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0
.include "../../graphics/SDL2_image/buildlink3.mk"
-BUILDLINK_API_DEPENDS.SDL2+= SDL2>=2.0.1
-.include "../../devel/SDL2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glm+= glm>=1.0.0
+.include "../../graphics/glm/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: games/solarus/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/games/solarus/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- games/solarus/PLIST 11 Jan 2017 23:42:56 -0000 1.3
+++ games/solarus/PLIST 27 May 2024 22:21:59 -0000
@@ -1,60 +1,79 @@
-@comment $NetBSD: PLIST,v 1.3 2017/01/11 23:42:56 rodent Exp $
-bin/solarus
+@comment $NetBSD$
+bin/solarus-launcher
bin/solarus-run
-include/solarus/Ability.h
-include/solarus/AbilityInfo.h
-include/solarus/Arguments.h
-include/solarus/CommandsEffects.h
-include/solarus/Common.h
-include/solarus/CurrentQuest.h
-include/solarus/Dialog.h
-include/solarus/DialogBoxSystem.h
-include/solarus/DialogResources.h
-include/solarus/Drawable.h
-include/solarus/DrawablePtr.h
-include/solarus/EntityData.h
-include/solarus/EnumInfo.h
-include/solarus/EnumInfo.inl
-include/solarus/Equipment.h
-include/solarus/EquipmentItem.h
-include/solarus/EquipmentItemUsage.h
-include/solarus/Game.h
-include/solarus/GameCommand.h
-include/solarus/GameCommands.h
-include/solarus/MainLoop.h
-include/solarus/Map.h
-include/solarus/MapData.h
-include/solarus/QuestProperties.h
-include/solarus/QuestResources.h
-include/solarus/ResourceType.h
-include/solarus/Savegame.h
-include/solarus/SavegameConverterV1.h
-include/solarus/Settings.h
-include/solarus/SolarusFatal.h
-include/solarus/Sprite.h
-include/solarus/SpriteAnimation.h
-include/solarus/SpriteAnimationDirection.h
-include/solarus/SpriteAnimationSet.h
-include/solarus/SpriteData.h
-include/solarus/SpritePtr.h
-include/solarus/StringResources.h
-include/solarus/Timer.h
-include/solarus/TimerPtr.h
-include/solarus/Transition.h
-include/solarus/TransitionFade.h
-include/solarus/TransitionImmediate.h
-include/solarus/TransitionScrolling.h
-include/solarus/Treasure.h
-include/solarus/config.h
-include/solarus/config.h.in
+include/solarus/audio/ItDecoder.h
+include/solarus/audio/Music.h
+include/solarus/audio/OggDecoder.h
+include/solarus/audio/Sound.h
+include/solarus/audio/SpcDecoder.h
include/solarus/containers/Grid.h
include/solarus/containers/Quadtree.h
include/solarus/containers/Quadtree.inl
+include/solarus/core/Ability.h
+include/solarus/core/AbilityInfo.h
+include/solarus/core/AndroidConfig.h
+include/solarus/core/AppleInterface.h
+include/solarus/core/Arguments.h
+include/solarus/core/CommandsEffects.h
+include/solarus/core/Common.h
+include/solarus/core/CurrentQuest.h
+include/solarus/core/Debug.h
+include/solarus/core/Dialog.h
+include/solarus/core/DialogBoxSystem.h
+include/solarus/core/DialogResources.h
+include/solarus/core/EnumInfo.h
+include/solarus/core/EnumInfo.inl
+include/solarus/core/Equipment.h
+include/solarus/core/EquipmentItem.h
+include/solarus/core/EquipmentItemUsage.h
+include/solarus/core/FontResource.h
+include/solarus/core/Game.h
+include/solarus/core/GameCommand.h
+include/solarus/core/GameCommands.h
+include/solarus/core/Geometry.h
+include/solarus/core/InputEvent.h
+include/solarus/core/Logger.h
+include/solarus/core/MainLoop.h
+include/solarus/core/Map.h
+include/solarus/core/MapData.h
+include/solarus/core/PerfCounter.h
+include/solarus/core/PerfCounter.inl
+include/solarus/core/PixelBits.h
+include/solarus/core/Point.h
+include/solarus/core/Point.inl
+include/solarus/core/QuestDatabase.h
+include/solarus/core/QuestFiles.h
+include/solarus/core/QuestProperties.h
+include/solarus/core/Random.h
+include/solarus/core/Rectangle.h
+include/solarus/core/Rectangle.inl
+include/solarus/core/ResourceProvider.h
+include/solarus/core/ResourceType.h
+include/solarus/core/Savegame.h
+include/solarus/core/SavegameConverterV1.h
+include/solarus/core/Scale.h
+include/solarus/core/Scale.inl
+include/solarus/core/Settings.h
+include/solarus/core/Size.h
+include/solarus/core/Size.inl
+include/solarus/core/SolarusFatal.h
+include/solarus/core/String.h
+include/solarus/core/StringResources.h
+include/solarus/core/System.h
+include/solarus/core/Timer.h
+include/solarus/core/TimerPtr.h
+include/solarus/core/Transform.h
+include/solarus/core/Transform.inl
+include/solarus/core/Treasure.h
+include/solarus/core/config.h
+include/solarus/core/config.h.in
include/solarus/entities/AnimatedTilePattern.h
include/solarus/entities/Arrow.h
include/solarus/entities/Block.h
include/solarus/entities/Bomb.h
include/solarus/entities/Boomerang.h
+include/solarus/entities/BorderKind.h
+include/solarus/entities/BorderSet.h
include/solarus/entities/Camera.h
include/solarus/entities/CameraPtr.h
include/solarus/entities/CarriedObject.h
@@ -72,6 +91,7 @@
include/solarus/entities/EnemyReaction.h
include/solarus/entities/Entities.h
include/solarus/entities/Entity.h
+include/solarus/entities/EntityData.h
include/solarus/entities/EntityPtr.h
include/solarus/entities/EntityState.h
include/solarus/entities/EntityType.h
@@ -106,8 +126,52 @@
include/solarus/entities/TilePtr.h
include/solarus/entities/Tileset.h
include/solarus/entities/TilesetData.h
-include/solarus/entities/TimeScrollingTilePattern.h
+include/solarus/entities/TraversableInfo.h
include/solarus/entities/Wall.h
+include/solarus/graphics/BlendMode.h
+include/solarus/graphics/BlendModeInfo.h
+include/solarus/graphics/Color.h
+include/solarus/graphics/Color.inl
+include/solarus/graphics/DefaultShaders.h
+include/solarus/graphics/DrawProxies.h
+include/solarus/graphics/Drawable.h
+include/solarus/graphics/DrawablePtr.h
+include/solarus/graphics/Hq2xFilter.h
+include/solarus/graphics/Hq3xFilter.h
+include/solarus/graphics/Hq4xFilter.h
+include/solarus/graphics/Renderer.h
+include/solarus/graphics/SDLPtrs.h
+include/solarus/graphics/Scale2xFilter.h
+include/solarus/graphics/Shader.h
+include/solarus/graphics/ShaderData.h
+include/solarus/graphics/ShaderPtr.h
+include/solarus/graphics/SoftwarePixelFilter.h
+include/solarus/graphics/SoftwareVideoMode.h
+include/solarus/graphics/SolarusGl.h
+include/solarus/graphics/Sprite.h
+include/solarus/graphics/SpriteAnimation.h
+include/solarus/graphics/SpriteAnimationDirection.h
+include/solarus/graphics/SpriteAnimationSet.h
+include/solarus/graphics/SpriteData.h
+include/solarus/graphics/SpritePtr.h
+include/solarus/graphics/Surface.h
+include/solarus/graphics/SurfaceImpl.h
+include/solarus/graphics/SurfacePtr.h
+include/solarus/graphics/TextSurface.h
+include/solarus/graphics/Transition.h
+include/solarus/graphics/TransitionFade.h
+include/solarus/graphics/TransitionImmediate.h
+include/solarus/graphics/TransitionScrolling.h
+include/solarus/graphics/VertexArray.h
+include/solarus/graphics/VertexArrayPtr.h
+include/solarus/graphics/Video.h
+include/solarus/graphics/glrenderer/GlRenderer.h
+include/solarus/graphics/glrenderer/GlShader.h
+include/solarus/graphics/glrenderer/GlTexture.h
+include/solarus/graphics/quest_icon.h
+include/solarus/graphics/sdlrenderer/SDLRenderer.h
+include/solarus/graphics/sdlrenderer/SDLShader.h
+include/solarus/graphics/sdlrenderer/SDLSurfaceImpl.h
include/solarus/gui/about_dialog.h
include/solarus/gui/console.h
include/solarus/gui/console_line_edit.h
@@ -126,6 +190,7 @@
include/solarus/hero/BoomerangState.h
include/solarus/hero/BowState.h
include/solarus/hero/CarryingState.h
+include/solarus/hero/CustomState.h
include/solarus/hero/FallingState.h
include/solarus/hero/ForcedWalkingState.h
include/solarus/hero/FreeState.h
@@ -151,47 +216,6 @@
include/solarus/hero/TreasureState.h
include/solarus/hero/UsingItemState.h
include/solarus/hero/VictoryState.h
-include/solarus/lowlevel/BlendMode.h
-include/solarus/lowlevel/BlendModeInfo.h
-include/solarus/lowlevel/Color.h
-include/solarus/lowlevel/Color.inl
-include/solarus/lowlevel/Debug.h
-include/solarus/lowlevel/FontResource.h
-include/solarus/lowlevel/Geometry.h
-include/solarus/lowlevel/Hq2xFilter.h
-include/solarus/lowlevel/Hq3xFilter.h
-include/solarus/lowlevel/Hq4xFilter.h
-include/solarus/lowlevel/InputEvent.h
-include/solarus/lowlevel/ItDecoder.h
-include/solarus/lowlevel/Logger.h
-include/solarus/lowlevel/Music.h
-include/solarus/lowlevel/OggDecoder.h
-include/solarus/lowlevel/PixelBits.h
-include/solarus/lowlevel/PixelFilter.h
-include/solarus/lowlevel/Point.h
-include/solarus/lowlevel/Point.inl
-include/solarus/lowlevel/QuestFiles.h
-include/solarus/lowlevel/Random.h
-include/solarus/lowlevel/Rectangle.h
-include/solarus/lowlevel/Rectangle.inl
-include/solarus/lowlevel/Scale2xFilter.h
-include/solarus/lowlevel/Size.h
-include/solarus/lowlevel/Size.inl
-include/solarus/lowlevel/Sound.h
-include/solarus/lowlevel/SpcDecoder.h
-include/solarus/lowlevel/String.h
-include/solarus/lowlevel/Surface.h
-include/solarus/lowlevel/SurfacePtr.h
-include/solarus/lowlevel/System.h
-include/solarus/lowlevel/TextSurface.h
-include/solarus/lowlevel/Video.h
-include/solarus/lowlevel/VideoMode.h
-include/solarus/lowlevel/apple/AppleInterface.h
-include/solarus/lowlevel/shaders/GLContext.h
-include/solarus/lowlevel/shaders/GL_2DShader.h
-include/solarus/lowlevel/shaders/GL_ARBShader.h
-include/solarus/lowlevel/shaders/Shader.h
-include/solarus/lowlevel/shaders/ShaderContext.h
include/solarus/lua/ExportableToLua.h
include/solarus/lua/ExportableToLuaPtr.h
include/solarus/lua/LuaContext.h
@@ -215,6 +239,8 @@
include/solarus/movements/RelativeMovement.h
include/solarus/movements/StraightMovement.h
include/solarus/movements/TargetMovement.h
+include/solarus/third_party/KHR/khrplatform.h
+include/solarus/third_party/glad/glad.h
include/solarus/third_party/hqx/common.h
include/solarus/third_party/hqx/hqx.h
include/solarus/third_party/snes_spc/SNES_SPC.h
@@ -228,6 +254,32 @@
include/solarus/third_party/snes_spc/dsp.h
include/solarus/third_party/snes_spc/spc.h
lib/libsolarus-gui.so
+lib/libsolarus-gui.so.1
+lib/libsolarus-gui.so.${PKGVERSION}
lib/libsolarus.so
lib/libsolarus.so.1
lib/libsolarus.so.${PKGVERSION}
+man/man6/solarus-launcher.6
+man/man6/solarus-run.6
+share/applications/org.solarus_games.solarus.Launcher.desktop
+share/icons/hicolor/16x16/apps/org.solarus_games.solarus.Launcher.png
+share/icons/hicolor/16x16/apps/org.solarus_games.solarus.Runner.png
+share/icons/hicolor/20x20/apps/org.solarus_games.solarus.Launcher.png
+share/icons/hicolor/20x20/apps/org.solarus_games.solarus.Runner.png
+share/icons/hicolor/24x24/apps/org.solarus_games.solarus.Launcher.png
+share/icons/hicolor/24x24/apps/org.solarus_games.solarus.Runner.png
+share/icons/hicolor/32x32/apps/org.solarus_games.solarus.Launcher.png
+share/icons/hicolor/32x32/apps/org.solarus_games.solarus.Runner.png
+share/icons/hicolor/40x40/apps/org.solarus_games.solarus.Launcher.png
+share/icons/hicolor/40x40/apps/org.solarus_games.solarus.Runner.png
+share/icons/hicolor/48x48/apps/org.solarus_games.solarus.Launcher.png
+share/icons/hicolor/48x48/apps/org.solarus_games.solarus.Runner.png
+share/icons/hicolor/scalable/apps/org.solarus_games.solarus.Launcher.svg
+share/icons/hicolor/scalable/apps/org.solarus_games.solarus.Runner.svg
+share/icons/hicolor/symbolic/apps/org.solarus_games.solarus.Launcher-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.solarus_games.solarus.Runner-symbolic.svg
+share/metainfo/org.solarus_games.solarus.appdata.xml
+share/pixmaps/org.solarus_games.solarus.Launcher.png
+share/pixmaps/org.solarus_games.solarus.Runner.png
+share/solarus-gui/translations/solarus_es.qm
+share/solarus-gui/translations/solarus_fr.qm
Index: games/solarus/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/solarus/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- games/solarus/distinfo 26 Oct 2021 10:44:25 -0000 1.13
+++ games/solarus/distinfo 27 May 2024 22:21:59 -0000
@@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.13 2021/10/26 10:44:25 nia Exp $
-BLAKE2s (solarus-1.5.1-src.tar.gz) =
daa243ebf19751d7d92912df4484bda493db23d65ec679250303a9ddba94e0fa
-SHA512 (solarus-1.5.1-src.tar.gz) =
fa308d5cecad313e9d263175da50e27ea9b41c2120a5b2df1a2fb0f503c325e27a1df46a3926ef45e05cf7add671f212138bf90644ff485a4bf0da6870e6095a
-Size (solarus-1.5.1-src.tar.gz) = 2273607 bytes
+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) =
f5fc252f61799acb4386923a4c59a3465d4b201d
+SHA1 (patch-src_audio_ItDecoder.cpp) = 38ed8a94173ed94c56862d4d20f5030628cc2c1f
--- /dev/null 2023-08-07 13:35:14.658748930 -0700
+++ games/solarus/patches/patch-cmake_modules_FindGLM.cmake
2024-05-24 16:01:46.135877340 -0700
@@ -0,0 +1,17 @@
+$NetBSD$
+
+- enable GLM experimental extension
+
+--- cmake/modules/FindGLM.cmake.orig 2024-05-24 22:59:16.413384099 +0000
++++ cmake/modules/FindGLM.cmake
+@@ -91,8 +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))
++ # enable GLM experimental extensions for GLM >= 1.0.0
++ if(GLM_VERSION VERSION_EQUAL 1.0.0 OR GLM_VERSION VERSION_GREATER 1.0.0)
+ list(APPEND GLM_DEFINITIONS "-DGLM_ENABLE_EXPERIMENTAL")
+ endif()
+ endif()
--- /dev/null 2023-08-07 13:35:14.658748930 -0700
+++ games/solarus/patches/patch-src_audio_ItDecoder.cpp 2024-05-24
15:32:47.468451771 -0700
@@ -0,0 +1,15 @@
+$NetBSD$
+
+- include the correct sndfile.h
+
+--- src/audio/ItDecoder.cpp.orig 2024-05-24 22:20:18.810471063 +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 {
+
--
Malte Dehling
Home |
Main Index |
Thread Index |
Old Index