From 8518b9229234a2f3a05b5f2718e5fd6910722a0e Mon Sep 17 00:00:00 2001 From: Emil Tomczyk Date: Wed, 13 Nov 2024 14:40:35 +0100 Subject: [PATCH] openttd: moved resources to separate packages Also added dedicated option to build without graphics New package: openttd-opengfx-7.1 New package: openttd-opensfx-1.0.3 New package: openttd-openmsx-0.4.2 --- srcpkgs/openttd-opengfx/template | 20 +++++++ srcpkgs/openttd-openmsx/template | 20 +++++++ srcpkgs/openttd-opensfx/template | 24 +++++++++ srcpkgs/openttd/INSTALL.msg | 6 +++ .../openttd/patches/remove-gfx-tests.patch | 13 +++++ srcpkgs/openttd/template | 54 +++++-------------- 6 files changed, 95 insertions(+), 42 deletions(-) create mode 100644 srcpkgs/openttd-opengfx/template create mode 100644 srcpkgs/openttd-openmsx/template create mode 100644 srcpkgs/openttd-opensfx/template create mode 100644 srcpkgs/openttd/INSTALL.msg create mode 100644 srcpkgs/openttd/patches/remove-gfx-tests.patch diff --git a/srcpkgs/openttd-opengfx/template b/srcpkgs/openttd-opengfx/template new file mode 100644 index 00000000000000..6e47a011971b70 --- /dev/null +++ b/srcpkgs/openttd-opengfx/template @@ -0,0 +1,20 @@ +# Template file for 'openttd-opengfx' +pkgname=openttd-opengfx +version=7.1 +revision=1 +short_desc="Free graphics pack for OpenTTD" +maintainer="Emil Tomczyk " +license="GPL-2.0-only" +homepage="https://www.openttd.org/" +distfiles="https://cdn.openttd.org/opengfx-releases/${version}/opengfx-${version}-all.zip" +checksum=928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846 +conflicts="openttd<=14.1_1" + +post_extract() { + bsdtar xf opengfx-${version}.tar +} + +do_install() { + vmkdir usr/share/openttd/baseset + vcopy opengfx-${version} usr/share/openttd/baseset +} diff --git a/srcpkgs/openttd-openmsx/template b/srcpkgs/openttd-openmsx/template new file mode 100644 index 00000000000000..f8a352fdddbfd9 --- /dev/null +++ b/srcpkgs/openttd-openmsx/template @@ -0,0 +1,20 @@ +# Template file for 'openttd-openmsx' +pkgname=openttd-openmsx +version=0.4.2 +revision=1 +short_desc="Free music pack for OpenTTD" +maintainer="Emil Tomczyk " +license="GPL-2.0-only" +homepage="https://www.openttd.org/" +distfiles="https://cdn.openttd.org/openmsx-releases/${version}/openmsx-${version}-all.zip" +checksum=5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762 +conflicts="openttd<=14.1_1" + +post_extract() { + bsdtar xf openmsx-${version}.tar +} + +do_install() { + vmkdir usr/share/openttd/baseset + vcopy openmsx-${version} usr/share/openttd/baseset +} diff --git a/srcpkgs/openttd-opensfx/template b/srcpkgs/openttd-opensfx/template new file mode 100644 index 00000000000000..4b4d874441826f --- /dev/null +++ b/srcpkgs/openttd-opensfx/template @@ -0,0 +1,24 @@ +# Template file for 'openttd-opensfx' +pkgname=openttd-opensfx +version=1.0.3 +revision=1 +short_desc="Free sounds pack for OpenTTD" +maintainer="Emil Tomczyk " +license="CC-BY-SA-3.0 AND GPL-2.0-only AND CDDL-1.0" +homepage="https://www.openttd.org/" +distfiles="https://cdn.openttd.org/opensfx-releases/${version}/opensfx-${version}-all.zip" +checksum=e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759 +conflicts="openttd<=14.1_1" + +post_extract() { + bsdtar xf opensfx-${version}.tar +} + +do_install() { + vmkdir usr/share/openttd/baseset + vcopy opensfx-${version} usr/share/openttd/baseset +} + +do_install() { + vlicense opensfx-${version}/license.txt +} diff --git a/srcpkgs/openttd/INSTALL.msg b/srcpkgs/openttd/INSTALL.msg new file mode 100644 index 00000000000000..7820b733361aa2 --- /dev/null +++ b/srcpkgs/openttd/INSTALL.msg @@ -0,0 +1,6 @@ +OpenGFX, OpenSFX and OpenMSX have been moved to separate packages. Please +install openttd-opengfx, openttd-opensfx and openttd-openmsx packages +respectively if you need them. + +Now these packages are installed automatically. This would change in the +future. diff --git a/srcpkgs/openttd/patches/remove-gfx-tests.patch b/srcpkgs/openttd/patches/remove-gfx-tests.patch new file mode 100644 index 00000000000000..77c299d35e609b --- /dev/null +++ b/srcpkgs/openttd/patches/remove-gfx-tests.patch @@ -0,0 +1,13 @@ +--- a/regression/CMakeLists.txt 2024-11-12 10:12:13.378582909 +0100 ++++ b/regression/CMakeLists.txt 2024-11-12 10:12:33.430682642 +0100 +@@ -15,10 +15,3 @@ + DEPENDS + ${CMAKE_BINARY_DIR}/regression/regression.cfg + ) +- +- # Create a new target which runs the regression +- # Subdirectory targets will add themselves as dependencies +- add_custom_target(regression) +- +- add_subdirectory(regression) +- add_subdirectory(stationlist) diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template index 9f253a3b10a9e7..e818312bc3bdad 100644 --- a/srcpkgs/openttd/template +++ b/srcpkgs/openttd/template @@ -1,12 +1,7 @@ # Template file for 'openttd' pkgname=openttd version=14.1 -revision=1 -_gfxver=7.1 -_sfxver=1.0.3 -_msxver=0.4.2 -create_wrksrc=yes -build_wrksrc=openttd-$version +revision=2 build_style=cmake build_helper=qemu configure_args=" @@ -15,46 +10,21 @@ configure_args=" -DCMAKE_INSTALL_BINDIR=bin -DCMAKE_INSTALL_DATADIR=/usr/share -DCMAKE_INSTALL_DOCDIR=share/doc/openttd + $(vopt_bool dedicated OPTION_DEDICATED) " +build_options="dedicated" +desc_option_dedicated="Build dedicated server only, without GUI" + hostmakedepends="pkg-config unzip tar" -makedepends="SDL2-devel libcurl-devel freetype-devel fontconfig-devel - harfbuzz-devel icu-devel libpng-devel liblzma-devel fluidsynth-devel" -depends="hicolor-icon-theme fluidsynth soundfont-fluid" +makedepends="$(vopt_if dedicated '' 'SDL2-devel freetype-devel fontconfig-devel + harfbuzz-devel icu-devel libpng-devel fluidsynth-devel') libcurl-devel + liblzma-devel" +depends="$(vopt_if dedicated '' 'hicolor-icon-theme fluidsynth + soundfont-fluid') openttd-opengfx openttd-opensfx openttd-openmsx" short_desc="Open Source version of Transport Tycoon Deluxe" maintainer="Emil Tomczyk " license="GPL-2.0-only, Zlib" homepage="https://www.openttd.org/" -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 - https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip" -checksum="2c14c8f01f44148c4f2c88c169a30abcdb002eb128a92b9adb76baa76b013494 - 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846 - e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759 - 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762" - -post_extract() { - bsdtar xf opengfx-${_gfxver}.tar - bsdtar xf opensfx-${_sfxver}.tar - bsdtar xf openmsx-${_msxver}.tar - rm opengfx-${_gfxver}.tar - rm opensfx-${_sfxver}.tar - rm openmsx-${_msxver}.tar -} - -post_build() { - cp ../opengfx-${_gfxver}/*.grf build/baseset - cp ../opengfx-${_gfxver}/opengfx.obg build/baseset - cp ../opensfx-${_sfxver}/opensfx.* build/baseset - cp -r ../openmsx-${_msxver} build/baseset -} - -post_install() { - vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx - vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx - vlicense ../openmsx-${_msxver}/license.txt LICENSE-msx - vdoc ../opengfx-${_gfxver}/readme.txt README-gfx - vdoc ../opensfx-${_sfxver}/readme.txt README-sfx - vdoc ../openmsx-${_msxver}/readme.txt README-msx -} +distfiles="https://cdn.openttd.org/openttd-releases/${version}/openttd-${version}-source.tar.xz" +checksum=2c14c8f01f44148c4f2c88c169a30abcdb002eb128a92b9adb76baa76b013494