From b6666b5909c62e9a177942ecb55f59851e48f4cd Mon Sep 17 00:00:00 2001 From: Josh Klar 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 " 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" }