aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authororbea <orbea@riseup.net>2020-09-04 10:13:10 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-09-05 08:26:39 +0700
commitc3669930f62a8263136f37149212bffa634533aa (patch)
treebc520ddfcfcf35d900ab31ba90f1cb1588f81f7b /games
parent222c12ac216f952def3f108c9056933bc306b147 (diff)
games/solarus: Updated for version 1.6.4.
Signed-off-by: orbea <orbea@riseup.net> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games')
-rw-r--r--games/solarus/cmake.patch25
-rw-r--r--games/solarus/solarus.SlackBuild8
-rw-r--r--games/solarus/solarus.info8
3 files changed, 35 insertions, 6 deletions
diff --git a/games/solarus/cmake.patch b/games/solarus/cmake.patch
new file mode 100644
index 000000000000..1661f39485ee
--- /dev/null
+++ b/games/solarus/cmake.patch
@@ -0,0 +1,25 @@
+From 17f2f33d8733aa7dcb5e52fc9043447758a74869 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 4 Sep 2020 09:21:45 -0700
+Subject: [PATCH] cmake: Fix compatibility with cmake 3.5.2.
+
+cmake 3.5.2 does not have VERSION_GREATER_EQUAL or VERSION_LESS_EQUAL.
+---
+ cmake/modules/FindGLM.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake
+index 32ce5058d..e3905b6c3 100644
+--- a/cmake/modules/FindGLM.cmake
++++ b/cmake/modules/FindGLM.cmake
+@@ -52,6 +52,6 @@ find_package_handle_standard_args(GLM
+ )
+
+ # Enable GLM experimental extensions for GLM 0.9.9.0 to 0.9.9.3
+-if(GLM_VERSION_STRING VERSION_GREATER_EQUAL 0.9.9.0 AND GLM_VERSION_STRING VERSION_LESS_EQUAL 0.9.9.3)
++if((GLM_VERSION_STRING VERSION_EQUAL 0.9.9.0 OR GLM_VERSION_STRING VERSION_GREATER 0.9.9.0) AND (GLM_VERSION_STRING VERSION_EQUAL 0.9.9.3 OR GLM_VERSION_STRING VERSION_LESS 0.9.9.3))
+ add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
+ endif()
+--
+2.25.0
+
diff --git a/games/solarus/solarus.SlackBuild b/games/solarus/solarus.SlackBuild
index f9da1706e27f..4a6847bc47c5 100644
--- a/games/solarus/solarus.SlackBuild
+++ b/games/solarus/solarus.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for solarus
-# Copyright 2015-2019 Hunter Sezen California, USA
+# Copyright 2015-2020 Hunter Sezen California, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=solarus
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.6.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,6 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# cmake: Fix compatiblity with cmake-3.5.2.
+# https://gitlab.com/solarus-games/solarus/-/merge_requests/1353
+patch -p1 < $CWD/cmake.patch
+
if pkg-config --exists Qt5Core; then
GUI=ON
else
diff --git a/games/solarus/solarus.info b/games/solarus/solarus.info
index 186cd560e0f0..740a8f5ce3f5 100644
--- a/games/solarus/solarus.info
+++ b/games/solarus/solarus.info
@@ -1,10 +1,10 @@
PRGNAM="solarus"
-VERSION="1.6.2"
+VERSION="1.6.4"
HOMEPAGE="https://www.solarus-games.org/"
-DOWNLOAD="https://gitlab.com/solarus-games/solarus/-/archive/v1.6.2/solarus-v1.6.2.tar.gz"
-MD5SUM="f5ea8ccddb3d26136b5de51e255e991f"
+DOWNLOAD="https://gitlab.com/solarus-games/solarus/-/archive/v1.6.4/solarus-v1.6.4.tar.gz"
+MD5SUM="d06a3258910cb113d28e1349ca437125"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="OpenAL SDL2_image SDL2_ttf libmodplug luajit physfs"
+REQUIRES="OpenAL SDL2_image SDL2_ttf glm libmodplug luajit physfs"
MAINTAINER="Hunter Sezen"
EMAIL="orbea@riseup.net"