From bdc58e35879646df436fead93ee4b9f95b0474db Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 18 Jul 2019 15:55:41 +0300 Subject: [PATCH] solarus: bump version --- .../patches/solarus-luajit-1.1.1.patch | 75 ------------------- games-engines/solarus/solarus-1.1.1.recipe | 61 --------------- ...arus-1.5.3.recipe => solarus-1.6.0.recipe} | 16 ++-- 3 files changed, 11 insertions(+), 141 deletions(-) delete mode 100644 games-engines/solarus/patches/solarus-luajit-1.1.1.patch delete mode 100644 games-engines/solarus/solarus-1.1.1.recipe rename games-engines/solarus/{solarus-1.5.3.recipe => solarus-1.6.0.recipe} (78%) diff --git a/games-engines/solarus/patches/solarus-luajit-1.1.1.patch b/games-engines/solarus/patches/solarus-luajit-1.1.1.patch deleted file mode 100644 index 4020dcc88..000000000 --- a/games-engines/solarus/patches/solarus-luajit-1.1.1.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 782799a..c17a479 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,7 +16,7 @@ find_package(OpenAL REQUIRED) - find_package(VorbisFile REQUIRED) - find_package(Ogg REQUIRED) - find_package(ModPlug REQUIRED) --find_package(Lua51 REQUIRED) -+find_package(LuaJIT REQUIRED) - find_package(PhysFS REQUIRED) - - # Explicit link to libdl is needed for Lua on some systems. -diff --git a/cmake/modules/FindLuaJIT.cmake b/cmake/modules/FindLuaJIT.cmake -new file mode 100644 -index 0000000..6b45ed6 ---- /dev/null -+++ b/cmake/modules/FindLuaJIT.cmake -@@ -0,0 +1,56 @@ -+# Locate LuaJIT library -+# This module defines -+# LUAJIT_FOUND, if false, do not try to link to Lua -+# LUA_LIBRARIES -+# LUA_INCLUDE_DIR, where to find lua.h -+# LUAJIT_VERSION_STRING, the version of Lua found (since CMake 2.8.8) -+ -+## Copied from default CMake FindLua51.cmake -+ -+find_path(LUA_INCLUDE_DIR luajit.h -+ HINTS -+ ENV LUA_DIR -+ PATH_SUFFIXES include/luajit-2.0 include -+ PATHS -+ ~/Library/Frameworks -+ /Library/Frameworks -+ /sw # Fink -+ /opt/local # DarwinPorts -+ /opt/csw # Blastwave -+ /opt -+) -+ -+find_library(LUA_LIBRARY -+ NAMES luajit-5.1 -+ HINTS -+ ENV LUA_DIR -+ PATH_SUFFIXES lib -+ PATHS -+ ~/Library/Frameworks -+ /Library/Frameworks -+ /sw -+ /opt/local -+ /opt/csw -+ /opt -+) -+ -+if(LUA_LIBRARY) -+ set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -+endif() -+ -+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h") -+ file(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" luajit_version_str REGEX "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT .+\"") -+ -+ string(REGEX REPLACE "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT ([^\"]+)\".*" "\\1" LUAJIT_VERSION_STRING "${luajit_version_str}") -+ unset(luajit_version_str) -+endif() -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if -+# all listed variables are TRUE -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT -+ REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR -+ VERSION_VAR LUAJIT_VERSION_STRING) -+ -+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY) -+ diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe deleted file mode 100644 index 9cfdcbc3f..000000000 --- a/games-engines/solarus/solarus-1.1.1.recipe +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY="An ARPG game engine" -DESCRIPTION=" -Solarus is an open-source Zelda-like 2D game engine." -HOMEPAGE="http://solarus-games.org" -COPYRIGHT="2006-2013 Christopho, Solarus" -LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="http://www.solarus-games.org/downloads/solarus/solarus-1.1.1-src.tar.gz" -CHECKSUM_SHA256="5355e95edbd5234f57a8748d1417ca346468e5804e44293d2523b57367eb5615" - -ARCHITECTURES="x86_gcc2 !x86 !x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - solarus$secondaryArchSuffix = $portVersion - cmd:solarus = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:liblua$secondaryArchSuffix == 5.1.4 - lib:libmodplug$secondaryArchSuffix >= 0.8.0 - lib:libogg$secondaryArchSuffix - lib:libopenal$secondaryArchSuffix - lib:libphysfs$secondaryArchSuffix - lib:libSDL$secondaryArchSuffix - lib:libsdl_image$secondaryArchSuffix - lib:libsdl_ttf$secondaryArchSuffix - lib:libvorbis$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:liblua$secondaryArchSuffix == 5.1.4 - devel:libmodplug$secondaryArchSuffix >= 0.8.0 - devel:libogg$secondaryArchSuffix - devel:libopenal$secondaryArchSuffix - devel:libphysfs$secondaryArchSuffix - devel:libSDL$secondaryArchSuffix - devel:libsdl_image$secondaryArchSuffix - devel:libsdl_ttf$secondaryArchSuffix - devel:libvorbis$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:cmake - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - " - -BUILD() -{ - cmake -DCMAKE_INSTALL_PREFIX="$prefix" \ - -DCMAKE_BUILD_TYPE=Release . - make $jobArgs -} - -INSTALL() -{ - make install -} diff --git a/games-engines/solarus/solarus-1.5.3.recipe b/games-engines/solarus/solarus-1.6.0.recipe similarity index 78% rename from games-engines/solarus/solarus-1.5.3.recipe rename to games-engines/solarus/solarus-1.6.0.recipe index 589dab660..ddc67e49f 100644 --- a/games-engines/solarus/solarus-1.5.3.recipe +++ b/games-engines/solarus/solarus-1.6.0.recipe @@ -1,12 +1,16 @@ SUMMARY="An ARPG game engine" -DESCRIPTION=" -Solarus is an open-source Zelda-like 2D game engine." +DESCRIPTION="A lightweight, free and open-source game engine for Action-RPGs + +* A 2D game engine written in C++, and executing games made in Lua. +* Specifically designed with 16-bit classic Action-RPGs in mind. +* Available on multiple platforms. +* Completely free and open-source, under GPL v3 License." HOMEPAGE="http://solarus-games.org" -COPYRIGHT="2006-2017 Christopho, Solarus" +COPYRIGHT="2006-2018 Christopho, Solarus" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="http://www.solarus-games.org/downloads/solarus/solarus-${portVersion}-src.tar.gz" -CHECKSUM_SHA256="7608f3bdc7baef36e95db5e4fa4c8c5be0a3f436c50c53ab72d70a92aa44cc1c" +CHECKSUM_SHA256="d800fdf388f860732f2d40c8dd635c34fd1c452857f75bf9b3a421e3ef5ee751" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -20,6 +24,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libluajit_5.1$secondaryArchSuffix lib:libmodplug$secondaryArchSuffix >= 1.0 lib:libogg$secondaryArchSuffix @@ -54,6 +59,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize + cmd:lrelease$secondaryArchSuffix cmd:make "