Github messages for voidlinux
 help / color / mirror / Atom feed
From: klardotsh <klardotsh@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] OpenRCT2: update to 0.3.1
Date: Sat, 31 Oct 2020 23:31:39 +0100	[thread overview]
Message-ID: <20201031223139.YPGjvxjupop0U1NO4fGRswPaNQcYN7cGtpDCWrnSHHA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25955@inbox.vuxu.org>

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

There is an updated pull request by klardotsh against master on the void-packages repository

https://github.com/klardotsh/void-packages klardotsh/update-openrct2
https://github.com/void-linux/void-packages/pull/25955

OpenRCT2: update to 0.3.1
Update to 0.3.1, the new title sequences directory, the scripting API, and all the other funsies that came in the new version.

I playtested this for a few minutes online on `x86_64-musl` and I see nothing obviously broken yet.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-klardotsh/update-openrct2-25955.patch --]
[-- Type: text/x-diff, Size: 3483 bytes --]

From badc996d910dba40bbe56d73cf3dcfb9c59dde42 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Wed, 28 Oct 2020 12:54:51 -0700
Subject: [PATCH] OpenRCT2: update to 0.3.1

---
 srcpkgs/OpenRCT2/template | 40 ++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..257a24fc290 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,41 @@
 # based on https://raw.githubusercontent.com/AluisioASG/void-packages/openrct2/srcpkgs/OpenRCT2/template
 # and https://github.com/void-linux/void-packages/issues/1014#issuecomment-417372421
 pkgname=OpenRCT2
-_objects_version=1.0.15
-_titles_version=0.1.2
-version=0.2.6
-revision=3
+_objects_version=1.0.17
+_titles_version=0.1.2c
+version=0.3.1
+revision=1
 build_style=cmake
-configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")"
+configure_args="
+ -DOPENRCT2_VERSION_TAG=${version}
+ -DDOWNLOAD_TITLE_SEQUENCES=0
+ -DDOWNLOAD_OBJECTS=0
+ $(vopt_if multiplayer '' '-DDISABLE_NETWORK=1')
+ $(vopt_if scripting '-DENABLE_SCRIPTING=1' '')"
 hostmakedepends="pkg-config unzip"
 makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
- libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel
- $(vopt_if multiplayer libcurl-devel) $(vopt_if multiplayer libressl-devel)"
+ libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
+ $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if scripting duktape-devel)"
 short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
 maintainer="klardotsh <josh@klar.sh>"
 license="GPL-3.0-or-later"
 homepage="https://openrct2.io"
+# use title-sequences.zip to match CMakeLists instruction
 distfiles="https://github.com/OpenRCT2/OpenRCT2/archive/v${version}.tar.gz
  https://github.com/OpenRCT2/objects/releases/download/v${_objects_version}/objects.zip
- https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequence-v${_titles_version}.zip"
-checksum="0e05a709d3e07343cd72e4db4cb4f1a6d9956f8acf7da682d2a3940c3112776e
- 0171907a267c564071e587fc683bfe75f36b891a6769e0bd49a6fc46f2ae7ded
- dcb1648739b351e857e2d19fed1626bec561d5e9f4b49201568f42c475ee7e61"
-skip_extraction="objects.zip title-sequence-v${_titles_version}.zip"
+ https://github.com/OpenRCT2/title-sequences/releases/download/v${_titles_version}/title-sequences.zip"
+checksum="f5dcc350bb7539d0bc322ec7f07ba30df1091b9d868c163ea673d9b5b1cdcd9a
+ bc31ca8ca56f40f9ff7958416611bc712932c1eda80ca94861789aa57da1740e
+ 5284333fa501270835b5f0cf420cb52155742335f5658d7889ea35d136b52517"
+skip_extraction="objects.zip title-sequences.zip"
 
 replaces="OpenRCT2-data>=0"
 
-build_options="multiplayer"
-build_options_default="multiplayer"
+build_options="multiplayer scripting"
+build_options_default="multiplayer scripting"
 desc_option_multiplayer="Enable multiplayer support"
+desc_option_scripting="Enable script / plugin support"
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="not yet implemented"
@@ -49,5 +57,7 @@ post_extract() {
 	_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
 	mkdir -p data/object data/title
 	unzip -qd data/object "${_srcdir}/objects.zip"
-	unzip -qd data/title "${_srcdir}/title-sequence-v${_titles_version}.zip"
+	unzip -qd data/sequence "${_srcdir}/title-sequences.zip"
+
+	vsed -i CMakeLists.txt -e "s; -Werror;;"
 }

  parent reply	other threads:[~2020-10-31 22:31 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-28 22:29 [PR PATCH] " klardotsh
2020-10-28 22:33 ` [PR REVIEW] " ericonr
2020-10-29  2:46 ` [PR PATCH] [Updated] " klardotsh
2020-10-30  1:05 ` [PR REVIEW] " ericonr
2020-10-30  1:05 ` ericonr
2020-10-30  1:12 ` ericonr
2020-10-31 22:31 ` klardotsh [this message]
2020-11-01 22:29 ` [PR PATCH] [Updated] " klardotsh
2020-11-01 22:29 ` klardotsh
2020-11-02  1:21 ` OpenRCT2: update to 0.3.2 klardotsh
2020-11-06 15:22 ` [PR REVIEW] " ericonr
2020-11-06 20:59 ` [PR PATCH] [Updated] " klardotsh
2020-11-09 17:50 ` [PR REVIEW] " ericonr
2020-11-21 22:00 ` the-maldridge
2020-11-21 22:01 ` [PR PATCH] [Merged]: " the-maldridge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201031223139.YPGjvxjupop0U1NO4fGRswPaNQcYN7cGtpDCWrnSHHA@z \
    --to=klardotsh@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).