Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenRCT2: update to 0.3.2 #25955

Merged
merged 2 commits into from Nov 21, 2020

Conversation

klardotsh
Copy link
Contributor

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.

srcpkgs/OpenRCT2/template Outdated Show resolved Hide resolved
srcpkgs/OpenRCT2/template Outdated Show resolved Hide resolved
@ericonr
Copy link
Member

ericonr commented Oct 30, 2020

Cross builds seem to be building fine, I tested armv6l-musl. Didn't test at runtime.

@klardotsh
Copy link
Contributor Author

Since 0.3.2 came out today, I went ahead and bumped this PR to target the new version instead. This required a change to json-c++ to build the multi-header version rather than the single-header version. Based on the multi-header version's json.hpp, this should be a backwards-compatible change.

Game still builds and runs on x86_64-musl.

@klardotsh klardotsh changed the title OpenRCT2: update to 0.3.1 OpenRCT2: update to 0.3.2 Nov 1, 2020
@klardotsh
Copy link
Contributor Author

I'm not entirely sure what's up with the CI failures. I had that locally, and had to manually build the update to json-c++, and I don't know off the top of my head what makes that version dependency inconsistently invalid...

srcpkgs/OpenRCT2/template Outdated Show resolved Hide resolved
@@ -49,5 +57,7 @@ post_extract() {
_srcdir="${XBPS_SRCDISTDIR}/${pkgname}-${version}"
mkdir -p data/object data/title
unzip -qd data/object "${_srcdir}/objects.zip"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please replace the two unzip commands with bsdtar ones, if possible, then remove unzip from hostmakedepends.

@the-maldridge
Copy link
Member

Going to accept this with unzip for now. It would be nice to use bsdtar, but I ran into a strange bug locally when I tried this.

@the-maldridge the-maldridge merged commit ebd8515 into void-linux:master Nov 21, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants