diff --git a/games/solarus/Makefile b/games/solarus/Makefile index 390046d30430..1f287ea7c45e 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -1,47 +1,44 @@ PORTNAME= solarus -PORTVERSION= 1.6.5 +PORTVERSION= 2.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= games MAINTAINER= danilo@FreeBSD.org COMMENT= Zelda-like 2D game engine WWW= https://www.solarus-games.org LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/license.txt +LICENSE_FILE= ${WRKSRC}/license +BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libphysfs.so:devel/physfs \ libmodplug.so:audio/libmodplug \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg RUN_DEPENDS= glm>0:math/glm -BUILD_DEPENDS= glm>0:math/glm -USES= cmake:noninja compiler:c++11-lib gl openal qmake qt:5 sdl xorg +USES= cmake:noninja compiler:c++11-lib gl openal sdl xorg USE_GITLAB= yes GL_ACCOUNT= solarus-games -GL_TAGNAME= 21a378a7858460809ffef1c96a07a493d709730c +GL_TAGNAME= b5d6aefbda31e0f436d25606478c4129504f914f -MAKE_ARGS+= DESTDIR=${STAGEDIR} -USE_QT= buildtools:build core gui linguisttools:build widgets -USE_SDL= sdl2 ttf2 image2 USE_GL= gl glu USE_LDCONFIG= yes +USE_SDL= sdl2 ttf2 image2 CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL # GLM_GTX_matrix_transform_2d is an experimental extension OPTIONS_DEFINE= LUAJIT OPTIONS_DEFAULT_amd64= LUAJIT OPTIONS_DEFAULT_i386= LUAJIT OPTIONS_DEFAULT_powerpc= LUAJIT OPTIONS_DEFAULT_powerpc64= LUAJIT OPTIONS_DEFAULT_powerpc64le= LUAJIT -LUAJIT_CMAKE_BOOL= SOLARUS_USE_LUAJIT LUAJIT_DESC= Use LuaJIT instead of standard Lua LUAJIT_USES= luajit LUAJIT_USES_OFF= lua:51 +LUAJIT_CMAKE_BOOL= SOLARUS_USE_LUAJIT .include diff --git a/games/solarus/distinfo b/games/solarus/distinfo index 364cf51690ee..393d9a4a3eb5 100644 --- a/games/solarus/distinfo +++ b/games/solarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673301511 -SHA256 (solarus-games-solarus-21a378a7858460809ffef1c96a07a493d709730c_GL0.tar.gz) = 28f3b63454a7de6d8fb154dfa1e2e203afeb34db006661329e273137f8fe3dce -SIZE (solarus-games-solarus-21a378a7858460809ffef1c96a07a493d709730c_GL0.tar.gz) = 15015311 +TIMESTAMP = 1745915761 +SHA256 (solarus-games-solarus-b5d6aefbda31e0f436d25606478c4129504f914f_GL0.tar.gz) = d86397e94926d96a7f8ca343122cb40df0614c6fd24717423950055c2b5bd55c +SIZE (solarus-games-solarus-b5d6aefbda31e0f436d25606478c4129504f914f_GL0.tar.gz) = 69945076 diff --git a/games/solarus/files/patch-src_audio_ItDecoder.cpp b/games/solarus/files/patch-src_audio_ItDecoder.cpp deleted file mode 100644 index 15daabcdc6bb..000000000000 --- a/games/solarus/files/patch-src_audio_ItDecoder.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/audio/ItDecoder.cpp.orig 2023-01-09 22:24:56 UTC -+++ src/audio/ItDecoder.cpp -@@ -17,7 +17,7 @@ - #include "solarus/audio/ItDecoder.h" - #include "solarus/core/Debug.h" - #include // These two headers are with the libmodplug ones. --#include -+#include - - namespace Solarus { - diff --git a/games/solarus/pkg-plist b/games/solarus/pkg-plist index c69635fc7753..f32e6a8f54b4 100644 --- a/games/solarus/pkg-plist +++ b/games/solarus/pkg-plist @@ -1,284 +1,251 @@ -bin/solarus-launcher bin/solarus-run include/solarus/audio/ItDecoder.h include/solarus/audio/Music.h +include/solarus/audio/MusicPtr.h +include/solarus/audio/MusicSystem.h include/solarus/audio/OggDecoder.h include/solarus/audio/Sound.h +include/solarus/audio/SoundBuffer.h +include/solarus/audio/SoundPtr.h include/solarus/audio/SpcDecoder.h +include/solarus/containers/FreeList.h include/solarus/containers/Grid.h include/solarus/containers/Quadtree.h include/solarus/containers/Quadtree.inl +include/solarus/containers/VecMap.h 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/Command.h include/solarus/core/CommandsEffects.h include/solarus/core/Common.h +include/solarus/core/Controls.h +include/solarus/core/ControlsDispatcher.h +include/solarus/core/ControlsPtr.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/FRectangle.h +include/solarus/core/FRectangle.inl +include/solarus/core/FlagSet.h +include/solarus/core/FlagSet.inl 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/Joypad.h include/solarus/core/Logger.h include/solarus/core/MainLoop.h include/solarus/core/Map.h include/solarus/core/MapData.h +include/solarus/core/MapPtr.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/Profiler.h 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/SavegamePtr.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 include/solarus/entities/Chest.h include/solarus/entities/CollisionMode.h include/solarus/entities/Crystal.h include/solarus/entities/CrystalBlock.h include/solarus/entities/CustomEntity.h include/solarus/entities/Destination.h include/solarus/entities/Destructible.h include/solarus/entities/Door.h include/solarus/entities/DynamicTile.h include/solarus/entities/Enemy.h include/solarus/entities/EnemyAttack.h 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 include/solarus/entities/EntityTypeInfo.h include/solarus/entities/Explosion.h include/solarus/entities/Fire.h include/solarus/entities/Ground.h include/solarus/entities/GroundInfo.h include/solarus/entities/Hero.h include/solarus/entities/HeroPtr.h include/solarus/entities/Hookshot.h include/solarus/entities/Jumper.h include/solarus/entities/NonAnimatedRegions.h include/solarus/entities/Npc.h include/solarus/entities/ParallaxScrollingTilePattern.h include/solarus/entities/Pickable.h include/solarus/entities/SelfScrollingTilePattern.h include/solarus/entities/Sensor.h include/solarus/entities/Separator.h include/solarus/entities/SeparatorPtr.h include/solarus/entities/ShopTreasure.h include/solarus/entities/SimpleTilePattern.h include/solarus/entities/Stairs.h include/solarus/entities/StartingLocationMode.h include/solarus/entities/Stream.h include/solarus/entities/StreamAction.h include/solarus/entities/Switch.h include/solarus/entities/Teletransporter.h include/solarus/entities/Tile.h include/solarus/entities/TileInfo.h include/solarus/entities/TilePattern.h include/solarus/entities/TilePtr.h include/solarus/entities/Tileset.h include/solarus/entities/TilesetData.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/View.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 -include/solarus/gui/gui_common.h -include/solarus/gui/gui_tools.h -include/solarus/gui/main_window.h -include/solarus/gui/quest_runner.h -include/solarus/gui/quests_item_delegate.h -include/solarus/gui/quests_model.h -include/solarus/gui/quests_view.h -include/solarus/gui/settings.h -include/solarus/gui/ui_about_dialog.h -include/solarus/gui/ui_console.h -include/solarus/gui/ui_main_window.h include/solarus/hero/BackToSolidGroundState.h 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 include/solarus/hero/FrozenState.h include/solarus/hero/GrabbingState.h include/solarus/hero/HeroSprites.h include/solarus/hero/HeroState.h include/solarus/hero/HookshotState.h include/solarus/hero/HurtState.h include/solarus/hero/JumpingState.h include/solarus/hero/LiftingState.h include/solarus/hero/PlayerMovementState.h include/solarus/hero/PlungingState.h include/solarus/hero/PullingState.h include/solarus/hero/PushingState.h include/solarus/hero/RunningState.h include/solarus/hero/SpinAttackState.h include/solarus/hero/StairsState.h include/solarus/hero/SwimmingState.h include/solarus/hero/SwordLoadingState.h include/solarus/hero/SwordSwingingState.h include/solarus/hero/SwordTappingState.h include/solarus/hero/TreasureState.h include/solarus/hero/UsingItemState.h include/solarus/hero/VictoryState.h include/solarus/lua/ExportableToLua.h include/solarus/lua/ExportableToLuaPtr.h +include/solarus/lua/LuaBind.h +include/solarus/lua/LuaBind.inl include/solarus/lua/LuaContext.h include/solarus/lua/LuaData.h include/solarus/lua/LuaException.h include/solarus/lua/LuaTools.h include/solarus/lua/LuaTools.inl include/solarus/lua/ScopedLuaRef.h include/solarus/movements/CircleMovement.h include/solarus/movements/FallingHeight.h include/solarus/movements/FallingOnFloorMovement.h include/solarus/movements/JumpMovement.h include/solarus/movements/Movement.h include/solarus/movements/PathFinding.h include/solarus/movements/PathFindingMovement.h include/solarus/movements/PathMovement.h include/solarus/movements/PixelMovement.h include/solarus/movements/PlayerMovement.h include/solarus/movements/RandomMovement.h include/solarus/movements/RandomPathMovement.h 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 -include/solarus/third_party/snes_spc/SPC_CPU.h -include/solarus/third_party/snes_spc/SPC_DSP.h -include/solarus/third_party/snes_spc/SPC_Filter.h -include/solarus/third_party/snes_spc/blargg_common.h -include/solarus/third_party/snes_spc/blargg_config.h -include/solarus/third_party/snes_spc/blargg_endian.h -include/solarus/third_party/snes_spc/blargg_source.h -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.1.6.5 +include/solarus/third_party/hqx.h +include/solarus/third_party/spc.h lib/libsolarus.so -lib/libsolarus.so.1 -lib/libsolarus.so.1.6.5 -share/man/man6/solarus-launcher.6.gz +lib/libsolarus.so.2 +lib/libsolarus.so.2.0.0 share/man/man6/solarus-run.6.gz -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 -%%DATADIR%%-gui/translations/solarus_es.qm -%%DATADIR%%-gui/translations/solarus_fr.qm +%%DATADIR%%/gamecontrollerdb.txt