[upd] 0.40→0.50

4 files changed, 47 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27c376031b74..f9c25ed34734 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = corsix-th
 	pkgdesc = Reimplementation of the game engine of Theme Hospital
-	pkgver = 0.40
+	pkgver = 0.50
 	pkgrel = 1
-	url = https://github.com/CorsixTH/CorsixTH/
+	url = https://github.com/CorsixTH/CorsixTH
+	install = corsix-th.install
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = MIT
 	makedepends = cmake
-	depends = lua51
-	depends = sdl_mixer
+	depends = lua
+	depends = lua-lpeg
+	depends = lua-filesystem
+	depends = sdl2_mixer
 	depends = ffmpeg
 	depends = timidity-freepats
-	source = https://github.com/CorsixTH/CorsixTH/archive/v0.40.tar.gz
-	source = bin
-	sha1sums = 2e88e319f8c73e83068c8db08f1598cc097b2b27
-	sha1sums = 7fd6ae8db366b7f9c4671708e8ea7beb48f1bea3
+	source = corsix-th-0.50.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.50.tar.gz
+	source = corsix-th.sh
+	sha256sums = 822cb5b4a4ec863ba410b6a37e456b360516b2362337532689070e4555c037ee
+	sha256sums = 3614197a30498774fff4055ee54d82a812a8b88eba353b70c3288a09ff700158
 
 pkgname = corsix-th
 
diff --git a/PKGBUILD b/PKGBUILD
index eb8d186db9aa..4c05801a1080 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,44 @@
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Contributors: jdc, rayman2200
 
 pkgname=corsix-th
-pkgver=0.40
+pkgver=0.50
 pkgrel=1
 pkgdesc='Reimplementation of the game engine of Theme Hospital'
-url='https://github.com/CorsixTH/CorsixTH/'
+url='https://github.com/CorsixTH/CorsixTH'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
 makedepends=('cmake')
-depends=('lua51' 'sdl_mixer' 'ffmpeg' 'timidity-freepats')
-source=("${url}archive/v${pkgver}.tar.gz"
-        'bin')
-sha1sums=('2e88e319f8c73e83068c8db08f1598cc097b2b27'
-          '7fd6ae8db366b7f9c4671708e8ea7beb48f1bea3')
+depends=('lua' 'lua-lpeg' 'lua-filesystem' 'sdl2_mixer' 'ffmpeg' 'timidity-freepats')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::"https://github.com/CorsixTH/CorsixTH/archive/v$pkgver.tar.gz"
+        "$pkgname.sh")
+sha256sums=('822cb5b4a4ec863ba410b6a37e456b360516b2362337532689070e4555c037ee'
+            '3614197a30498774fff4055ee54d82a812a8b88eba353b70c3288a09ff700158')
 
-# If you do not have a copy of Theme Hospital,
-# you can download the data files of the demo:
-#   http://th.corsix.org/Demo.zip
+prepare() {
+  # fix location in .desktop entry
+  cp -up CorsixTH-$pkgver/DebianPackage/usr/share/applications/CorsixTH.desktop $pkgname.desktop
+  sed 's/games/share/g' -i $pkgname.desktop
+}
 
 build() {
-	cd "${srcdir}/CorsixTH-${pkgver}"
-	cmake \
-		-D LUA_INCLUDE_DIR=/usr/include/lua5.1 \
-		-D LUA_LIBRARY=/usr/lib/liblua5.1.so \
-		-D CMAKE_INSTALL_PREFIX=/usr/share/ \
-		-D CMAKE_BUILD_TYPE=Release \
-		-Wno-dev .
-	cd CorsixTH
-	make
+  cd CorsixTH-$pkgver
+
+  cmake -DCMAKE_BUILD_TYPE=Release -Wno-dev \
+        -DLUA_PROGRAM_PATH=/usr/bin/lua -DLUA_INCLUDE_DIR=/usr/include -DLUA_LIBRARY=/usr/lib/liblua.so \
+        -DCMAKE_INSTALL_PREFIX=/usr/share/ .
+  cd CorsixTH
+  make
 }
 
 package() {
-	cd "${srcdir}/CorsixTH-${pkgver}/CorsixTH"
-	make DESTDIR="${pkgdir}" install
-	install -Dm755 ../../bin "${pkgdir}/usr/bin/CorsixTH"
-	install -Dm644 ../LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 ../DebianPackage/usr/share/applications/CorsixTH.desktop "${pkgdir}/usr/share/applications/CorsixTH.desktop"
-	sed -e 's/games/share/g' -i "${pkgdir}/usr/share/applications/CorsixTH.desktop"
+  make -C CorsixTH-$pkgver/CorsixTH DESTDIR="$pkgdir/" install
+  # launcher
+  install -Dm0755 $pkgname.sh "$pkgdir"/usr/bin/CorsixTH
+  # license
+  install -Dm0644 CorsixTH-$pkgver/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  # .desktop integration
+  install -Dm0644 $pkgname.desktop "$pkgdir"/usr/share/applications/CorsixTH.desktop
 }
diff --git a/corsix-th.install b/corsix-th.install
new file mode 100644
index 000000000000..f8f0a14586ba
--- /dev/null
+++ b/corsix-th.install
@@ -0,0 +1,6 @@
+
+post_install() {
+  echo "=> If you do not have a copy of Theme Hospital,"
+  echo "=> you can download the data files of the demo:"
+  echo "=> http://th.corsix.org/Demo.zip"
+}
diff --git a/bin b/corsix-th.sh
index 545bab32e5d6..545bab32e5d6 100644
--- a/bin
+++ b/corsix-th.sh