Use bgfx-cmake-git from aur instead of building it here

2 files changed, 10 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b2e6849e428..3c8e1ce111f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openblack-git
 	pkgdesc = Open source reimplementation of the game Black & White (2001).
-	pkgver = r1012.b2a2147
+	pkgver = r1039.51cb468
 	pkgrel = 1
 	url = https://github.com/openblack/openblack
 	arch = x86_64
@@ -8,22 +8,16 @@ pkgbase = openblack-git
 	license = MIT
 	makedepends = git
 	makedepends = cmake
+	makedepends = bgfx-cmake-git
 	depends = fmt
 	depends = spdlog
 	depends = entt
 	depends = sdl2
 	depends = glm
+	depends = bgfx
 	provides = openblack
 	conflicts = openblack
 	source = git://github.com/openblack/openblack.git
-	source = git://github.com/openblack/bgfx.cmake.git
-	source = git://github.com/bkaradzic/bx.git
-	source = git://github.com/bkaradzic/bimg.git
-	source = git://github.com/openblack/bgfx.git
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = openblack-git
diff --git a/PKGBUILD b/PKGBUILD
index b3212a6a4b71..1d80bdbb9bcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,37 @@
 pkgname=openblack-git
-pkgver=r1012.b2a2147
+pkgver=r1039.51cb468
 pkgrel=1
 pkgdesc="Open source reimplementation of the game Black & White (2001)."
 arch=('x86_64')
 url="https://github.com/openblack/openblack"
 license=('GPL3' 'MIT')
 
-depends=('fmt' 'spdlog' 'entt' 'sdl2' 'glm')
-makedepends=('git' 'cmake')
+depends=('fmt' 'spdlog' 'entt' 'sdl2' 'glm' 'bgfx')
+makedepends=('git' 'cmake' 'bgfx-cmake-git')
 conflicts=("${pkgname%-git}")
 provides=("${pkgname%-git}")
 
 # TODO: After bgfx merges all openblack PRs,
 # Package and use bgfx instead of building it
-source=('git://github.com/openblack/openblack.git'
-        'git://github.com/openblack/bgfx.cmake.git'
-        'git://github.com/bkaradzic/bx.git'
-        'git://github.com/bkaradzic/bimg.git'
-        'git://github.com/openblack/bgfx.git')
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+source=('git://github.com/openblack/openblack.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-git}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd "${srcdir}/bgfx.cmake"
-  git config --file=.gitmodules submodule.bx.url "${srcdir}"/bx
-  git config --file=.gitmodules submodule.bimg.url "${srcdir}"/bimg
-  git config --file=.gitmodules submodule.bgfx.url "${srcdir}"/bgfx
-  git submodule sync
-  git submodule update --init
-}
-
 build() {
-  msg Building bgfx
-  cd "${srcdir}/bgfx.cmake"
-  cmake -DBGFX_BUILD_EXAMPLES=OFF \
-        -DCMAKE_INSTALL_PREFIX=install \
-        -DBGFX_CUSTOM_TARGETS=OFF \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo
-  cmake --build .
-  cmake --install .
-
-  msg Building openblack
   cd "${srcdir}/${pkgname%-git}"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -Dbgfx_DIR="${srcdir}/bgfx.cmake/install/lib/cmake/bgfx" \
         -DCMAKE_BUILD_TYPE=RelWithDebInfo
+        #-Dbgfx_DIR="/usr/lib/cmake/bgfx" \
   cmake --build .
 }
 
 package() {
   cd "${srcdir}/${pkgname%-git}"
-  make DESTDIR="$pkgdir" install
+  cmake --install . -v --strip --prefix "$pkgdir/usr"
 }
 
 # vim:set ts=2 sw=2 et: