Update to r7614.8c77f0488-1

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07c84b7e92ca..080a8b4f9ba4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,15 @@
 pkgbase = vcmi-git
 	pkgdesc = Open-source engine for Heroes of Might and Magic III
-	pkgver = r6865.feba7e19
+	pkgver = r7614.8c77f0488
 	pkgrel = 1
 	url = http://vcmi.eu
 	install = vcmi-git.install
 	arch = i686
 	arch = x86_64
+	arch = arm
+	arch = armv7h
+	arch = armv6h
+	arch = aarch64
 	license = GPL2
 	makedepends = boost
 	makedepends = cmake
diff --git a/PKGBUILD b/PKGBUILD
index ed50dddcdb60..abab48c8ae0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Raziel23 <venom23 at runbox dot com>
 
 pkgname=vcmi-git
-pkgver=r6865.feba7e19
+pkgver=r7614.8c77f0488
 pkgrel=1
 pkgdesc="Open-source engine for Heroes of Might and Magic III"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64')
 url="http://vcmi.eu"
 license=('GPL2')
 depends=('boost-libs' 'ffmpeg' 'sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'qt5-base' 'libxkbcommon-x11'
@@ -20,11 +20,6 @@ install="$pkgname.install"
 source=("$pkgname::git+https://github.com/vcmi/vcmi.git#branch=develop")
 md5sums=('SKIP')
 
-prepare() {
-  sed -i 's,Exec=,Exec=env LD_LIBRARY_PATH=/usr/lib/vcmi ,g' "${srcdir}/${pkgname}"/client/icons/vcmiclient.desktop
-  sed -i 's,Exec=,Exec=env LD_LIBRARY_PATH=/usr/lib/vcmi ,g' "${srcdir}/${pkgname}"/launcher/vcmilauncher.desktop
-}
-
 pkgver() {
   cd "$pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -32,9 +27,11 @@ pkgver() {
 
 build() {
   cd "${srcdir}/${pkgname}"
-  cmake \
+  mkdir -p build && cd build
+  cmake -B. -H.. \
     -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_INSTALL_LIBDIR='lib' \
+    -DCMAKE_INSTALL_RPATH='/usr/lib/vcmi' \
+    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
     -DCMAKE_SKIP_RPATH='FALSE' \
     -DENABLE_TEST=OFF \
     -DFORCE_BUNDLED_FL=OFF \