From d1f1a737a9df2fc56194e96502249499f2f1de02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Llorente?= Date: Wed, 19 Jul 2017 17:12:11 +0100 Subject: games/hedgewars: Fix download & lib64, switch to i586. Signed-off-by: David Spencer --- games/hedgewars/README | 8 ++++---- games/hedgewars/hedgewars-multilib.patch | 11 +++++++++++ games/hedgewars/hedgewars.SlackBuild | 10 +++++++--- games/hedgewars/hedgewars.info | 2 +- 4 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 games/hedgewars/hedgewars-multilib.patch (limited to 'games') diff --git a/games/hedgewars/README b/games/hedgewars/README index 85419a166d..d32c07bf3f 100644 --- a/games/hedgewars/README +++ b/games/hedgewars/README @@ -1,10 +1,10 @@ Hedgewars is a turn based strategy game. -Each player controls a team of several hedgehogs. During the course -of the game, players take turns with one of their hedgehogs. They +Each player controls a team of several hedgehogs. During the course +of the game, players take turns with one of their hedgehogs. They then use whatever tools and weapons are available to attack and kill -the opponents' hedgehogs, thereby winning the game. Each turn is -time-limited to ensure that players do not hold up the game with +the opponents' hedgehogs, thereby winning the game. Each turn is +time-limited to ensure that players do not hold up the game with excessive thinking or moving. This SlackBuild packages only the game itself. If you want to compile diff --git a/games/hedgewars/hedgewars-multilib.patch b/games/hedgewars/hedgewars-multilib.patch new file mode 100644 index 0000000000..38ede1f49e --- /dev/null +++ b/games/hedgewars/hedgewars-multilib.patch @@ -0,0 +1,11 @@ +--- cmake_modules/paths.cmake.orig 2015-01-03 23:11:50.455837007 -0600 ++++ cmake_modules/paths.cmake 2015-01-03 23:14:19.209742864 -0600 +@@ -15,7 +15,7 @@ + #resource paths + if(UNIX AND NOT APPLE) + set(target_binary_install_dir "bin" CACHE PATH "install dest for binaries") +- set(target_library_install_dir "lib" CACHE PATH "install dest for libs") ++ set(target_library_install_dir "lib${LIB_SUFFIX}" CACHE PATH "install dest for libs") + + string(SUBSTRING "${DATA_INSTALL_DIR}" 0 1 sharepath_start) + if(${sharepath_start} MATCHES "/") diff --git a/games/hedgewars/hedgewars.SlackBuild b/games/hedgewars/hedgewars.SlackBuild index 15883f5b99..fe28bdb1a7 100644 --- a/games/hedgewars/hedgewars.SlackBuild +++ b/games/hedgewars/hedgewars.SlackBuild @@ -30,7 +30,7 @@ SRC_VERSION=${SRC_VERSION:-0.9.22} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,12 +70,16 @@ 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 {} \; +# Fix for lib64 (thanks to Fedora) +patch -p0 < $CWD/hedgewars-multilib.patch + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DNOVIDEOREC=1 \ -DPHYSFS_SYSTEM=off \ -DNOSERVER=1 \ diff --git a/games/hedgewars/hedgewars.info b/games/hedgewars/hedgewars.info index 84b2bb24ba..32c4aace82 100644 --- a/games/hedgewars/hedgewars.info +++ b/games/hedgewars/hedgewars.info @@ -1,7 +1,7 @@ PRGNAM="hedgewars" VERSION="0.9.22" HOMEPAGE="http://www.hedgewars.org" -DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/games/hedgewars/hedgewars-src-0.9.22.tar.bz2" +DOWNLOAD="https://www.hedgewars.org/download/releases/hedgewars-src-0.9.22.tar.bz2" MD5SUM="3718947ea69f57a76a3511678fb8173b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -- cgit v1.2.3