Update to version 2.0.0.2 (Director's Cut)

3 files changed, 46 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c676977348f8..3af86b773f52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,41 @@
 pkgbase = wasteland2
-	pkgdesc = The sequel to an adventure in post-nuclear America
-	pkgver = 1.9.0.13
+	pkgdesc = The Director's Cut of the sequel to an adventure in post-nuclear America
+	pkgver = 2.0.0.2
 	pkgrel = 1
 	url = https://wasteland.inxile-entertainment.com/store
 	arch = i686
 	arch = x86_64
 	license = custom:commercial
-	depends = glibc
-	depends = glu
-	depends = libx11
-	depends = libxau
-	depends = libxcb
-	depends = libxcursor
-	depends = libxdmcp
-	depends = libxext
-	depends = libxfixes
-	depends = libxrandr
-	depends = libxrender
-	depends = libgl
+	noextract = gog_wasteland_2_director_s_cut_2.0.0.2.sh
 	source = wasteland2.desktop
-	source = gog_wasteland_2_1.9.0.13.tar.gz::file://gog_wasteland_2_1.9.0.13.tar.gz
+	source = gog_wasteland_2_director_s_cut_2.0.0.2.sh::file://gog_wasteland_2_director_s_cut2.0.0.2.sh
 	sha256sums = 1400b3e11c34cbfc57e3b5cba9501a3319ddb57f066d9d09bb7799a59fb0efc0
-	sha256sums = 0f6bf4f806de3233a11ec1049f96d779f8d013dc38f296d101466701fa931728
+	sha256sums = 6c0a7d606bd8677c999d2b546d9a0f474cfbfe9c7d7eb882d458e6a77f738430
+	depends_i686 = glibc
+	depends_i686 = glu
+	depends_i686 = libx11
+	depends_i686 = libxau
+	depends_i686 = libxcb
+	depends_i686 = libxcursor
+	depends_i686 = libxdmcp
+	depends_i686 = libxext
+	depends_i686 = libxfixes
+	depends_i686 = libxrandr
+	depends_i686 = libxrender
+	depends_i686 = libgl
+	depends_x86_64 = lib32-gcc-libs
+	depends_x86_64 = lib32-glibc
+	depends_x86_64 = lib32-glu
+	depends_x86_64 = lib32-libx11
+	depends_x86_64 = lib32-libxau
+	depends_x86_64 = lib32-libxcb
+	depends_x86_64 = lib32-libxcursor
+	depends_x86_64 = lib32-libxdmcp
+	depends_x86_64 = lib32-libxext
+	depends_x86_64 = lib32-libxfixes
+	depends_x86_64 = lib32-libxrandr
+	depends_x86_64 = lib32-libxrender
+	depends_x86_64 = lib32-libgl
 
 pkgname = wasteland2
 
diff --git a/.gitignore b/.gitignore
index b217312934a0..a0ccd852e505 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.swp
+*.sh
 *.tar.gz
 *.tar.xz
 *.tar
diff --git a/PKGBUILD b/PKGBUILD
index a38f8c34ca44..b9e2748a2cf7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,29 @@
 # Maintainer: Alex Szczuczko <alex@szc.ca>
 
 pkgname=wasteland2 #-gog ???
-pkgver=1.9.0.13
+pkgver=2.0.0.2
 pkgrel=1
-pkgdesc="The sequel to an adventure in post-nuclear America"
+pkgdesc="The Director's Cut of the sequel to an adventure in post-nuclear America"
 arch=("i686" "x86_64")
 url="https://wasteland.inxile-entertainment.com/store"
 license=("custom:commercial")
-depends=()
+depends_x86_64=('lib32-gcc-libs' 'lib32-glibc' 'lib32-glu' 'lib32-libx11' 'lib32-libxau' 'lib32-libxcb' 'lib32-libxcursor' 'lib32-libxdmcp' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxrandr' 'lib32-libxrender' 'lib32-libgl')
+depends_i686=('glibc' 'glu' 'libx11' 'libxau' 'libxcb' 'libxcursor' 'libxdmcp' 'libxext' 'libxfixes' 'libxrandr' 'libxrender' 'libgl')
 source=("${pkgname}.desktop"
-        "gog_wasteland_2_${pkgver}.tar.gz::file://gog_wasteland_2_${pkgver}.tar.gz")
+        "gog_wasteland_2_director_s_cut_${pkgver}.sh::file://gog_wasteland_2_director_s_cut${pkgver}.sh")
+# bsdtar doesn't seem to like this .sh
+noextract=("gog_wasteland_2_director_s_cut_${pkgver}.sh")
 sha256sums=("1400b3e11c34cbfc57e3b5cba9501a3319ddb57f066d9d09bb7799a59fb0efc0"
-            "0f6bf4f806de3233a11ec1049f96d779f8d013dc38f296d101466701fa931728")
-
-# Modify depends for the arch type
-if [ "$CARCH" = "x86_64" ]
-then
-    depends+=('lib32-gcc-libs' 'lib32-glibc' 'lib32-glu' 'lib32-libx11' 'lib32-libxau' 'lib32-libxcb' 'lib32-libxcursor' 'lib32-libxdmcp' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxrandr' 'lib32-libxrender' 'lib32-libgl')
-else
-    depends+=('glibc' 'glu' 'libx11' 'libxau' 'libxcb' 'libxcursor' 'libxdmcp' 'libxext' 'libxfixes' 'libxrandr' 'libxrender' 'libgl')
-fi
+            "6c0a7d606bd8677c999d2b546d9a0f474cfbfe9c7d7eb882d458e6a77f738430")
 
 # Disable compression of the package
 PKGEXT='.pkg.tar'
 
+prepare() {
+    unzip -qd "$srcdir" "$srcdir/gog_wasteland_2_director_s_cut_${pkgver}.sh" || true
+    mv "$srcdir/data/noarch" "$srcdir/Wasteland 2"
+}
+
 package() {
     # Binaries
     install -Dm755 "$srcdir/Wasteland 2/game/WL2" "$pkgdir/opt/$pkgname/game/WL2"
@@ -41,7 +41,7 @@ package() {
 
     # Icon
     install -m755 -d "$pkgdir/opt/$pkgname/"
-    install -m644 -t "$pkgdir/opt/$pkgname/" "$srcdir/Wasteland 2/support/gog-wasteland-2.png"
+    install -m644 -t "$pkgdir/opt/$pkgname/" "$srcdir/Wasteland 2/support/icon.png"
 
     #
     # System integration
@@ -57,7 +57,7 @@ package() {
 
     # Icon
     install -m755 -d "$pkgdir/usr/share/pixmaps/"
-    ln -s "/opt/$pkgname/gog-wasteland-2.png" "$pkgdir/usr/share/pixmaps/${pkgname}.png"
+    ln -s "/opt/$pkgname/icon.png" "$pkgdir/usr/share/pixmaps/${pkgname}.png"
 
     # .desktop File
     install -m755 -d "$pkgdir/usr/share/applications/"