From acc4fd8786b4139460da14beeccb0de98af369c7 Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Thu, 11 Nov 2021 20:27:24 +0100 Subject: [PATCH] OpenTTD: update to 12.0 --- srcpkgs/openttd/patches/add_gfx.patch | 12 +++++ .../patches/disable_regression_tests.patch | 7 +++ srcpkgs/openttd/template | 46 ++++++++----------- 3 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 srcpkgs/openttd/patches/add_gfx.patch create mode 100644 srcpkgs/openttd/patches/disable_regression_tests.patch diff --git a/srcpkgs/openttd/patches/add_gfx.patch b/srcpkgs/openttd/patches/add_gfx.patch new file mode 100644 index 000000000000..280ed74a77ce --- /dev/null +++ b/srcpkgs/openttd/patches/add_gfx.patch @@ -0,0 +1,12 @@ +--- a/openttd-12.0/media/baseset/CMakeLists.txt 2021-10-17 11:31:25.000000000 +0200 ++++ b/openttd-12.0/media/baseset/CMakeLists.txt 2021-11-11 20:07:16.408109043 +0100 +@@ -19,0 +20,9 @@ set(BASESET_OTHER_SOURCE_FILES ++ ${CMAKE_CURRENT_SOURCE_DIR}/ogfx1_base.grf ++ ${CMAKE_CURRENT_SOURCE_DIR}/ogfxc_arctic.grf ++ ${CMAKE_CURRENT_SOURCE_DIR}/ogfxe_extra.grf ++ ${CMAKE_CURRENT_SOURCE_DIR}/ogfxh_tropical.grf ++ ${CMAKE_CURRENT_SOURCE_DIR}/ogfxi_logos.grf ++ ${CMAKE_CURRENT_SOURCE_DIR}/ogfxt_toyland.grf ++ ${CMAKE_CURRENT_SOURCE_DIR}/opensfx.cat ++ ${CMAKE_CURRENT_SOURCE_DIR}/opensfx.obs ++ ${CMAKE_CURRENT_SOURCE_DIR}/opengfx.obg diff --git a/srcpkgs/openttd/patches/disable_regression_tests.patch b/srcpkgs/openttd/patches/disable_regression_tests.patch new file mode 100644 index 000000000000..9af9c836f216 --- /dev/null +++ b/srcpkgs/openttd/patches/disable_regression_tests.patch @@ -0,0 +1,7 @@ +--- a/openttd-12.0/CMakeLists.txt 2021-10-17 11:31:25.000000000 +0200 ++++ b/openttd-12.0/CMakeLists.txt 2021-11-11 09:52:41.313326191 +0100 +@@ -378,2 +378,2 @@ endif() +-include(CreateRegression) +-create_regression() ++# include(CreateRegression) ++# create_regression() diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template index d6aedccab9ee..859079d8796a 100644 --- a/srcpkgs/openttd/template +++ b/srcpkgs/openttd/template @@ -1,26 +1,31 @@ # Template file for 'openttd' pkgname=openttd -version=1.10.3 +version=12.0 revision=3 -_gfxver=0.6.0 -_sfxver=0.2.3 +_gfxver=7.1 +_sfxver=1.0.2 create_wrksrc=yes build_wrksrc=openttd-$version -build_style=gnu-configure +build_style=cmake +configure_args="-DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_BINDIR=bin + -DCMAKE_INSTALL_DATADIR=share + -DCMAKE_INSTALL_DOCDIR=share/doc/openttd" + hostmakedepends="pkg-config unzip tar" makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel libxdg-basedir-devel" depends="hicolor-icon-theme" short_desc="Open Source version of Transport Tycoon Deluxe" -maintainer="Orphaned " +maintainer="Emil Tomczyk " license="GPL-2.0-only, Zlib" homepage="https://www.openttd.org/" -distfiles="https://proxy.binaries.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz +distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip" -checksum="c11601ef547eb1f6d4f9a035bd19e0a760b47872ce7d9b4117aaa45ac377b53b - d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774 - 6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02" +checksum="bba0fd3800df0370259e642d251f362c7c00b478a2e3531f6ba7f84c1c2b32dc + 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846 + 4814f5374eb8da0df888a4e38c3edbff3e6e3ddbb4ab13aae6933a0df3c0d333" CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1' @@ -28,28 +33,15 @@ CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1' post_extract() { cd $wrksrc bsdtar xf opengfx-${_gfxver}.tar + bsdtar xf opensfx-${_sfxver}.tar rm opengfx-${_gfxver}.tar -} - -do_configure() { - ./configure --prefix-dir=/usr \ - --cc-build=gcc \ - --cxx-build=g++ \ - --binary-dir=bin \ - --data-dir=share/openttd \ - --doc-dir=share/doc/openttd \ - --with-lzo2=${XBPS_CROSS_BASE}/usr/lib \ - --binary-name=openttd \ - --install-dir=${DESTDIR} \ - --menu-name=OpenTTD \ - --with-xdg-basedir + rm opensfx-${_sfxver}.tar + cp opengfx-${_gfxver}/*.grf openttd-${version}/media/baseset + cp opengfx-${_gfxver}/*.obg openttd-${version}/media/baseset + cp opensfx-${_sfxver}/opensfx.* openttd-${version}/media/baseset } post_install() { - vmkdir usr/share/openttd/data - vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data - vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data - vcopy ../opensfx-${_sfxver}/opensfx.* usr/share/openttd/data vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx vdoc ../opengfx-${_gfxver}/readme.txt README-gfx