summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMckol2018-11-25 22:56:04 +0100
committerMckol2018-11-25 22:56:04 +0100
commit723c17cdef251dc0958e0da3e8198729b0fe023e (patch)
tree13b8a8a70d04de1db3bb45fe780c3fb8a7cded7e
parent274081f96df788d7b83b13e6d735bf8f9def4ac8 (diff)
downloadaur-723c17cdef251dc0958e0da3e8198729b0fe023e.tar.gz
Updated assets repositories, added desktop entry with an icon
Thanks to Pfauenauge for creating the icon
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD45
-rw-r--r--voxygen.desktop10
-rw-r--r--voxygen.pngbin0 -> 24625 bytes
4 files changed, 54 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b4de6454429..eda5e7db9ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = veloren-git
pkgdesc = An open-world, open-source multiplayer voxel RPG
- pkgver = 0.1.0.r259.37af884
+ pkgver = 0.1.0.r375.e777671
pkgrel = 1
url = https://veloren.net/
arch = x86_64
@@ -11,13 +11,21 @@ pkgbase = veloren-git
depends = bash
provides = veloren-git
conflicts = veloren-git
- noextract = veloren-voxygen
+ noextract = voxygen.desktop
+ noextract = voxygen.png
+ options = !strip
source = veloren-git::git+https://gitlab.com/veloren/game.git
- source = assets::git+https://gitlab.com/veloren/assets/voxygen.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
- md5sums = SKIP
- md5sums = SKIP
- md5sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = 79950e7d39b1a14a7b218b0da9abe723dffc7a37421fb76e86446e1993e09bf037559803b4825a8c083d2fdb7a85c96c971f5e6eacf690fffec462673a6b24e7
+ sha512sums = b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94
+ sha512sums = 1387388591034f5084ddd495721dae9dde7cf480212fe805e0edceeb0a5f8ef0c394728f71b190f837a1cb3d27b3296f744b4bbc4aab3290bf70769e7ca1cb88
pkgname = veloren-git
diff --git a/PKGBUILD b/PKGBUILD
index 95c59f4b1b7..868b8a09cef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
# Maintainer: Mckol <mckol363@gmail.com>
-pkgname=veloren-git
-pkgver=0.1.0.r259.37af884
+pkgname=veloren-git
+pkgver=0.1.0.r375.e777671
pkgrel=1
pkgdesc="An open-world, open-source multiplayer voxel RPG"
arch=('x86_64' 'i686')
url="https://veloren.net/"
license=('GPL3')
+options=('!strip')
depends=('bash')
makedepends=(
'git'
@@ -16,44 +17,58 @@ provides=("$pkgname")
conflicts=("$pkgname")
source=(
"$pkgname::git+https://gitlab.com/veloren/game.git"
- "assets::git+https://gitlab.com/veloren/assets/voxygen.git"
+ "assets_voxygen::git+https://gitlab.com/veloren/assets/voxygen.git"
+ "assets_world::git+https://gitlab.com/veloren/assets/world.git"
+ "voxygen.desktop"
+ "voxygen.png"
"veloren-voxygen"
)
-noextract=("veloren-voxygen")
-md5sums=('SKIP' 'SKIP' 'SKIP')
-
+noextract=("voxygen.desktop" "voxygen.png")
+sha512sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ '79950e7d39b1a14a7b218b0da9abe723dffc7a37421fb76e86446e1993e09bf037559803b4825a8c083d2fdb7a85c96c971f5e6eacf690fffec462673a6b24e7'
+ 'b5e5cbf28ab0e335f5a0fc93511fc9936360432a36e35cc876761601abacf257299deb0af6b3d9081143b700f6663c4f603970155dd4dacedb7a9672cde1dc94'
+ '1387388591034f5084ddd495721dae9dde7cf480212fe805e0edceeb0a5f8ef0c394728f71b190f837a1cb3d27b3296f744b4bbc4aab3290bf70769e7ca1cb88')
pkgver() {
cd "$srcdir/$pkgname"
git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g;s/v//'
}
prepare() {
- cd "$srcdir/$pkgname/voxygen"
- git submodule init assets
- git config submodule.voxygen/assets.url "$srcdir/assets"
+ cd "$srcdir/$pkgname"
+ git submodule init assets/world
+ git submodule init assets/voxygen
+ git config submodule.assets/voxygen.url "$srcdir/assets_voxygen"
+ git config submodule.assets/world.url "$srcdir/assets_world"
git submodule update
}
build() {
+ rustup toolchain install nightly
+ _original_toolchain="$(rustup show active-toolchain)"
rustup default nightly
cd "$srcdir/$pkgname/voxygen"
cargo build --release
cd "$srcdir/$pkgname/server-cli"
- 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/bin"
- cp -r "$srcdir/$pkgname/voxygen/assets" "$pkgdir/usr/share/veloren/voxygen/assets"
- cp -r "$srcdir/$pkgname/voxygen/shaders" "$pkgdir/usr/share/veloren/voxygen/shaders"
- cp "$srcdir/$pkgname/target/release/voxygen" "$pkgdir/usr/share/veloren/voxygen/voxygen"
+ 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/"
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"
-
+ cp "$srcdir/voxygen.desktop" "$pkgdir/usr/share/applications/veloren/"
+ cp "$srcdir/voxygen.png" "$pkgdir/usr/share/pixmaps/"
}
diff --git a/voxygen.desktop b/voxygen.desktop
new file mode 100644
index 00000000000..6adb4af4dc0
--- /dev/null
+++ b/voxygen.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.2
+Type=Application
+Name=Voxygen
+Comment=Official Veloren Client
+Exec=veloren-voxygen
+Categories=Game
+Keywords=veloren
+Terminal=true
+Icon=voxygen.png
diff --git a/voxygen.png b/voxygen.png
new file mode 100644
index 00000000000..51c297966bc
--- /dev/null
+++ b/voxygen.png
Binary files differ