<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8029a3a23bf2d1cc3e3511d60fa0b0d679a73082">https://github.com/macports/macports-ports/commit/8029a3a23bf2d1cc3e3511d60fa0b0d679a73082</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8029a3a raceintospace: Update to 1.1-20200603
</span>8029a3a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8029a3a23bf2d1cc3e3511d60fa0b0d679a73082
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jun 4 13:05:09 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> raceintospace: Update to 1.1-20200603
</span>---
games/raceintospace/Portfile | 42 ++++++++++-------
games/raceintospace/files/CMakeLists.txt.patch | 53 ----------------------
games/raceintospace/files/Global.cmake.patch | 19 --------
.../files/MusicSequence-constants.patch | 31 +++++++++++++
games/raceintospace/files/jsoncpp.patch | 42 -----------------
.../files/no-build-dependencies.patch | 13 ++++++
games/raceintospace/files/no-game_test.patch | 17 +++++++
games/raceintospace/files/no-homebrew.patch | 24 ++++++++++
8 files changed, 111 insertions(+), 130 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/Portfile b/games/raceintospace/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d25219e..c1c6c7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/raceintospace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,23 +4,23 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup raceintospace raceintospace e0d423d40747a06094b7ea441b0d63ca345c9a27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1-20170605
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup raceintospace raceintospace 8ff7814d5e2b6e73a817ead6c76eeb8823d4e3d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1-20200603
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 070989d75e5d32bacf1b6fcf4d682dcfe1b9baa9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6ae8c08a90d6bc74624662ab0c82bba1204eae9061563aa3e6c75cecb8a0e90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 63671481
</span>
categories games
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2
description Open Source version of old MS-DOS game Buzz Aldrin's Race Into Space
long_description ${description}
homepage http://www.raceintospace.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8989a36c664927b057cf789de4a0fab07a8a7876 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ee106089d90aa53ebbfd9854a6b57883510fc2f58d3b0f481c8ad859b9133faa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 63501320
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
depends_build-append \
port:boost
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,16 +32,26 @@ depends_lib-append port:jsoncpp \
</span> port:libtheora \
port:libvorbis \
port:physfs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:protobuf-cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf3-cpp \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles CMakeLists.txt.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Global.cmake.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jsoncpp.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local|@PREFIX@|g" ${worksrcpath}/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# jsoncpp requires C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles MusicSequence-constants.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-build-dependencies.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-homebrew.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-game_test.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -DBUILD_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_JSONCPP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_LIBPNG=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PHYSFS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PROTOBUF=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_SDL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_XIPH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_ZLIB=OFF
</span>
destroot {
copy "${build.dir}/Race Into Space.app" ${destroot}${applications_dir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/CMakeLists.txt.patch b/games/raceintospace/files/CMakeLists.txt.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1157375..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/raceintospace/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add BUILD_PHYSFS flag to select whether to build a local copy of physfs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/CMakeLists.txt.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/CMakeLists.txt 2018-03-15 10:36:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,27 +121,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PhysicsFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# I want 2.1 features, even if they're not out yet, so I made my own tarball
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#set (physfs_Version 2.0.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#set (physfs_URL http://icculus.org/physfs/downloads/physfs-${physfs_Version}.tar.bz2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set (physfs_Version 2.1.0-pre20121013)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set (physfs_URL https://s3.amazonaws.com/willglynn/physfs-${physfs_Version}.tgz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set (physfs_Dir ${CMAKE_CURRENT_BINARY_DIR}/physfs-${physfs_Version})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# physfs 2.0.3 complains about FSPathMakeRef et al being deprecated, and warnings are treated as errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Turn it back into a warning instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set (physfs_Flags -Wno-error=deprecated-declarations)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ExternalProject_Add(ext_physfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- URL ${physfs_URL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PREFIX ${physfs_Dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${LocalPrefix} -DPHYSFS_ARCHIVE_7Z=false -DPHYSFS_ARCHIVE_GRP=false -DPHYSFS_ARCHIVE_WAD=false -DPHYSFS_ARCHIVE_HOG=false -DPHYSFS_ARCHIVE_MVL=false -DPHYSFS_ARCHIVE_QPAK=false -DPHYSFS_ARCHIVE_ISO9660=false -DPHYSFS_HAVE_CDROM_SUPPORT=false -DPHYSFS_BUILD_SHARED=false -DPHYSFS_BUILD_TEST=false -DCMAKE_C_FLAGS=${physfs_Flags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF (BUILD_PHYSFS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # I want 2.1 features, even if they're not out yet, so I made my own tarball
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #set (physfs_Version 2.0.3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #set (physfs_URL http://icculus.org/physfs/downloads/physfs-${physfs_Version}.tar.bz2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (physfs_Version 2.1.0-pre20121013)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (physfs_URL https://s3.amazonaws.com/willglynn/physfs-${physfs_Version}.tgz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (physfs_Dir ${CMAKE_CURRENT_BINARY_DIR}/physfs-${physfs_Version})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # physfs 2.0.3 complains about FSPathMakeRef et al being deprecated, and warnings are treated as errors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Turn it back into a warning instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (physfs_Flags -Wno-error=deprecated-declarations)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_dependencies(libs ext_physfs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ExternalProject_Add(ext_physfs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/downloads
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ URL ${physfs_URL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PREFIX ${physfs_Dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${LocalPrefix} -DPHYSFS_ARCHIVE_7Z=false -DPHYSFS_ARCHIVE_GRP=false -DPHYSFS_ARCHIVE_WAD=false -DPHYSFS_ARCHIVE_HOG=false -DPHYSFS_ARCHIVE_MVL=false -DPHYSFS_ARCHIVE_QPAK=false -DPHYSFS_ARCHIVE_ISO9660=false -DPHYSFS_HAVE_CDROM_SUPPORT=false -DPHYSFS_BUILD_SHARED=false -DPHYSFS_BUILD_TEST=false -DCMAKE_C_FLAGS=${physfs_Flags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_dependencies(libs ext_physfs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif (BUILD_PHYSFS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/Global.cmake.patch b/games/raceintospace/files/Global.cmake.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a747688..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/raceintospace/files/Global.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Do not build local copies of any of the dependencies on macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(We use the MacPorts versions of them.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Global.cmake.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Global.cmake 2018-03-15 11:05:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,12 +9,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_directories(${LocalPrefix}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set flags indicating what we should build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(BUILD_JSONCPP true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(BUILD_XIPH true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(BUILD_PROTOBUF true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(BUILD_LIBPNG true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif (WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(BUILD_PHYSFS true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_JSONCPP true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_ZLIB true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_LIBPNG true)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/MusicSequence-constants.patch b/games/raceintospace/files/MusicSequence-constants.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0d42161
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/MusicSequence-constants.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use constants for music sequence functions. This is required for newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+versions of macOS yet the constants did not exist until the 10.9 SDK so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+define them if using an earlier SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/raceintospace/raceintospace/issues/307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/game/platform_macosx/music_osx.cpp.orig 2020-06-03 11:24:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/game/platform_macosx/music_osx.cpp 2020-06-04 12:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "music.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "logging.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define kMusicSequenceFile_AnyType 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define kMusicSequenceLoadSMF_PreserveTracks 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOG_DEFAULT_CATEGORY(music);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // A map of music_tracks to filenames
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,9 +172,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rv == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Try to load the sequence out of this buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 /* this is deprecated, but works back to 10.3 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rv = MusicSequenceLoadSMFDataWithFlags(music_files[track].sequence, CFDataCreate(NULL, (UInt8*)midi_data, fileLength), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rv = MusicSequenceLoadSMFDataWithFlags(music_files[track].sequence, CFDataCreate(NULL, (UInt8*)midi_data, fileLength), kMusicSequenceLoadSMF_PreserveTracks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* not deprecated, but requires 10.5 or later */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rv = MusicSequenceFileLoadData(music_files[track].sequence, CFDataCreate(NULL, (UInt8*)midi_data, fileLength), 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rv = MusicSequenceFileLoadData(music_files[track].sequence, CFDataCreate(NULL, (UInt8*)midi_data, fileLength), kMusicSequenceFile_AnyType, kMusicSequenceLoadSMF_PreserveTracks);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/jsoncpp.patch b/games/raceintospace/files/jsoncpp.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 24dc743..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/raceintospace/files/jsoncpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix include path for jsoncpp.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/game/roster.cpp.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/game/roster.cpp 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/foreach.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/game/roster_entry.h.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/game/roster_entry.h 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef ROSTER_ENTRY_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ROSTER_ENTRY_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "data.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/game/roster_group.h.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/game/roster_group.h 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef ROSTER_GROUP_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ROSTER_GROUP_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <list>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/utils/data_decoder.cpp.orig 2017-06-05 11:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/utils/data_decoder.cpp 2018-03-15 10:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <jsoncpp/json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <json/json.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void print_escaped_string(const char *string, int max_length)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/no-build-dependencies.patch b/games/raceintospace/files/no-build-dependencies.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1ffc41b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/no-build-dependencies.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not build local copies of any of the dependencies on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(We use the MacPorts versions of them.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/Global.cmake.orig 2019-11-21 12:30:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/Global.cmake 2019-11-23 14:24:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_directories(${LocalPrefix}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set flags indicating what we should build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_JSONCPP true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_XIPH true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_PROTOBUF true)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/no-game_test.patch b/games/raceintospace/files/no-game_test.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..76ffa15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/no-game_test.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't build the game_test target.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It isn't set up properly for macOS and can't be linked.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/raceintospace/raceintospace/issues/307#issuecomment-637153218
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/game/CMakeLists.txt.orig 2020-06-03 11:24:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/game/CMakeLists.txt 2020-06-04 12:42:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,10 +110,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${test_dir}/game/roster_test.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_executable(game_test ../../test/test_main.cpp ${test_sources} ${game_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_target_properties(game_test PROPERTIES COMPILE_FLAGS "-DBOOST_TEST_NO_LIB=1")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(game_test ${game_libraries})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_test(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAME game_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND game_test --catch_system_errors=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/raceintospace/files/no-homebrew.patch b/games/raceintospace/files/no-homebrew.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ae9461e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/raceintospace/files/no-homebrew.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not use Homebrew dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2019-11-21 12:30:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2019-11-23 14:26:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,10 +30,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DEFAULT_DATADIR "Contents/Resources")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DEFAULT_SAVEDIR ".")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PLATFORM_PROVIDES_UGLY_CRASH true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # this is so we can find Homebrew components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(SYSTEM /usr/local/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_directories(/usr/local/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SET_SDL_ICON TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DEFAULT_DATADIR ".")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,9 +38,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(SET_SDL_ICON TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DEFAULT_DATADIR "${CMAKE_INSTALL_PREFIX}/share/raceintospace")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DEFAULT_SAVEDIR ".")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # this is so we can find Homebrew components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(SYSTEM /usr/local/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_directories(/usr/local/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # generate the raceintospace_config.h
</span></pre><pre style='margin:0'>
</pre>