Date: Tuesday, December 1, 2015 @ 11:34:40 Author: svenstaro Revision: 148072
upgpkg: warsow 2.0-1 upstream release 2.0 Added: warsow/trunk/warsow-cmakelists.patch Modified: warsow/trunk/PKGBUILD warsow/trunk/warsow.launcher warsow/trunk/wsw-server.launcher warsow/trunk/wswtv-server.launcher -------------------------+ PKGBUILD | 84 ++++++++++++++++++++++++++-------------------- warsow-cmakelists.patch | 15 ++++++++ warsow.launcher | 10 +++-- wsw-server.launcher | 8 ++-- wswtv-server.launcher | 8 ++-- 5 files changed, 80 insertions(+), 45 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-12-01 10:26:32 UTC (rev 148071) +++ PKGBUILD 2015-12-01 10:34:40 UTC (rev 148072) @@ -1,59 +1,71 @@ -# $Id$ # Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> # Contributor: Slash <demodevil5[at]yahoo[dot]com> # Contributor: Babets # Contributor: Vain +# Contributor: Aleksej Komarov <stylemist...@gmail.com> -pkgname=warsow -pkgver=1.51 -pkgrel=1 -pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine" -url="http://www.warsow.net/" +pkgname='warsow' +pkgver='2.0' +pkgrel='1' +pkgdesc='Free online multiplayer competitive FPS based on the Qfusion engine' +url='https://www.warsow.gg/' license=('GPL') arch=('i686' 'x86_64') -depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' - 'sdl' 'warsow-data' 'libxrandr' 'libpng' 'libtheora' 'freetype2' 'libxi') -makedepends=('mesa' 'openal' 'imagemagick' 'gendesk') +depends=('warsow-data' 'sdl2' 'libjpeg' 'libpng' 'curl' 'libvorbis' 'freetype2' + 'libxinerama' 'libxxf86vm' 'libxrandr' 'libtheora' 'libxi') +makedepends=('mesa' 'openal' 'imagemagick' 'gendesk' 'cmake') optdepends=('openal: for openal audio support') +provides=('warsow') +conflicts=('warsow') source=('warsow.launcher' 'wsw-server.launcher' - 'wswtv-server.launcher' \ - "http://update.warsow.net/mirror/warsow_${pkgver}_sdk.tar.gz") -_genericname=('First person shooter') -_comment=('Online Mulitiplayer Competitive FPS') -md5sums=('ec00081d81ad9802a8ca42fc2eac5498' - 'f73e10c26197178df71b941b10bf83d7' - 'd7e4a69835bbcf801e58307e9d6b951e' - '0dc21fbc33cfe13b5f038cdd20139f5c') + 'wswtv-server.launcher' + 'warsow-cmakelists.patch' + 'http://mirror.null.one/warsow_20_sdk.tar.gz') +md5sums=('65c5ffc2ccc19c661f87467e756bbea2' + '45a3f846fd6ea3b7dc857e60501d0e12' + '13d520525638c544565d8f799ffdca48' + '826509400d2d3f5035b40552f0c95acb' + 'd0efb5d3754ef6838c1e8a7aa09c6e60') +prepare() { + gendesk -n -f --pkgname 'warsow' --pkgdesc "${pkgdesc}" --name 'Warsow' --categories 'Game;ActionGame' -prepare() { - gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Warsow" --categories "Game;ActionGame" + cd "${srcdir}/source/source" + patch < "${srcdir}/warsow-cmakelists.patch" } build() { - # Compile Warsow - cd source/source/ - make + cd "${srcdir}/source/source" + cmake . + make ${MAKE_FLAGS} } package() { - cd source/source/ + local builddir="${srcdir}/source/source/build" # Create Destination Directories - install -d $pkgdir/opt/warsow/ + install -d "${pkgdir}/opt/warsow/" - # Move Compiled Data to Destination Directory - cp -r release/* $pkgdir/opt/warsow - find $pkgdir/opt/warsow -type d | xargs chmod 755 - find $pkgdir/opt/warsow -type f | xargs chmod 755 # only executable files in there + # Move Compiled Data to Destination Directory except basewsw. + # NOTE: We don't need cgame library because it's a pure lib provided by + # modules_16.pk3 from warsow-data package. + cp -r "${builddir}/libs" "${pkgdir}/opt/warsow" + cp "${builddir}/warsow.${CARCH}" "${pkgdir}/opt/warsow/warsow" + cp "${builddir}/wsw_server.${CARCH}" "${pkgdir}/opt/warsow/wsw_server" + cp "${builddir}/wswtv_server.${CARCH}" "${pkgdir}/opt/warsow/wswtv_server" + find "${pkgdir}/opt/warsow" -type d | xargs chmod 755 + find "${pkgdir}/opt/warsow" -type f | xargs chmod 755 # only executables here - install -D -m 0755 $srcdir/warsow.launcher $pkgdir/usr/bin/warsow - install -D -m 0755 $srcdir/wsw-server.launcher $pkgdir/usr/bin/wsw-server - install -D -m 0755 $srcdir/wswtv-server.launcher $pkgdir/usr/bin/wswtv-server - install -D -m 0644 $srcdir/warsow.desktop $pkgdir/usr/share/applications/warsow.desktop - convert win32/warsow.ico $srcdir/warsow.png - install -D -m 0644 $srcdir/warsow-0.png $pkgdir/usr/share/pixmaps/warsow.png + # Install launchers to /usr/bin + install -D -m 0755 "${srcdir}/warsow.launcher" "${pkgdir}/usr/bin/warsow" + install -D -m 0755 "${srcdir}/wsw-server.launcher" "${pkgdir}/usr/bin/wsw-server" + install -D -m 0755 "${srcdir}/wswtv-server.launcher" "${pkgdir}/usr/bin/wswtv-server" + + # Install the menu entry + install -D -m 0644 "${srcdir}/warsow.desktop" "${pkgdir}/usr/share/applications/warsow.desktop" + + # Install the launcher icon + convert "${srcdir}/source/icons/warsow256x256.xpm" "${srcdir}/warsow.png" + install -D -m 0644 "${srcdir}/warsow.png" "${pkgdir}/usr/share/pixmaps/warsow.png" } - -# vim: ts=2:sw=2 Added: warsow-cmakelists.patch =================================================================== --- warsow-cmakelists.patch (rev 0) +++ warsow-cmakelists.patch 2015-12-01 10:34:40 UTC (rev 148072) @@ -0,0 +1,15 @@ +--- CMakeLists.txt 2015-11-26 03:24:35.605626000 +0200 ++++ CMakeLists.txt 2015-11-26 03:26:36.134042424 +0200 +@@ -228,12 +228,6 @@ + set(CURL_LIBRARY "") + add_definitions(-DLIBCURL_RUNTIME) + +- set(JPEG_LIBRARIES "") +- add_definitions(-DLIBJPEG_RUNTIME) +- +- set(PNG_LIBRARIES "") +- add_definitions(-DLIBPNG_RUNTIME) +- + set(OGG_LIBRARY "") + add_definitions(-DOGGLIB_RUNTIME) + Modified: warsow.launcher =================================================================== --- warsow.launcher 2015-12-01 10:26:32 UTC (rev 148071) +++ warsow.launcher 2015-12-01 10:34:40 UTC (rev 148072) @@ -1,5 +1,9 @@ #!/bin/bash -cd "/opt/warsow" -./warsow $* -exit $? +basepath="/opt/warsow" + +${basepath}/warsow \ + +set fs_basepath ${basepath} \ + +set fs_usehomedir 1 \ + +set r_fxaa 0 \ + "${@}" Modified: wsw-server.launcher =================================================================== --- wsw-server.launcher 2015-12-01 10:26:32 UTC (rev 148071) +++ wsw-server.launcher 2015-12-01 10:34:40 UTC (rev 148072) @@ -1,5 +1,7 @@ #!/bin/bash -cd "/opt/warsow" -./wsw_server $* -exit $? +basepath="/opt/warsow" + +${basepath}/wsw_server \ + +set fs_basepath ${basepath} \ + +set fs_usehomedir 1 "${@}" Modified: wswtv-server.launcher =================================================================== --- wswtv-server.launcher 2015-12-01 10:26:32 UTC (rev 148071) +++ wswtv-server.launcher 2015-12-01 10:34:40 UTC (rev 148072) @@ -1,5 +1,7 @@ #!/bin/bash -cd "/opt/warsow" -./wswtv_server $* -exit $? +basepath="/opt/warsow" + +${basepath}/wswtv_server \ + +set fs_basepath ${basepath} \ + +set fs_usehomedir 1 "${@}"