opendiablo2: update

2 files changed, 38 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc1b12f9a15e..0fbf14658be7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opendiablo2-git
 	pkgdesc = An open source re-implementation of Diablo 2
-	pkgver = r486.515b667
+	pkgver = r1287.d5d93df7
 	pkgrel = 1
 	url = https://opendiablo2.com
 	install = opendiablo2.install
@@ -9,12 +9,12 @@ pkgbase = opendiablo2-git
 	license = GPL3
 	makedepends = go
 	makedepends = gendesk
-	depends = libxrandr
-	depends = libxinerama
-	depends = libxi
-	depends = sdl2
-	depends = sdl2_mixer
-	depends = sdl2_net
+	depends = alsa-lib
+	depends = libglvnd
+	depends = libx11
+	depends = libxcb
+	depends = libxau
+	depends = libxdmcp
 	provides = opendiablo2
 	source = opendiablo2::git+https://github.com/OpenDiablo2/OpenDiablo2
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fd337a1ca752..c9e8259db7bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,60 @@
-# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer: robertfoster
+# Contributor:  Dimitris Kiziridis <ragouel at outlook dot com>
 
 pkgname=opendiablo2-git
-pkgver=r486.515b667
+pkgver=r1287.d5d93df7
 pkgrel=1
 pkgdesc='An open source re-implementation of Diablo 2'
 arch=('i686' 'x86_64')
 url='https://opendiablo2.com'
 license=('GPL3')
 provides=('opendiablo2')
-depends=('libxrandr'
-         'libxinerama'
-         'libxi'
-         'sdl2'
-         'sdl2_mixer'
-         'sdl2_net')
+depends=(
+  'alsa-lib'
+  'libglvnd'
+  'libx11'
+  'libxcb'
+  'libxau'
+  'libxdmcp'
+)
 makedepends=('go' 'gendesk')
-install=opendiablo2.install
-source=("opendiablo2::git+https://github.com/OpenDiablo2/OpenDiablo2")
+install="${pkgname%-git}.install"
+source=("${pkgname%-git}::git+https://github.com/OpenDiablo2/OpenDiablo2")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/opendiablo2"
+  cd "${srcdir}/${pkgname%-git}"
   echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-  cd "${srcdir}/opendiablo2"
+  cd "${srcdir}/${pkgname%-git}"
   mkdir -p build/
 }
 
 build() {
-  cd "${srcdir}/opendiablo2"
+  cd "${srcdir}/${pkgname%-git}"
   export CGO_LDFLAGS="${LDFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
-  go build -o build ./...
+  go build
+
   gendesk -f -n \
-   --pkgname "opendiablo2" \
-   --pkgdesc "${pkgdesc}" \
-   --exec="opendiablo2" \
-   --categories=Game \
-   --icon opendiablo2
+    --pkgname "${pkgname%-git}" \
+    --pkgdesc "${pkgdesc}" \
+    --exec="${pkgname%-git}" \
+    --categories=Game \
+    --icon "${pkgname%-git}"
 }
 
 package() {
-  cd "${srcdir}/opendiablo2"
-  install -Dm644 opendiablo2.desktop "${pkgdir}/usr/share/applications/opendiablo2.desktop"
-  install -Dm755 build/OpenDiablo2 "${pkgdir}/usr/bin/opendiablo2"
-  install -Dm644 d2logo.png "${pkgdir}/usr/share/pixmaps/opendiablo2.png"
-}
\ No newline at end of file
+  cd "${srcdir}/${pkgname%-git}"
+  install -Dm644 "${pkgname%-git}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname%-git}.desktop"
+  install -Dm755 OpenDiablo2 \
+    "${pkgdir}/usr/bin/${pkgname%-git}"
+  install -Dm644 d2logo.png \
+    "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.png"
+}