- Update to 1.5.0

3 files changed, 53 insertions, 19 deletions

diff --git a/games/solarus/Makefile b/games/solarus/Makefile
index f9b1659fc8d3..23ac24e95f87 100644
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	solarus
-PORTVERSION=	1.4.5
+PORTVERSION=	1.5.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.solarus-games.org/downloads/solarus/
 DISTNAME=	solarus-${PORTVERSION}-src
@@ -19,10 +19,11 @@ LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libogg.so:audio/libogg
 
 CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=OFF
-
+MAKE_ARGS+=	DESTDIR=${STAGEDIR}
+USE_QT5=	buildtools_build core gui linguisttools_build widgets
 USE_SDL=	sdl2 ttf2 image2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES=		cmake compiler:c++11-lib openal
+USES=		cmake qmake compiler:c++11-lib openal
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/games/solarus/distinfo b/games/solarus/distinfo
index d57aaedf005f..e4018e112107 100644
--- a/games/solarus/distinfo
+++ b/games/solarus/distinfo
@@ -1,2 +1,3 @@
-SHA256 (solarus-1.4.5-src.tar.gz) = c251dd65502162a8db586e3559353871b3d6b2d3729e39ca814cf20ada362503
-SIZE (solarus-1.4.5-src.tar.gz) = 2450121
+TIMESTAMP = 1469723091
+SHA256 (solarus-1.5.0-src.tar.gz) = f586877fe7eb28b3429fb41141fb4b1d9452f390061b386006773c8a1e0cd87f
+SIZE (solarus-1.5.0-src.tar.gz) = 4817611
diff --git a/games/solarus/pkg-plist b/games/solarus/pkg-plist
index 84c4b31b29c8..514245da1e69 100644
--- a/games/solarus/pkg-plist
+++ b/games/solarus/pkg-plist
@@ -1,26 +1,28 @@
-bin/solarus_run
+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
@@ -45,12 +47,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
@@ -58,12 +64,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
@@ -71,12 +80,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
@@ -84,20 +90,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
@@ -105,9 +128,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
@@ -119,7 +143,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
@@ -127,7 +150,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
@@ -136,8 +162,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
@@ -145,11 +172,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
@@ -173,7 +202,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
@@ -183,6 +211,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
@@ -197,4 +226,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.1.5.0