updpkg 0.66_beta1

2 files changed, 34 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 223e00d1dc62..64aad2d8a14f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = corsix-th
 	pkgdesc = Reimplementation of the game engine of Theme Hospital
-	pkgver = 0.65.1
+	pkgver = 0.66_beta1
 	pkgrel = 1
 	url = https://github.com/CorsixTH/CorsixTH
 	install = corsix-th.install
@@ -11,6 +11,7 @@ pkgbase = corsix-th
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = doxygen
+	depends = freetype2
 	depends = lua
 	depends = lua-lpeg
 	depends = lua-filesystem
@@ -18,11 +19,7 @@ pkgbase = corsix-th
 	depends = ffmpeg
 	optdepends = freepats-legacy: Soundfont for Midi playback
 	optdepends = soundfont-fluid: Alternative soundfont for Midi playback
-	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
+	source = corsix-th-0.66-beta1.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.66-beta1.tar.gz
+	sha256sums = fcbd6b8e18f9aa587c22a8621c710d1719748acecc8988765cab6a9da1c9299c
 
 pkgname = corsix-th
diff --git a/PKGBUILD b/PKGBUILD
index 66cbeefdc8cd..ddb18bcbc12e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,38 +4,56 @@
 # Contributors: jdc, rayman2200, TheCycoONE
 
 pkgname=corsix-th
-pkgver=0.65.1
+pkgver=0.66_beta1
+_tagver=0.66-beta1
 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' 'doxygen')
-depends=('lua' 'lua-lpeg' 'lua-filesystem' 'sdl2_mixer' 'ffmpeg')
+depends=('freetype2' '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"
-        https://github.com/CorsixTH/CorsixTH/raw/95be4c96810818d05b668c373711cd8f38d4e8b4/CorsixTH/Src/th_movie.{cpp,h})
-sha256sums=('b8a1503371fa0c0f3d07d3b39a3de2769b8ed25923d0d931b7075bc88e3f508f'
-            '0c43f4546b6a3e812257c11ef3199c935a96a471f2ed1f37c4a3baa7f25596a6'
-            '9b0c6a786d0697edc3569cfa8d59a8a0ad60d10f4c1eb0b038a77e181f823a22')
+source=("$pkgname-$_tagver.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v$_tagver.tar.gz")
+sha256sums=('fcbd6b8e18f9aa587c22a8621c710d1719748acecc8988765cab6a9da1c9299c')
 
 prepare() {
-  rm -rf build
-  mkdir build
+  printf 'Checking if ccache is enabled for makepkg... '
 
-  ln -s -f "$srcdir"/th_movie.{cpp,h} "$srcdir/CorsixTH-$pkgver/CorsixTH/Src/"
+  if check_buildoption "ccache" "y"; then
+    printf 'yes\n'
+    printf 'Enabling C++ ccache for CMake...\n'
+    export CMAKE_CXX_COMPILER_LAUNCHER='ccache'
+  else
+    printf 'no\n'
+  fi
+
+  printf 'Configuring build with CMake...\n\n'
+  export CXXFLAGS+=" ${CPPFLAGS}" # CMake ignores CPPFLAGS
+
+  cmake -S "CorsixTH-$_tagver" \
+        -B build \
+        -G Ninja \
+        -Wno-dev \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_EXE_LINKER_FLAGS_INIT="${LDFLAGS}" \
+        -DCMAKE_SHARED_LINKER_FLAGS_INIT="${LDFLAGS}" \
+        -DCMAKE_MODULE_LINKER_FLAGS_INIT="${LDFLAGS}" \
+        -DWITH_FREETYPE2=ON
 }
 
 build() {
-  cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -Wno-dev \
-        -DCMAKE_INSTALL_PREFIX=/usr "CorsixTH-$pkgver"
+  printf 'Building with CMake...\n\n'
   cmake --build build
 }
 
 package() {
+  printf 'Installing with CMake...\n\n'
   DESTDIR="$pkgdir/" cmake --install build
+
   # license
   install -d "$pkgdir/usr/share/licenses/$pkgname"
   ln -s /usr/share/corsix-th/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/"