Updated to 0.4.10.2

1 files changed, 38 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 16d49fc..e61e30f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
-# Maintainer (AUR): Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer (Arch): George Rawlinson <grawlinson@archlinux.org>
+# Contributor: (AUR): Dimitris Kiziridis <ragouel at outlook dot com>
 # Contributor (AUR): Christian Krause ("wookietreiber") <christian.krause@mailbox.org>
 
 # # I maintain this because:
@@ -7,35 +8,46 @@
 
 _isaarch64=0
 pkgname=freeorion
-pkgver=0.4.10.1
-pkgrel=1.2
-pkgdesc='A free, Open Source, turn-based space empire and galactic conquest computer game'
-url='https://www.freeorion.org/'
-arch=('i686' 'x86_64' 'aarch64')
+pkgver=0.4.10.2
+pkgrel=2
+pkgdesc='A turn-based space empire and galactic conquest game'
+url='https://www.freeorion.org'
+arch=('x86_64' 'i686' 'aarch64')
 license=('GPL2')
-depends=('boost-libs'
-         'python'
-         'sdl2'
-         'libvorbis'
-         'glew'
-         'openal'
-         'hicolor-icon-theme'
-         'freetype2')
-makedepends=('boost' 'cmake')
+depends=(
+  'boost-libs'
+  'python'
+  'sdl2'
+  'libvorbis'
+  'glew'
+  'openal'
+  'hicolor-icon-theme'
+  'freetype2'
+)
+makedepends=(
+  'cmake'
+  'boost'
+)
 conflicts=('freeorion-git' 'freeorion-bin')
-if [ "${_isaarch64}" == "1" ]; then
+#if [ "${_isaarch64}" == "1" ]; then
   options=(!makeflags)
-fi
+#fi
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/freeorion/freeorion/archive/v${pkgver}.tar.gz")
-b2sums=('d24c481e7be6f718897bb095209673f24cb7d43842f148cf1e8665254970d22449bf7a4ee4ba7a8cb3b5b515d6bed38a24e2862810959a63b29ba9d3c054e6c4')
+sha512sums=('13832992efe17fe48615ccdf284d1e9f391c35ed518abd15276992128a02894f4b30c8fe3d950e41935efb823cf834dc430330f0bcc6c9e91f13a3dea9812628')
+b2sums=('4f707b5296bdbc05b2b775b62f0393d1770bcf64c48f08d3332fbbb4b78e1bdc3e8111a1e421a8d0f0e03ca7454bba981809b9486d3d803e39faf042f1145059')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir -p build
+
+  cmake \
+    -B build \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   # PIE breaks compiling
   # aarch64 is prone to oom
 if [ "${_isaarch64}" == "1" ]; then
@@ -43,21 +55,16 @@ if [ "${_isaarch64}" == "1" ]; then
   export CXXFLAGS="$(echo $CXXFLAGS | sed 's/ -pipe//' - )"
   export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=1"
   export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=1"
-else
-  export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=4"
-  export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=4"
+#else
+  #export CFLAGS="$CFLAGS -O3 -fstack-protector-all -flto=auto"
+  #export CXXFLAGS="$CXXFLAGS -O3 -fstack-protector-all -flto=auto"
 fi
 
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    ..
-  make
+  cmake --build build
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"/build
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
 }