Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openttd: packs as options
@ 2024-11-12 11:11 Emru1
  2024-11-12 11:12 ` [PR PATCH] [Updated] " Emru1
                   ` (17 more replies)
  0 siblings, 18 replies; 19+ messages in thread
From: Emru1 @ 2024-11-12 11:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 749 bytes --]

There is a new pull request by Emru1 against master on the void-packages repository

https://github.com/Emru1/void-packages openttd_opts
https://github.com/void-linux/void-packages/pull/53017

openttd: packs as options
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, amd64-glibc


I've moved resource packs behind vopts.
Also I provided option to build only dedicated server.
Furthermore I've disabled tests that required resource packs to be present during testing.

A patch file from https://github.com/void-linux/void-packages/pull/53017.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openttd_opts-53017.patch --]
[-- Type: text/x-diff, Size: 5542 bytes --]

From 1d961705b49f969cd518d49a45ba086c4c3c1d5e Mon Sep 17 00:00:00 2001
From: Emil Tomczyk <emru@emru.xyz>
Date: Tue, 12 Nov 2024 09:55:28 +0100
Subject: [PATCH] openttd: packs as options

---
 .../openttd/patches/remove-gfx-tests.patch    | 13 ++++
 srcpkgs/openttd/template                      | 72 ++++++++++++-------
 2 files changed, 60 insertions(+), 25 deletions(-)
 create mode 100644 srcpkgs/openttd/patches/remove-gfx-tests.patch

diff --git a/srcpkgs/openttd/patches/remove-gfx-tests.patch b/srcpkgs/openttd/patches/remove-gfx-tests.patch
new file mode 100644
index 00000000000000..b84d23d873ebad
--- /dev/null
+++ b/srcpkgs/openttd/patches/remove-gfx-tests.patch
@@ -0,0 +1,13 @@
+--- a/openttd-14.1/regression/CMakeLists.txt	2024-11-12 10:12:13.378582909 +0100
++++ b/openttd-14.1/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..39a9c8b3b203cd 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -15,46 +15,68 @@ configure_args="
  -DCMAKE_INSTALL_BINDIR=bin
  -DCMAKE_INSTALL_DATADIR=/usr/share
  -DCMAKE_INSTALL_DOCDIR=share/doc/openttd
+ $(vopt_bool dedicated OPTION_DEDICATED)
 "
 
+build_options="gfx sfx msx dedicated"
+build_options_default="gfx sfx msx"
+desc_option_gfx="Include OpenGFX graphics pack"
+desc_option_sfx="Include OpenSFX sounds pack"
+desc_option_msx="Include OpenMSX music pack"
+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"
+makedepends="libcurl-devel $(vopt_if dedicated '' 'libpng-devel')"
+depends="$(vopt_if dedicated '' 'hicolor-icon-theme fluidsynth
+ soundfont-fluid')"
 short_desc="Open Source version of Transport Tycoon Deluxe"
 maintainer="Emil Tomczyk <emru@emru.xyz>"
 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"
+ $(vopt_if gfx https://cdn.openttd.org/opengfx-releases/${_gfxver}/opengfx-${_gfxver}-all.zip)
+ $(vopt_if sfx https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip)
+ $(vopt_if msx https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip)"
 checksum="2c14c8f01f44148c4f2c88c169a30abcdb002eb128a92b9adb76baa76b013494
- 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
- e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
- 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
+ $(vopt_if gfx 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846)
+ $(vopt_if sfx e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759)
+ $(vopt_if msx 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
+	$(vopt_if gfx "bsdtar xf opengfx-${_gfxver}.tar")
+	$(vopt_if sfx "bsdtar xf opensfx-${_sfxver}.tar")
+	$(vopt_if msx "bsdtar xf openmsx-${_msxver}.tar")
+	$(vopt_if gfx "rm opengfx-${_gfxver}.tar")
+	$(vopt_if sfx "rm opensfx-${_sfxver}.tar")
+	$(vopt_if msx "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
+	$(vopt_if gfx "cp ../opengfx-${_gfxver}/*.grf build/baseset")
+	$(vopt_if gfx "cp ../opengfx-${_gfxver}/opengfx.obg build/baseset")
+	$(vopt_if sfx "cp ../opensfx-${_sfxver}/opensfx.* build/baseset")
+	$(vopt_if msx "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
+	if $(vopt_if gfx 'true' 'false')
+	then
+		vlicense ../opengfx-${_gfxver}/license.txt LICENSE-gfx
+		vdoc ../opengfx-${_gfxver}/readme.txt README-gfx
+	fi
+
+	if $(vopt_if sfx 'true' 'false')
+	then
+		vlicense ../opensfx-${_sfxver}/license.txt LICENSE-sfx
+		vdoc ../opensfx-${_sfxver}/readme.txt README-sfx
+	fi
+
+	if $(vopt_if msx 'true' 'false')
+	then
+		vlicense ../openmsx-${_msxver}/license.txt LICENSE-msx
+		vdoc ../openmsx-${_msxver}/readme.txt README-msx
+	fi
 }

^ permalink raw reply	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-11-19 12:47 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-12 11:11 [PR PATCH] openttd: packs as options Emru1
2024-11-12 11:12 ` [PR PATCH] [Updated] " Emru1
2024-11-12 11:19 ` Emru1
2024-11-12 11:41 ` [PR REVIEW] " ahesford
2024-11-12 11:41 ` ahesford
2024-11-12 11:45 ` Emru1
2024-11-12 12:17 ` [PR PATCH] [Updated] " Emru1
2024-11-13  0:10 ` [PR REVIEW] " ahesford
2024-11-13  8:35 ` Emru1
2024-11-13 13:41 ` [PR PATCH] [Updated] " Emru1
2024-11-13 13:46 ` Emru1
2024-11-14  9:00 ` openttd: packs in separate packages Emru1
2024-11-14 11:37 ` [PR REVIEW] " ahesford
2024-11-16 14:17 ` [PR PATCH] [Updated] " Emru1
2024-11-16 14:17 ` Emru1
2024-11-16 14:58 ` [PR REVIEW] " ahesford
2024-11-16 14:58 ` ahesford
2024-11-17  7:55 ` [PR PATCH] [Updated] " Emru1
2024-11-19 12:47 ` [PR PATCH] [Merged]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).