Updated to 4.1

3 files changed, 43 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2b6d5da629a..00da4a572735 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,27 @@
 pkgbase = godot-voxel
-	pkgdesc = An advanced, feature packed, multi-platform 2D and 3D game engine
-	pkgver = 3.2.3
+	pkgdesc = The Godot game engine with Zylann's voxel tools module
+	pkgver = 4.1.0
 	pkgrel = 1
-	url = http://www.godotengine.org
+	url = https://voxel-tools.readthedocs.io/en/latest/
 	arch = x86_64
 	license = MIT
 	makedepends = scons
 	makedepends = gcc
-	makedepends = yasm
+	depends = pkgconf
 	depends = libxcursor
 	depends = libxinerama
-	depends = freetype2
-	depends = alsa-lib
-	depends = libxrandr
 	depends = libxi
+	depends = libxrandr
+	depends = mesa
+	depends = glu
 	depends = libglvnd
-	conflicts = godot
-	conflicts = godot-git
-	conflicts = godot-pulse
-	source = https://github.com/godotengine/godot/archive/3.2.3-stable.tar.gz
-	source = https://github.com/Zylann/godot_voxel/archive/godot3.2.3.zip
-	sha256sums = 4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae
-	sha256sums = c8b212909961fd398b417b7562d6c483975ccc9cb2649660c4f95f438907acf5
+	depends = alsa-lib
+	depends = pulseaudio
+	source = godot::git+https://github.com/godotengine/godot.git
+	source = godot_voxel::git+https://github.com/Zylann/godot_voxel.git
+	source = godot-voxel.desktop
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = godot-voxel
diff --git a/PKGBUILD b/PKGBUILD
index 2e500c3d4302..1716cdcb9ee6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,43 @@
-# Maintainer: dalz <aur @t alsd d0t eu>
+# Maintainer: PerilousBooklet <raffaele.orabona at protonmail dot com>
+# Contributor: dalz <aur @t alsd d0t eu>
 # Contributor: Jorge Araya Navarro <jorgejavieran@yahoo.com.mx>
 # Contributor: Cristian Porras <porrascristian@gmail.com>
 # Contributor: Matthew Bentley <matthew@mtbentley.us>
  
 pkgname=godot-voxel
-pkgver=3.2.3
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="An advanced, feature packed, multi-platform 2D and 3D game engine"
-url="http://www.godotengine.org"
+pkgdesc="The Godot game engine with Zylann's voxel tools module"
+url="https://voxel-tools.readthedocs.io/en/latest/"
 license=('MIT')
 arch=('x86_64')
-makedepends=('scons' 'gcc' 'yasm')
-depends=('libxcursor' 'libxinerama' 'freetype2' 'alsa-lib' 'libxrandr' 'libxi' 'libglvnd')
-conflicts=("godot" "godot-git" "godot-pulse")
-source=("https://github.com/godotengine/godot/archive/${pkgver}-stable.tar.gz"
-        "https://github.com/Zylann/godot_voxel/archive/godot${pkgver}.zip")
-sha256sums=('4c2a8e7da1ad05c6223b0ff6cf2be124dad6708b56a8ec9910dc2aaf82a553ae'
-            'c8b212909961fd398b417b7562d6c483975ccc9cb2649660c4f95f438907acf5')
+makedepends=('scons' 'gcc')
+depends=('pkgconf' 'libxcursor' 'libxinerama' 'libxi' 'libxrandr' 'mesa' 'glu' 'libglvnd' 'alsa-lib' 'pulseaudio')
+source=("godot::git+https://github.com/godotengine/godot.git"
+        "godot_voxel::git+https://github.com/Zylann/godot_voxel.git"
+        "godot-voxel.desktop" )
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP')
 
-build() {
-ln -s "$srcdir/godot_voxel-godot$pkgver" "$srcdir/godot-$pkgver-stable/modules/voxel"
-
-cd "${srcdir}/godot-${pkgver}-stable"
+prepare() {
+  cd "${srcdir}" 
+  ln -s "$srcdir/godot_voxel" "$srcdir/godot/modules/voxel"
+}
 
-scons platform=x11 \
-      tools=yes \
-      target=release_debug \
-      use_llvm=no \
-      colored=yes \
-      pulseaudio=no \
-      bits=64 -j $((`nproc`+1))
+build() { 
+  cd "${srcdir}/godot"
+  scons platform=linuxbsd colored=yes
 }
 
 package() {
-  cd "${srcdir}"
-  
-  install -Dm644 "${srcdir}"/godot-${pkgver}-stable/misc/dist/linux/org.godotengine.Godot.desktop "${pkgdir}"/usr/share/applications/godot.desktop
-  install -Dm644 "${srcdir}"/godot-${pkgver}-stable/icon.svg "${pkgdir}"/usr/share/pixmaps/godot.svg
-
-  cd "${srcdir}"/godot-${pkgver}-stable
+  cd ${srcdir}
+  install -Dm644 ${srcdir}/godot-voxel.desktop "${pkgdir}"/usr/share/applications/godot-voxel.desktop
+  install -Dm644 "${srcdir}"/godot/icon.svg "${pkgdir}"/usr/share/pixmaps/godot-voxel.svg
 
-  install -D -m755 bin/godot.x11.opt.tools.64 "${pkgdir}"/usr/bin/godot
-  install -D -m644 "${srcdir}"/godot-${pkgver}-stable/LICENSE.txt "${pkgdir}"/usr/share/licenses/godot/LICENSE
-  install -D -m644 "${srcdir}"/godot-${pkgver}-stable/misc/dist/linux/godot.6 "${pkgdir}"/usr/share/man/man6/godot.6
+  cd "${srcdir}"/godot
+  install -D -m755 ./bin/godot.linuxbsd.editor.x86_64 "${pkgdir}"/usr/bin/godot-voxel
+  #install -D -m644 "${srcdir}"/godot/LICENSE.txt "${pkgdir}"/usr/share/licenses/godot/LICENSE
+  #install -D -m644 "${srcdir}"/godot/misc/dist/linux/godot.6 "${pkgdir}"/usr/share/man/man6/godot.6
 }
 
diff --git a/godot-voxel.desktop b/godot-voxel.desktop
index 3d5aebb345f9..5e051760ee45 100644
--- a/godot-voxel.desktop
+++ b/godot-voxel.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Godot Voxel
-Comment=The Godot game engine with Zylann's voxel tools module
+Comment=The Godot game engine with Zylann's voxel tools module.
 Exec=/usr/bin/godot-voxel %U
 Icon=godot
 Terminal=false