summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBłażej Szczygieł2017-05-21 17:45:45 +0200
committerBłażej Szczygieł2017-05-21 17:47:31 +0200
commit518fe0d885aad825dc1d6ded087a40d955936d4b (patch)
treeb9995d7b92eab245767c9516b2936a33ae98d226
parent1a4a43e366e910b88067cae2afa159821d85cf4c (diff)
downloadaur-518fe0d885aad825dc1d6ded087a40d955936d4b.tar.gz
Follow github changes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD33
2 files changed, 17 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 55b878a6ff9d..0d9d5fa94559 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat May 20 21:59:33 UTC 2017
+# Sun May 21 15:47:24 UTC 2017
pkgbase = nfs2se-git
pkgdesc = Cross-platform wrapper for the Need For Speed™ II SE game with 3D acceleration and TCP protocol!
- pkgver = 1.2.0
+ pkgver = 1.2.1
pkgrel = 1
url = https://github.com/zaps166/NFSIISE
install = nfs2se-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 5501cafda541..a5420fa82e88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: zaps166 <spaz16@wp.pl>
pkgname=nfs2se-git
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc='Cross-platform wrapper for the Need For Speed™ II SE game with 3D acceleration and TCP protocol!'
arch=('i686' 'x86_64' 'armv7' 'armv7h')
@@ -15,35 +15,35 @@ md5sums=('SKIP'
machine=$(uname -m)
-NFS_DIR="NFSIISE"
-NFS_DATA_DIR="$NFS_DIR/Need For Speed II SE"
-OTHER_CPU=0
-
if [ $machine == "x86_64" ]; then
depends=('lib32-sdl2' 'lib32-libgl')
makedepends=('gcc-multilib' 'yasm')
optdepends=('lib32-libpulse: Required for PulseAudio')
+ SUBMODULE=src/Asm
elif [ $machine == "i686" ]; then
depends=('sdl2' 'libgl')
makedepends=('gcc' 'yasm')
+ SUBMODULE=src/Asm
else
depends=('sdl2' 'libgl')
makedepends=('gcc')
- source[0]=${source[0]}"-CPP"
-
- NFS_DIR="$NFS_DIR-CPP"
- NFS_DATA_DIR="$NFS_DIR/NFSIISE/Need For Speed II SE"
- OTHER_CPU=1
+ COMPILE_ARG=cpp
+ SUBMODULE=src/Cpp
fi
install=nfs2se-git.install
-build()
+prepare()
{
- cd $srcdir/$NFS_DIR
+ cd $srcdir/NFSIISE
git submodule init
- git submodule update
- ./compile_nfs
+ git submodule update $SUBMODULE
+}
+
+build()
+{
+ cd $srcdir/NFSIISE
+ ./compile_nfs $COMPILE_ARG
}
package()
@@ -52,11 +52,8 @@ package()
cp $srcdir/nfs2se $pkgdir/usr/bin
mkdir $pkgdir/opt
- cp -r "$srcdir/$NFS_DATA_DIR" $pkgdir/opt/nfs2se
+ cp -r "$srcdir/NFSIISE/Need For Speed II SE" $pkgdir/opt/nfs2se
rm -f $pkgdir/opt/nfs2se/open_config.bat
- if [ $OTHER_CPU != 0 ]; then
- cp $srcdir/$NFS_DIR/nfs2se $pkgdir/opt/nfs2se
- fi
mkdir -p $pkgdir/usr/share/applications
mv $pkgdir/opt/nfs2se/nfs2se.desktop $pkgdir/usr/share/applications