From 9fcef6af1245c456b688a945935ca2230b93abfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves=20Fern=C3=A1ndez=20=28Gallaecio=29?= Date: Fri, 9 Sep 2011 02:19:12 +0000 Subject: [PATCH] Xonotic 0.5.0. --- xonotic/PKGBUILD | 93 ++++++++++++++++++++---------------- xonotic/xonotic-dedicated.sh | 3 -- xonotic/xonotic-glx.desktop | 16 ++++--- xonotic/xonotic-glx.sh | 3 -- xonotic/xonotic-sdl.desktop | 16 ++++--- xonotic/xonotic-sdl.sh | 3 -- 6 files changed, 70 insertions(+), 64 deletions(-) delete mode 100644 xonotic/xonotic-dedicated.sh delete mode 100644 xonotic/xonotic-glx.sh delete mode 100644 xonotic/xonotic-sdl.sh diff --git a/xonotic/PKGBUILD b/xonotic/PKGBUILD index e2e278607..93fac2c40 100644 --- a/xonotic/PKGBUILD +++ b/xonotic/PKGBUILD @@ -1,58 +1,69 @@ # # Games Packages for Chakra, part of chakra-project.org # -# Maintainer: Adrián Chaves Fernández (Gallaecio) +# Maintainer: Adrián Chaves Fernández (Gallaecio) -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=xonotic -pkgver=0.1.0 +pkgbase=xonotic +_pkgbase=Xonotic +pkgname=($pkgbase $pkgbase-data) +pkgver=0.5.0 pkgrel=1 -pkgdesc="A free, fast-paced crossplatform first-person shooter." +pkgdesc="A free, fast-paced crossplatform first-person shooter" arch=('i686' 'x86_64') url="http://xonotic.org" -license=('GPL') -depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'libpng>=1.4.0') +license=('GPL2') +depends=('alsa-lib' 'curl' 'libjpeg' 'libmodplug' 'libpng' 'libvorbis' 'libxpm' 'libxxf86dga' +'libxxf86vm' 'sdl') makedepends=('unzip' 'mesa') -source=('http://dl.xonotic.org/xonotic-0.1.0preview.zip' - 'xonotic-dedicated.sh' - 'xonotic-glx.sh' - 'xonotic-sdl.sh' - 'xonotic-glx.desktop' - 'xonotic-sdl.desktop') -md5sums=('aafb43893aa66e01488c817e3a60d96d' - '2c0aef8104fa34aef58d368d994abca3' - 'd2f357eab92db585448476470bbf9c1c' - 'fdb9b96cd2b700ea9e8a7d6a1ab3505e' - '914c7b9163e92b35f0ab57fdb1653ac5' - 'da7d812ff231c9332cd694b39757adda') +source=("http://dl.xonotic.org/$pkgbase-$pkgver.zip" + "xonotic-glx.desktop" + "xonotic-sdl.desktop") +md5sums=('cdadb384ccf9cad926bb377312832c2f' + '449ef5bbabfdac6e85673df13d6983b3' + '677ddb624bea1a8dc9268d6ba6f5cb3b') build() { - cd $srcdir/Xonotic/source/darkplaces + cd $srcdir/$_pkgbase/source/darkplaces - # build the binaries separately instead to avoid truncated files - make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz - make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz - make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz + # Build the binaries separately to avoid truncated files. + make CPUOPTIMIZATIONS="$CFLAGS" DP_LINK_TO_LIBJPEG=1 cl-nexuiz + make CPUOPTIMIZATIONS="$CFLAGS" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz + make CPUOPTIMIZATIONS="$CFLAGS" DP_LINK_TO_LIBJPEG=1 sv-nexuiz } -package() { - cd $srcdir/Xonotic +package_xonotic() { + cd $srcdir/$_pkgbase + depends=('alsa-lib' 'curl' 'libjpeg' 'libmodplug' 'libpng' 'libvorbis' 'libxpm' 'libxxf86dga' + 'libxxf86vm' 'sdl' 'xonotic-data') + + # Binaries. + install -Dm755 source/darkplaces/nexuiz-dedicated $pkgdir/usr/share/$pkgbase/$pkgbase-server + install -Dm755 source/darkplaces/nexuiz-glx $pkgdir/usr/share/$pkgbase/$pkgbase-glx + install -Dm755 source/darkplaces/nexuiz-sdl $pkgdir/usr/share/$pkgbase/$pkgbase-sdl - # binaries - install -Dm755 source/darkplaces/nexuiz-dedicated $pkgdir/opt/xonotic/xonotic-dedicated - install -Dm755 source/darkplaces/nexuiz-glx $pkgdir/opt/xonotic/xonotic-glx - install -Dm755 source/darkplaces/nexuiz-sdl $pkgdir/opt/xonotic/xonotic-sdl + # Execution scripts. + install -d $pkgdir/usr/bin + for TYPE in server glx sdl + do + cat > $pkgdir/usr/bin/$pkgbase-$TYPE << EOF +#!/bin/sh +cd /usr/share/$pkgbase +./$pkgbase-$TYPE \$@ +EOF + chmod +x $pkgdir/usr/bin/$pkgbase-$TYPE + done + + # Desktop integration. + install -Dm644 $srcdir/$pkgbase-glx.desktop $pkgdir/usr/share/applications/$pkgbase-glx.desktop + install -Dm644 $srcdir/$pkgbase-sdl.desktop $pkgdir/usr/share/applications/$pkgbase-sdl.desktop + install -Dm644 $srcdir/$_pkgbase/misc/logos/${pkgbase}_icon.svg $pkgdir/usr/share/pixmaps/$pkgbase.svg +} - # data - mv $srcdir/Xonotic/data $pkgdir/opt/xonotic/ +package_xonotic-data() { + pkgdesc="A free, fast-paced crossplatform first-person shooter (data files)" + depends="" + arch=(any) - # convenience files - mkdir -p $pkgdir/usr/share/applications - install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications - install -Dm755 $srcdir/xonotic-dedicated.sh $pkgdir/usr/bin/xonotic-dedicated - install -Dm755 $srcdir/xonotic-glx.sh $pkgdir/usr/bin/xonotic-glx - install -Dm755 $srcdir/xonotic-sdl.sh $pkgdir/usr/bin/xonotic-sdl - install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png + install -d $pkgdir/usr/share/$pkgbase + cp -R $srcdir/$_pkgbase/data $pkgdir/usr/share/$pkgbase/data } diff --git a/xonotic/xonotic-dedicated.sh b/xonotic/xonotic-dedicated.sh deleted file mode 100644 index b9998ca3c..000000000 --- a/xonotic/xonotic-dedicated.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/xonotic -./xonotic-dedicated $@ diff --git a/xonotic/xonotic-glx.desktop b/xonotic/xonotic-glx.desktop index 9f9e78cc1..aeb433278 100644 --- a/xonotic/xonotic-glx.desktop +++ b/xonotic/xonotic-glx.desktop @@ -1,11 +1,13 @@ [Desktop Entry] Type=Application -Version=2.5 -Encoding=UTF-8 +Version=1.0 Name=Xonotic (GLX) -Comment=a free open-source first person shooter -Icon=/usr/share/pixmaps/xonotic.png +GenericName=First Person Shooter +GenericName[es]=Juego de tiros +GenericName[gl]=Xogo de tiros +Comment=A first person shooter (GLX interface) +Comment[es]=Un juego de tiros en primera persona (interfaz en GLX). +Comment[gl]=un xogo de tiros en primeira persoa (interface en GLX). +Icon=/usr/share/pixmaps/xonotic.svg Exec=/usr/bin/xonotic-glx -Terminal=false -StartupNotify=false -Categories=Game; +Categories=Game;ActionGame; diff --git a/xonotic/xonotic-glx.sh b/xonotic/xonotic-glx.sh deleted file mode 100644 index e52a99c9f..000000000 --- a/xonotic/xonotic-glx.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/xonotic -./xonotic-glx $@ diff --git a/xonotic/xonotic-sdl.desktop b/xonotic/xonotic-sdl.desktop index 32b37f2c5..a08cd24a5 100644 --- a/xonotic/xonotic-sdl.desktop +++ b/xonotic/xonotic-sdl.desktop @@ -1,11 +1,13 @@ [Desktop Entry] Type=Application -Version=2.5 -Encoding=UTF-8 +Version=1.0 Name=Xonotic (SDL) -Comment=a free open-source first person shooter -Icon=/usr/share/pixmaps/xonotic.png +GenericName=First Person Shooter +GenericName[es]=Juego de tiros +GenericName[gl]=Xogo de tiros +Comment=A first person shooter (SDL interface) +Comment[es]=Un juego de tiros en primera persona (interfaz en SDL). +Comment[gl]=un xogo de tiros en primeira persoa (interface en SDL). +Icon=/usr/share/pixmaps/xonotic.svg Exec=/usr/bin/xonotic-sdl -Terminal=false -StartupNotify=false -Categories=Game; +Categories=Game;ActionGame; diff --git a/xonotic/xonotic-sdl.sh b/xonotic/xonotic-sdl.sh deleted file mode 100644 index 976d3ccf5..000000000 --- a/xonotic/xonotic-sdl.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/xonotic -./xonotic-sdl $@ -- GitLab