Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] OpenRCT2: update to 0.3.1
@ 2020-10-28 22:29 klardotsh
  2020-10-28 22:33 ` [PR REVIEW] " ericonr
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: klardotsh @ 2020-10-28 22:29 UTC (permalink / raw)
  To: ml

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

There is a new 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: 4576 bytes --]

From b6666b5909c62e9a177942ecb55f59851e48f4cd 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/patches/0001-no-werror.patch | 13 ++++++++
 srcpkgs/OpenRCT2/template                     | 33 ++++++++++---------
 2 files changed, 31 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/OpenRCT2/patches/0001-no-werror.patch

diff --git a/srcpkgs/OpenRCT2/patches/0001-no-werror.patch b/srcpkgs/OpenRCT2/patches/0001-no-werror.patch
new file mode 100644
index 00000000000..2f0ee62bd49
--- /dev/null
+++ b/srcpkgs/OpenRCT2/patches/0001-no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c99d9d41..90b12375a 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -260,7 +260,7 @@ else ()
+ 
+     # Compiler flags
+     set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Werror -Wundef -Wmissing-declarations -Winit-self -Wall -Wextra -Wshadow")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Wundef -Wmissing-declarations -Winit-self -Wall -Wextra -Wshadow")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-missing-braces -Wno-comment -Wnonnull -Wno-unused-parameter")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
+ 
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..f79c7b58eb9 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,36 @@
 # 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) $(vopt_if multiplayer 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 +52,5 @@ 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"
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
@ 2020-10-28 22:33 ` ericonr
  2020-10-29  2:46 ` [PR PATCH] [Updated] " klardotsh
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2020-10-28 22:33 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#discussion_r513801373

Comment:
You can try to use `vsed` to remove this instead, to avoida patch that may have to be maintained. Also, we should ask upstream to remove it.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
  2020-10-28 22:33 ` [PR REVIEW] " ericonr
@ 2020-10-29  2:46 ` klardotsh
  2020-10-30  1:05 ` [PR REVIEW] " ericonr
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: klardotsh @ 2020-10-29  2:46 UTC (permalink / raw)
  To: ml

[-- 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: 3489 bytes --]

From b625144af4c5cc885f1dec3b62e1a3fc4ffb1ab8 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 | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..740b65411f2 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,36 @@
 # 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) $(vopt_if multiplayer 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 +52,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;;"
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
  2020-10-28 22:33 ` [PR REVIEW] " ericonr
  2020-10-29  2:46 ` [PR PATCH] [Updated] " klardotsh
@ 2020-10-30  1:05 ` ericonr
  2020-10-30  1:05 ` ericonr
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2020-10-30  1:05 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#discussion_r514653420

Comment:
break at ~80 columns and use single quotes for the vopts

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (2 preceding siblings ...)
  2020-10-30  1:05 ` [PR REVIEW] " ericonr
@ 2020-10-30  1:05 ` ericonr
  2020-10-30  1:12 ` ericonr
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2020-10-30  1:05 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#discussion_r514651389

Comment:
`$(vopt_if multiplayer 'libcurl-devel libressl-devel')`

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (3 preceding siblings ...)
  2020-10-30  1:05 ` ericonr
@ 2020-10-30  1:12 ` ericonr
  2020-10-31 22:31 ` [PR PATCH] [Updated] " klardotsh
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2020-10-30  1:12 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#issuecomment-719110920

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (4 preceding siblings ...)
  2020-10-30  1:12 ` ericonr
@ 2020-10-31 22:31 ` klardotsh
  2020-11-01 22:29 ` klardotsh
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: klardotsh @ 2020-10-31 22:31 UTC (permalink / raw)
  To: ml

[-- 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;;"
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (5 preceding siblings ...)
  2020-10-31 22:31 ` [PR PATCH] [Updated] " klardotsh
@ 2020-11-01 22:29 ` klardotsh
  2020-11-01 22:29 ` klardotsh
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: klardotsh @ 2020-11-01 22:29 UTC (permalink / raw)
  To: ml

[-- 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: 4200 bytes --]

From 34b648986f3c84fba993524626d9bb70526a88c0 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Sun, 1 Nov 2020 14:27:17 -0800
Subject: [PATCH 1/2] json-c++: build with multi-header support

---
 srcpkgs/json-c++/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 1ec838d59a9..23c0d56fc8e 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,9 +1,10 @@
 # Template file for 'json-c++'
 pkgname=json-c++
 version=3.9.1
-revision=1
+revision=2
 wrksrc="json-${version}"
 build_style=cmake
+configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

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

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

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..5166ff8201b 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -2,33 +2,42 @@
 # 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.18
