[upd] 0.64→0.65.1, [fix] for ffmpeg 5.0

3 files changed, 25 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d9379c8dab0..f38825f5bb9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = corsix-th
 	pkgdesc = Reimplementation of the game engine of Theme Hospital
-	pkgver = 0.64
+	pkgver = 0.65.1
 	pkgrel = 1
 	url = https://github.com/CorsixTH/CorsixTH
 	install = corsix-th.install
@@ -10,15 +10,18 @@ pkgbase = corsix-th
 	license = MIT
 	makedepends = cmake
 	makedepends = ninja
-	depends = lua53
-	depends = lua53-lpeg
-	depends = lua53-filesystem
+	depends = lua
+	depends = lua-lpeg
+	depends = lua-filesystem
 	depends = sdl2_mixer
 	depends = ffmpeg
 	optdepends = freepats-legacy: Soundfont for Midi playback
 	optdepends = soundfont-fluid: Alternative soundfont for Midi playback
-	source = corsix-th-0.64.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.64.tar.gz
-	sha256sums = 12389a95de0031baec1a3fc77208d44228177f49564f1c79ae763ab4aeeafa98
+	source = corsix-th-0.65.1.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.65.1.tar.gz
+	source = https://github.com/CorsixTH/CorsixTH/raw/95be4c96810818d05b668c373711cd8f38d4e8b4/CorsixTH/Src/th_movie.cpp
+	source = https://github.com/CorsixTH/CorsixTH/raw/95be4c96810818d05b668c373711cd8f38d4e8b4/CorsixTH/Src/th_movie.h
+	sha256sums = b8a1503371fa0c0f3d07d3b39a3de2769b8ed25923d0d931b7075bc88e3f508f
+	sha256sums = 0c43f4546b6a3e812257c11ef3199c935a96a471f2ed1f37c4a3baa7f25596a6
+	sha256sums = 9b0c6a786d0697edc3569cfa8d59a8a0ad60d10f4c1eb0b038a77e181f823a22
 
 pkgname = corsix-th
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index e8dae1de6717..aea120a7b092 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,35 @@
-# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
+# Maintainer:  Marcell Meszaros < marcell.meszaros AT runbox.eu >
+# Contributor: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributors: jdc, rayman2200, TheCycoONE
 
 pkgname=corsix-th
-pkgver=0.64
+pkgver=0.65.1
 pkgrel=1
 pkgdesc='Reimplementation of the game engine of Theme Hospital'
 url='https://github.com/CorsixTH/CorsixTH'
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
 makedepends=('cmake' 'ninja')
-depends=('lua53' 'lua53-lpeg' 'lua53-filesystem' 'sdl2_mixer' 'ffmpeg')
+depends=('lua' 'lua-lpeg' 'lua-filesystem' 'sdl2_mixer' 'ffmpeg')
 optdepends=('freepats-legacy: Soundfont for Midi playback'
             'soundfont-fluid: Alternative soundfont for Midi playback')
 install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::"https://github.com/CorsixTH/CorsixTH/archive/v$pkgver.tar.gz")
-sha256sums=('12389a95de0031baec1a3fc77208d44228177f49564f1c79ae763ab4aeeafa98')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v$pkgver.tar.gz"
+        https://github.com/CorsixTH/CorsixTH/raw/95be4c96810818d05b668c373711cd8f38d4e8b4/CorsixTH/Src/th_movie.{cpp,h})
+sha256sums=('b8a1503371fa0c0f3d07d3b39a3de2769b8ed25923d0d931b7075bc88e3f508f'
+            '0c43f4546b6a3e812257c11ef3199c935a96a471f2ed1f37c4a3baa7f25596a6'
+            '9b0c6a786d0697edc3569cfa8d59a8a0ad60d10f4c1eb0b038a77e181f823a22')
 
 prepare() {
   rm -rf th
   mkdir th
+
+  ln -s -f $srcdir/th_movie.{cpp,h} "$srcdir/CorsixTH-$pkgver/CorsixTH/Src/"
 }
 
 build() {
   cmake -B th -G Ninja -DCMAKE_BUILD_TYPE=Release -Wno-dev \
-        -DLUA_INCLUDE_DIR=/usr/include/lua5.3 -DLUA_LIBRARY=/usr/lib/liblua5.3.so \
         -DCMAKE_INSTALL_PREFIX=/usr CorsixTH-$pkgver
   cmake --build th
 }