summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMckol2018-11-27 00:20:12 +0100
committerMckol2018-11-27 00:20:12 +0100
commitf709b6a3252a26c749042fd02782cf1a3a85e2d4 (patch)
treead6492925fbffc815d6f5589a51c95c1caa4b5c0
parent723c17cdef251dc0958e0da3e8198729b0fe023e (diff)
downloadaur-f709b6a3252a26c749042fd02782cf1a3a85e2d4.tar.gz
Removed runner script (upstream added support for custom shader path)
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD19
-rw-r--r--veloren-voxygen3
3 files changed, 8 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eda5e7db9ce..3d7733eaab2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,18 +14,16 @@ pkgbase = veloren-git
noextract = voxygen.desktop
noextract = voxygen.png
options = !strip
- source = veloren-git::git+https://gitlab.com/veloren/game.git
+ source = veloren-git::git+https://gitlab.com/Mckol/game.git
source = assets_voxygen::git+https://gitlab.com/veloren/assets/voxygen.git
source = assets_world::git+https://gitlab.com/veloren/assets/world.git
source = voxygen.desktop
source = voxygen.png
- source = veloren-voxygen
sha512sums = SKIP
sha512sums = SKIP
sha512sums = SKIP
sha512sums = 79950e7d39b1a14a7b218b0da9abe723dffc7a37421fb76e86446e1993e09bf037559803b4825a8c083d2fdb7a85c96c971f5e6eacf690fffec462673a6b24e7
sha512sums = b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94
- sha512sums = 1387388591034f5084ddd495721dae9dde7cf480212fe805e0edceeb0a5f8ef0c394728f71b190f837a1cb3d27b3296f744b4bbc4aab3290bf70769e7ca1cb88
pkgname = veloren-git
diff --git a/PKGBUILD b/PKGBUILD
index 868b8a09cef..225c673f03c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Mckol <mckol363@gmail.com>
pkgname=veloren-git
-pkgver=0.1.0.r375.e777671
+pkgver=0.1.0.r377.be1d911
pkgrel=1
pkgdesc="An open-world, open-source multiplayer voxel RPG"
arch=('x86_64' 'i686')
@@ -21,15 +21,13 @@ source=(
"assets_world::git+https://gitlab.com/veloren/assets/world.git"
"voxygen.desktop"
"voxygen.png"
- "veloren-voxygen"
)
noextract=("voxygen.desktop" "voxygen.png")
sha512sums=('SKIP'
'SKIP'
'SKIP'
'79950e7d39b1a14a7b218b0da9abe723dffc7a37421fb76e86446e1993e09bf037559803b4825a8c083d2fdb7a85c96c971f5e6eacf690fffec462673a6b24e7'
- 'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94'
- '1387388591034f5084ddd495721dae9dde7cf480212fe805e0edceeb0a5f8ef0c394728f71b190f837a1cb3d27b3296f744b4bbc4aab3290bf70769e7ca1cb88')
+ 'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94')
pkgver() {
cd "$srcdir/$pkgname"
git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g;s/v//'
@@ -49,23 +47,20 @@ build() {
_original_toolchain="$(rustup show active-toolchain)"
rustup default nightly
cd "$srcdir/$pkgname/voxygen"
- cargo build --release
+ VELOREN_ASSETS=/usr/share/veloren/assets/ VOXYGEN_SHADERS=/usr/share/veloren/shaders/ cargo build --release
cd "$srcdir/$pkgname/server-cli"
- VELOREN_ASSETS=/usr/share/veloren/assets cargo build --release
+ VELOREN_ASSETS=/usr/share/veloren/assets/ cargo build --release
rustup default "${_original_toolchain}"
}
package() {
- mkdir -p "$pkgdir/usr/share/veloren/voxygen"
+ mkdir -p "$pkgdir/usr/share/veloren"
mkdir -p "$pkgdir/usr/bin"
mkdir -p "$pkgdir/usr/share/pixmaps"
mkdir -p "$pkgdir/usr/share/applications/veloren"
cp -r "$srcdir/$pkgname/assets" "$pkgdir/usr/share/veloren/"
- cp -r "$srcdir/$pkgname/voxygen/shaders" "$pkgdir/usr/share/veloren/voxygen/"
- cp "$srcdir/$pkgname/target/release/voxygen" "$pkgdir/usr/share/veloren/voxygen/"
- chmod +x "$pkgdir/usr/share/veloren/voxygen/voxygen"
- # currently a script is needed to run voxygen from directory containing assets because using alternative assets path hasn't been implemented yet
- cp "$srcdir/veloren-voxygen" "$pkgdir/usr/bin/"
+ cp -r "$srcdir/$pkgname/voxygen/shaders" "$pkgdir/usr/share/veloren/"
+ cp "$srcdir/$pkgname/target/release/voxygen" "$pkgdir/usr/bin/veloren-voxygen"
chmod +x "$pkgdir/usr/bin/veloren-voxygen"
cp "$srcdir/$pkgname/target/release/server-cli" "$pkgdir/usr/bin/veloren-server"
chmod +x "$pkgdir/usr/bin/veloren-server"
diff --git a/veloren-voxygen b/veloren-voxygen
deleted file mode 100644
index a683cf218d8..00000000000
--- a/veloren-voxygen
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /usr/share/veloren/voxygen
-exec /usr/share/veloren/voxygen/voxygen "$@"