+_titles_version=0.1.2c
+version=0.3.2
+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)"
+ json-c++>=3.9.1_2
+ $(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="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
+ bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+ 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 +58,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;;"
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OpenRCT2: update to 0.3.1
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (6 preceding siblings ...)
  2020-11-01 22:29 ` klardotsh
@ 2020-11-01 22:29 ` klardotsh
  2020-11-02  1:21 ` OpenRCT2: update to 0.3.2 klardotsh
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: klardotsh @ 2020-11-01 22:29 UTC (permalink / raw)
  To: ml

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

New comment by klardotsh on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#issuecomment-720161826

Comment:
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](https://github.com/nlohmann/json/blob/develop/include/nlohmann/json.hpp), this should be a backwards-compatible change.

Game still builds and runs on x86_64-musl.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OpenRCT2: update to 0.3.2
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (7 preceding siblings ...)
  2020-11-01 22:29 ` klardotsh
@ 2020-11-02  1:21 ` klardotsh
  2020-11-06 15:22 ` [PR REVIEW] " ericonr
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: klardotsh @ 2020-11-02  1:21 UTC (permalink / raw)
  To: ml

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

New comment by klardotsh on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#issuecomment-720188677

Comment:
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...

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] OpenRCT2: update to 0.3.2
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (8 preceding siblings ...)
  2020-11-02  1:21 ` OpenRCT2: update to 0.3.2 klardotsh
@ 2020-11-06 15:22 ` ericonr
  2020-11-06 20:59 ` [PR PATCH] [Updated] " klardotsh
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2020-11-06 15:22 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#discussion_r518821456

Comment:
Packages are always built with the versions of dependencies specified in the templates, so you don't need to specify a version here. This is probably what broke the build.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] OpenRCT2: update to 0.3.2
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (9 preceding siblings ...)
  2020-11-06 15:22 ` [PR REVIEW] " ericonr
@ 2020-11-06 20:59 ` klardotsh
  2020-11-09 17:50 ` [PR REVIEW] " ericonr
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: klardotsh @ 2020-11-06 20:59 UTC (permalink / raw)
  To: ml

[-- 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.2
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: 4254 bytes --]

From 34b648986f3c84fba993524626d9bb70526a88c0 Mon Sep 17 00:00:00 2001
From: Josh Klar <josh@klar.sh>
Date: Sun, 1 Nov 2020 14:27:17 -0800
Subject: [PATCH 1/2] json-c++: build with multi-header support

---
 srcpkgs/json-c++/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 1ec838d59a9..23c0d56fc8e 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,9 +1,10 @@
 # Template file for 'json-c++'
 pkgname=json-c++
 version=3.9.1
-revision=1
+revision=2
 wrksrc="json-${version}"
 build_style=cmake
+configure_args="-DJSON_MultipleHeaders=ON"
 checkdepends="git"
 short_desc="JSON for modern C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

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

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

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index a6e9d10f5bd..5dc6d249853 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.18
+_titles_version=0.1.2c
+version=0.3.2
+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="66c1c7ae8c765397e324b1aac59907bd5197dbad88597133aaba8a9480627c36
+ bf8a28b7ccebaf58e4e9eb2540534632830534cf0b3f73677521dc555878c682
+ 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;;"
 }

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR REVIEW] OpenRCT2: update to 0.3.2
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (10 preceding siblings ...)
  2020-11-06 20:59 ` [PR PATCH] [Updated] " klardotsh
@ 2020-11-09 17:50 ` ericonr
  2020-11-21 22:00 ` the-maldridge
  2020-11-21 22:01 ` [PR PATCH] [Merged]: " the-maldridge
  13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2020-11-09 17:50 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#discussion_r520003740

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: OpenRCT2: update to 0.3.2
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (11 preceding siblings ...)
  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
  13 siblings, 0 replies; 15+ messages in thread
From: the-maldridge @ 2020-11-21 22:00 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/25955#issuecomment-731643091

Comment:
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.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Merged]: OpenRCT2: update to 0.3.2
  2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 klardotsh
                   ` (12 preceding siblings ...)
  2020-11-21 22:00 ` the-maldridge
@ 2020-11-21 22:01 ` the-maldridge
  13 siblings, 0 replies; 15+ messages in thread
From: the-maldridge @ 2020-11-21 22:01 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

OpenRCT2: update to 0.3.2
https://github.com/void-linux/void-packages/pull/25955

Description:
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.

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2020-11-21 22:01 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-28 22:29 [PR PATCH] OpenRCT2: update to 0.3.1 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 ` [PR PATCH] [Updated] " klardotsh
2020-11-01 22:29 ` 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

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git