diff options
| -rw-r--r-- | games/solarus/Makefile | 10 | ||||
| -rw-r--r-- | games/solarus/PLIST | 62 | ||||
| -rw-r--r-- | games/solarus/distinfo | 11 | ||||
| -rw-r--r-- | games/solarus/patches/patch-include_solarus_EntityData.h | 16 |
4 files changed, 56 insertions, 43 deletions
diff --git a/games/solarus/Makefile b/games/solarus/Makefile index 8e475746e2d..8f95df8c0e5 100644 --- a/games/solarus/Makefile +++ b/games/solarus/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2016/07/16 00:03:36 markd Exp $ +# $NetBSD: Makefile,v 1.21 2017/01/11 23:42:56 rodent Exp $ -VERSION= 1.4.2 +VERSION= 1.5.1 DISTNAME= solarus-${VERSION}-src PKGNAME= ${DISTNAME:S/-src//1} -PKGREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.solarus-games.org/downloads/solarus/ @@ -21,9 +20,8 @@ USE_LANGUAGES= c c++ GCC_REQD+= 4.8 LDFLAGS.SunOS+= -lsocket -lnsl -pre-install: - rm ${WRKSRC}/include/solarus/EntityData.h.orig - +.include "../../x11/qt5-qttools/buildlink3.mk" +.include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../devel/physfs/buildlink3.mk" .include "../../lang/LuaJIT2/buildlink3.mk" LUA_VERSIONS_ACCEPTED= 51 diff --git a/games/solarus/PLIST b/games/solarus/PLIST index aa082ad9aaa..d6fe7ea433a 100644 --- a/games/solarus/PLIST +++ b/games/solarus/PLIST @@ -1,27 +1,29 @@ -@comment $NetBSD: PLIST,v 1.2 2015/07/01 23:06:59 rodent Exp $ -bin/solarus_run +@comment $NetBSD: PLIST,v 1.3 2017/01/11 23:42:56 rodent Exp $ +bin/solarus +bin/solarus-run include/solarus/Ability.h include/solarus/AbilityInfo.h include/solarus/Arguments.h -include/solarus/Camera.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/KeysEffect.h include/solarus/MainLoop.h include/solarus/Map.h include/solarus/MapData.h -include/solarus/MapLoader.h include/solarus/QuestProperties.h include/solarus/QuestResources.h include/solarus/ResourceType.h @@ -46,12 +48,16 @@ include/solarus/Treasure.h include/solarus/config.h include/solarus/config.h.in include/solarus/containers/Grid.h +include/solarus/containers/Quadtree.h +include/solarus/containers/Quadtree.inl 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/CarriedItem.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 @@ -59,12 +65,15 @@ include/solarus/entities/CrystalBlock.h include/solarus/entities/CustomEntity.h include/solarus/entities/Destination.h include/solarus/entities/Destructible.h -include/solarus/entities/Detector.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/EntityPtr.h +include/solarus/entities/EntityState.h include/solarus/entities/EntityType.h include/solarus/entities/EntityTypeInfo.h include/solarus/entities/Explosion.h @@ -72,12 +81,9 @@ 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/Layer.h -include/solarus/entities/MapEntities.h -include/solarus/entities/MapEntity.h -include/solarus/entities/MapEntityPtr.h include/solarus/entities/NonAnimatedRegions.h include/solarus/entities/Npc.h include/solarus/entities/ParallaxScrollingTilePattern.h @@ -85,20 +91,37 @@ 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/TimeScrollingTilePattern.h include/solarus/entities/Wall.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 @@ -106,9 +129,10 @@ include/solarus/hero/CarryingState.h include/solarus/hero/FallingState.h include/solarus/hero/ForcedWalkingState.h include/solarus/hero/FreeState.h -include/solarus/hero/FreezedState.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 @@ -120,7 +144,6 @@ include/solarus/hero/PushingState.h include/solarus/hero/RunningState.h include/solarus/hero/SpinAttackState.h include/solarus/hero/StairsState.h -include/solarus/hero/State.h include/solarus/hero/SwimmingState.h include/solarus/hero/SwordLoadingState.h include/solarus/hero/SwordSwingingState.h @@ -128,7 +151,10 @@ include/solarus/hero/SwordTappingState.h 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 @@ -137,8 +163,9 @@ 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/Output.h +include/solarus/lowlevel/OggDecoder.h include/solarus/lowlevel/PixelBits.h include/solarus/lowlevel/PixelFilter.h include/solarus/lowlevel/Point.h @@ -146,11 +173,13 @@ 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 @@ -174,7 +203,6 @@ include/solarus/lua/ScopedLuaRef.h include/solarus/movements/CircleMovement.h include/solarus/movements/FallingHeight.h include/solarus/movements/FallingOnFloorMovement.h -include/solarus/movements/FollowMovement.h include/solarus/movements/JumpMovement.h include/solarus/movements/Movement.h include/solarus/movements/PathFinding.h @@ -184,6 +212,7 @@ 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/hqx/common.h @@ -198,4 +227,7 @@ 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.so +lib/libsolarus.so.1 +lib/libsolarus.so.${PKGVERSION} diff --git a/games/solarus/distinfo b/games/solarus/distinfo index 5d0f0709b1e..53474390f33 100644 --- a/games/solarus/distinfo +++ b/games/solarus/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 20:57:04 agc Exp $ +$NetBSD: distinfo,v 1.11 2017/01/11 23:42:56 rodent Exp $ -SHA1 (solarus-1.4.2-src.tar.gz) = 145c34d617f66ed419aa18e69616b5e7331a0092 -RMD160 (solarus-1.4.2-src.tar.gz) = 3bada277c00ab929fc9bf16f475c8cff03ea7ee4 -SHA512 (solarus-1.4.2-src.tar.gz) = 8c015e169b0199f28b998171d69f013df4782d13a918e4bde70165077686f2eb2c9e35744468faf1742afbd47ad1996e778daccfb34209b33462964f5cee8e60 -Size (solarus-1.4.2-src.tar.gz) = 2443414 bytes -SHA1 (patch-include_solarus_EntityData.h) = da21cd7fe6d752c27c1cc817ec71efc4ba23ff7e +SHA1 (solarus-1.5.1-src.tar.gz) = 703a305b189711b2761a66d916b70f624c37825b +RMD160 (solarus-1.5.1-src.tar.gz) = 504d3d582a50b8c87dd6a04fc3af5c277208e58a +SHA512 (solarus-1.5.1-src.tar.gz) = fa308d5cecad313e9d263175da50e27ea9b41c2120a5b2df1a2fb0f503c325e27a1df46a3926ef45e05cf7add671f212138bf90644ff485a4bf0da6870e6095a +Size (solarus-1.5.1-src.tar.gz) = 2273607 bytes diff --git a/games/solarus/patches/patch-include_solarus_EntityData.h b/games/solarus/patches/patch-include_solarus_EntityData.h deleted file mode 100644 index 3d9b8787aea..00000000000 --- a/games/solarus/patches/patch-include_solarus_EntityData.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-include_solarus_EntityData.h,v 1.1 2015/07/07 11:41:19 joerg Exp $ - -With the constt, EntityData::EntityField is not copy-assignable, but -that is required elsewhere for use by .insert(). - ---- include/solarus/EntityData.h.orig 2015-07-04 14:10:49.000000000 +0000 -+++ include/solarus/EntityData.h -@@ -63,7 +63,7 @@ class SOLARUS_API EntityData : public Lu - bool operator==(const FieldValue& other) const; - bool operator!=(const FieldValue& other) const; - -- const EntityFieldType value_type; -+ EntityFieldType value_type; - std::string string_value; - int int_value; // Also used for boolean. - }; |