revision

2 files changed, 26 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75687f1e695b..8560bd064000 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openage-git
 	pkgdesc = A free (as in freedom) clone of the Age of Empires II engine
-	pkgver = 0.4.1.r739.g3efa24aef
+	pkgver = 0.4.1.r1397.g3acf3d6b4
 	pkgrel = 1
 	url = https://openage.sft.mx/
 	arch = x86_64
@@ -17,26 +17,28 @@ pkgbase = openage-git
 	makedepends = doxygen
 	makedepends = vulkan-headers
 	makedepends = python-graphviz
+	makedepends = python-lz4
+	makedepends = eigen
+	makedepends = toml11
+	depends = glibc
+	depends = gcc-libs
+	depends = python
 	depends = libepoxy
-	depends = ftgl
 	depends = sdl2_image
 	depends = opusfile
-	depends = eigen
-	depends = qt5-declarative
-	depends = xdg-utils
+	depends = qt6-declarative
 	depends = sdl2
-	depends = qt5-quickcontrols
+	depends = vulkan-icd-loader
 	depends = libpng
 	depends = libogg
 	depends = python-pillow
 	depends = python-numpy
 	depends = python-toml
+	depends = python-mako
 	depends = python-pygments
 	depends = python-jinja
-	depends = python-lz4
-	depends = nyan-lang-git
+	depends = nyan-lang
 	optdepends = ttf-dejavu: for text display, but you can use any font
-	optdepends = vulkan-icd-loader
 	provides = openage
 	conflicts = openage
 	source = git+https://github.com/SFTtech/openage
diff --git a/PKGBUILD b/PKGBUILD
index 50721ea621e4..0699c10c9485 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,19 @@
 # Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
 pkgname=openage-git
-pkgver=0.4.1.r739.g3efa24aef
+pkgver=0.4.1.r1397.g3acf3d6b4
 pkgrel=1
 pkgdesc="A free (as in freedom) clone of the Age of Empires II engine"
 arch=(x86_64 i686 pentium4 arm armv6h armv7h aarch64)
 url="https://openage.sft.mx/"
 license=(GPL3)
-depends=(libepoxy ftgl sdl2_image opusfile eigen
-         qt5-declarative xdg-utils sdl2 qt5-quickcontrols
-         libpng libogg python-pillow python-numpy python-toml
-         python-pygments python-jinja python-lz4 nyan-lang-git)
-makedepends=(git cmake cython doxygen vulkan-headers python-graphviz)
-optdepends=('ttf-dejavu: for text display, but you can use any font'
-            vulkan-icd-loader)
+depends=(glibc gcc-libs python
+         libepoxy sdl2_image opusfile
+         qt6-declarative sdl2 vulkan-icd-loader
+         libpng libogg python-pillow python-numpy python-toml python-mako
+         python-pygments python-jinja nyan-lang) #xdg-utils ftgl
+makedepends=(git cmake cython doxygen vulkan-headers python-graphviz python-lz4 eigen toml11)
+optdepends=('ttf-dejavu: for text display, but you can use any font')
 provides=(openage)
 conflicts=(openage)
 source=("git+https://github.com/SFTtech/openage")
@@ -25,20 +25,15 @@ pkgver() {
   cd "${srcdir}/${pkgname%-git}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
-prepare() {
-  cd "${srcdir}/${pkgname%-git}"
-  install -d build
-}
+
 build() {
-  cd "${srcdir}/${pkgname%-git}/build"
+  cmake -B build -S "openage" -Wno-dev \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DCMAKE_INSTALL_PREFIX=/usr
 
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DCMAKE_BUILD_TYPE=Release
-  make
+  cmake --build build
 }
+
 package() {
-  cd "${srcdir}/${pkgname%-git}/build"
-  make DESTDIR="${pkgdir}/" install
+  DESTDIR="$pkgdir" cmake --install build
 }