diff --git a/games/unvanquished/cmakelists.patch b/games/unvanquished/cmakelists.patch new file mode 100644 index 0000000000..325e6664fc --- /dev/null +++ b/games/unvanquished/cmakelists.patch @@ -0,0 +1,59 @@ +--- Unvanquished-0.50.0/daemon/CMakeLists.txt.orig 2016-06-08 14:53:22.525135294 +0300 ++++ Unvanquished-0.50.0/daemon/CMakeLists.txt 2016-06-08 17:10:11.316629219 +0300 +@@ -343,32 +343,32 @@ + if (NOT EXISTS ${DEPS_DIR}) + get_filename_component(BASENAME ${DEPS_DIR} NAME) + set(REMOTE "http://dl.unvanquished.net/deps/${BASENAME}${DEPS_EXT}") +- message(STATUS "Downloading dependencies from '${REMOTE}'") +- file(DOWNLOAD ${REMOTE} ${OBJ_DIR}/${BASENAME}${DEPS_EXT} +- SHOW_PROGRESS +- STATUS DOWNLOAD_RESULT +- LOG DOWNLOAD_LOG +- ) +- list(GET DOWNLOAD_RESULT 0 DOWNLOAD_STATUS) +- list(GET DOWNLOAD_RESULT 1 DOWNLOAD_STRING) +- if (NOT DOWNLOAD_STATUS EQUAL 0) +- message(FATAL_ERROR "Error downloading '${REMOTE}': +- Status code: ${DOWNLOAD_STATUS} +- Error string: ${DOWNLOAD_STRING} +- Download log: ${DOWNLOAD_LOG}" +- ) +- endif() +- message(STATUS "Download completed successfully") ++ #message(STATUS "Downloading dependencies from '${REMOTE}'") ++ #file(DOWNLOAD ${REMOTE} ${OBJ_DIR}/${BASENAME}${DEPS_EXT} ++ # SHOW_PROGRESS ++ # STATUS DOWNLOAD_RESULT ++ # LOG DOWNLOAD_LOG ++ #) ++ #list(GET DOWNLOAD_RESULT 0 DOWNLOAD_STATUS) ++ #list(GET DOWNLOAD_RESULT 1 DOWNLOAD_STRING) ++ #if (NOT DOWNLOAD_STATUS EQUAL 0) ++ # message(FATAL_ERROR "Error downloading '${REMOTE}': ++ # Status code: ${DOWNLOAD_STATUS} ++ # Error string: ${DOWNLOAD_STRING} ++ # Download log: ${DOWNLOAD_LOG}" ++ # ) ++ #endif() ++ #message(STATUS "Download completed successfully") + + # Extract the downloaded archive +- execute_process( +- COMMAND ${CMAKE_COMMAND} -E tar xzf ${OBJ_DIR}/${BASENAME}${DEPS_EXT} +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/external_deps +- RESULT_VARIABLE EXTRACT_RESULT +- ) +- if (NOT EXTRACT_RESULT EQUAL 0) +- message(FATAL_ERROR "Could not extract ${BASENAME}${DEPS_EXT}") +- endif() ++ #execute_process( ++ # COMMAND ${CMAKE_COMMAND} -E tar xzf ${OBJ_DIR}/${BASENAME}${DEPS_EXT} ++ # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/external_deps ++ # RESULT_VARIABLE EXTRACT_RESULT ++ #) ++ #if (NOT EXTRACT_RESULT EQUAL 0) ++ # message(FATAL_ERROR "Could not extract ${BASENAME}${DEPS_EXT}") ++ #endif() + endif() + + # Add to paths diff --git a/games/unvanquished/doinst.sh b/games/unvanquished/doinst.sh index 9fbdcf1498..790741ddfe 100644 --- a/games/unvanquished/doinst.sh +++ b/games/unvanquished/doinst.sh @@ -1,4 +1,3 @@ - if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi diff --git a/games/unvanquished/unvanquished.SlackBuild b/games/unvanquished/unvanquished.SlackBuild index 34d808f6b1..ed049fff91 100644 --- a/games/unvanquished/unvanquished.SlackBuild +++ b/games/unvanquished/unvanquished.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for unvanquished -# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada +# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ SRCNAM=Unvanquished PRGNAM=$(echo ${SRCNAM,,}) -VERSION=${VERSION:-0.26.0} +VERSION=${VERSION:-0.50.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,18 +57,26 @@ fi set -e +EXT_DEPS="linux32-4" +if [ "$ARCH" = "x86_64" ]; then + EXT_DEPS="linux64-4" +fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz cd $SRCNAM-$VERSION +cd daemon/external_deps +tar xvf $CWD/$EXT_DEPS.tar.bz2 +cd - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; if [ "$ARCH" = "x86_64" ]; then sed -i -e 's/Unvanquished/unvanquished/g' -e \ @@ -85,14 +93,17 @@ else sed -i 's/conf.d\///g' archlinux/unvanquished.service fi +# Fix avoid download automaticaly dependencies +patch -p1 < $CWD/cmakelists.patch + mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -D BUILD_GAME_QVM=OFF \ - -D BUILD_TTY_CLIENT=ON \ + -DBUILD_CGAME=OFF \ + -DBUILD_SGAME=OFF \ -DCMAKE_BUILD_TYPE=Release .. make @@ -107,9 +118,15 @@ mkdir -p $PKG/usr/bin \ $PKG/var/lib/unvanquished-server/config # Install content -install -D -m0644 *.so $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM -install -D -m0755 daemon* $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +install -D -m0755 daemon $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +install -D -m0755 daemon-tty $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +install -D -m0755 daemonded $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +install -D -m0755 irt_core-x86*.nexe $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +install -D -m0755 nacl_helper_bootstrap $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM +install -D -m0755 nacl_loader $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM + cd .. +# Install server config install -D -m0644 debian/configfiles/server.cfg $PKG/etc/$PRGNAM/config/server.cfg install -D -m0644 debian/configfiles/maprotation.cfg $PKG/etc/$PRGNAM/config/maprotation.cfg @@ -128,7 +145,6 @@ ln -sf $PKG/etc/$PRGNAM/config/maprotation.cfg \ # Copy the data-game mkdir -p $PKG/usr/share/games/$PRGNAM/pkg -cp -a $CWD/$PRGNAM\_0.25.0.pk3 $PKG/usr/share/games/$PRGNAM/pkg cp -a $CWD/$PRGNAM\_$VERSION.pk3 $PKG/usr/share/games/$PRGNAM/pkg mkdir -p $PKG/usr/share/applications diff --git a/games/unvanquished/unvanquished.info b/games/unvanquished/unvanquished.info index ef8ba6ce61..4c39dc108b 100644 --- a/games/unvanquished/unvanquished.info +++ b/games/unvanquished/unvanquished.info @@ -1,14 +1,18 @@ PRGNAM="unvanquished" -VERSION="0.26.0" +VERSION="0.50.0" HOMEPAGE="http://www.unvanquished.net/" -DOWNLOAD="https://github.com/Unvanquished/Unvanquished/archive/v0.26.0.tar.gz \ - http://downloads.sourceforge.net/project/unvanquished/Assets/unvanquished_0.26.0.pk3 \ - http://sourceforge.net/projects/unvanquished/files/Assets/unvanquished_0.25.0.pk3" -MD5SUM="01ba259042765355f40e07841bb0da74 \ - 291cbc0379cd084aefa02e9964518961 \ - 3b6f35a877e7af231f0337795036a740" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="GeoIP SDL2 libwebp speex OpenAL opusfile" +DOWNLOAD="https://github.com/Unvanquished/Unvanquished/archive/v0.50.0.tar.gz \ + http://cdn.unvanquished.net/0.50/pkg/unvanquished_0.50.0.pk3 \ + https://dl.unvanquished.net/deps/linux32-4.tar.bz2" +MD5SUM="d9279452fb1a6747f830660b444e7b20 \ + 36860685567cd7e4198726e1a4b0ce40 \ + dd2cb5419bac9a1b81a8a996312e33ff" +DOWNLOAD_x86_64="https://github.com/Unvanquished/Unvanquished/archive/v0.50.0.tar.gz \ + http://cdn.unvanquished.net/0.50/pkg/unvanquished_0.50.0.pk3 \ + https://dl.unvanquished.net/deps/linux64-4.tar.bz2" +MD5SUM_x86_64="d9279452fb1a6747f830660b444e7b20 \ + 36860685567cd7e4198726e1a4b0ce40 \ + 2ba12c71625919ddc282172b74fa4887" +REQUIRES="GeoIP SDL2 libwebp speex OpenAL opusfile lua PyYAML Jinja2" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com"