Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openttd: update to 12.2, gfx to 7.1, sfx to 1.0.3, msx to 0.4.2.
@ 2022-04-20 10:45 Idesmi
  2022-04-21  6:22 ` [PR PATCH] [Updated] " Idesmi
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Idesmi @ 2022-04-20 10:45 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Idesmi/void-packages openttd
https://github.com/void-linux/void-packages/pull/36776

openttd: update to 12.2, gfx to 7.1, sfx to 1.0.3, msx to 0.4.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64*

Closes https://github.com/void-linux/void-packages/pull/36728

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

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

From 63249b80f16575c70d301271f342002c70d39a59 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sat, 16 Apr 2022 23:32:12 +0200
Subject: [PATCH] openttd: update to 12.2, gfx to 7.1, sfx to 1.0.3, msx to
 0.4.2.

---
 srcpkgs/openttd/template | 82 ++++++++++++++++++++++------------------
 srcpkgs/openttd/update   |  2 -
 2 files changed, 46 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/openttd/update

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index f19e683080dd..4c6a96aa1b4a 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,57 +1,67 @@
 # Template file for 'openttd'
 pkgname=openttd
-version=1.10.3
-revision=4
-_gfxver=0.6.0
-_sfxver=0.2.3
+version=12.2
+revision=1
+_gfxver=7.1
+_sfxver=1.0.3
+_msxver=0.4.2
 create_wrksrc=yes
-build_wrksrc=openttd-$version
-build_style=gnu-configure
+build_wrksrc=${pkgname}-$version
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_DATADIR=share -DCMAKE_INSTALL_BINDIR=bin"
 hostmakedepends="pkg-config unzip tar"
-makedepends="SDL-devel icu-devel fontconfig-devel libpng-devel lzo-devel liblzma-devel
- libxdg-basedir-devel"
+makedepends="$(vopt_if sdl2 SDL2-devel sdl-devel) icu-devel fontconfig-devel
+libpng-devel lzo-devel liblzma-devel libxdg-basedir-devel zlib-devel
+freetype-devel fluidsynth-devel"
 depends="hicolor-icon-theme"
 short_desc="Open Source version of Transport Tycoon Deluxe"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
 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
+homepage="https://www.openttd.org"
+changelog="https://raw.githubusercontent.com/OpenTTD/OpenTTD/release/12/changelog.txt"
+distfiles="https://cdn.openttd.org/openttd-releases/${version}/${pkgname}-${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"
-
-
-CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1'
+ https://cdn.openttd.org/opensfx-releases/${_sfxver}/opensfx-${_sfxver}-all.zip
+ https://cdn.openttd.org/openmsx-releases/${_msxver}/openmsx-${_msxver}-all.zip"
+checksum="81508f0de93a0c264b216ef56a05f8381fff7bffa6d010121a21490b4dace95c
+ 928fcf34efd0719a3560cbab6821d71ce686b6315e8825360fba87a7a94d7846
+ e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759
+ 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762"
+build_options="sdl2"
+desc_option_sdl2="Use Simple DirectMedia Layer 2.0"
+build_options_default="sdl2"
 
 post_extract() {
 	cd $wrksrc
-	bsdtar xf opengfx-${_gfxver}.tar
-	rm opengfx-${_gfxver}.tar
+	tar xf opengfx-${_gfxver}.tar
+	rm -f opengfx-${_gfxver}.tar
+	tar xf opensfx-${_sfxver}.tar
+	rm -f opensfx-${_sfxver}.tar
+	tar xf openmsx-${_msxver}.tar
+	rm -f openmsx-${_msxver}.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
+# test requires opengfx
+pre_check() {
+	mkdir build/data
+	cp ../opengfx-${_gfxver}/*.grf build/data
+	cp ../opengfx-${_gfxver}/*.obg build/data
 }
 
 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
+	vmkdir usr/share/openttd/data/opengfx
+	vmkdir usr/share/openttd/data/opensfx
+	vmkdir usr/share/openttd/data/openmsx
+	vcopy ../opengfx-${_gfxver}/*.grf usr/share/openttd/data/opengfx
+	vcopy ../opengfx-${_gfxver}/*.obg usr/share/openttd/data/opengfx
+	vcopy ../opensfx-${_sfxver}/*.cat usr/share/openttd/data/opensfx
+	vcopy ../opensfx-${_sfxver}/*.obs usr/share/openttd/data/opensfx
+	vcopy ../openmsx-${_msxver}/*.mid usr/share/openttd/data/openmsx
+	vcopy ../openmsx-${_msxver}/*.obm usr/share/openttd/data/openmsx
 	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
 }
diff --git a/srcpkgs/openttd/update b/srcpkgs/openttd/update
deleted file mode 100644
index 4303c0c21d17..000000000000
--- a/srcpkgs/openttd/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=http://binaries.openttd.org/releases/
-pattern='href="\K[\d]+\.[\d]+\.[\d]+(?=[^-])'

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-10-13  2:15 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20 10:45 [PR PATCH] openttd: update to 12.2, gfx to 7.1, sfx to 1.0.3, msx to 0.4.2 Idesmi
2022-04-21  6:22 ` [PR PATCH] [Updated] " Idesmi
2022-04-22 19:23 ` Idesmi
2022-04-22 19:26 ` Idesmi
2022-04-22 19:58 ` Chocimier
2022-04-23 14:53 ` [PR PATCH] [Updated] " Chocimier
2022-04-23 14:56 ` Chocimier
2022-05-07 18:15 ` [PR PATCH] [Updated] " Chocimier
2022-06-30 15:36 ` Idesmi
2022-06-30 15:37 ` Idesmi
2022-06-30 15:54 ` Idesmi
2022-09-29  2:14 ` github-actions
2022-10-13  2:15 ` [PR PATCH] [Closed]: " github-actions

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).