From ae59fcd112ef6ae323c7b72b50a01c8d78085306 Mon Sep 17 00:00:00 2001
From: Jonas Kulla <Nyocurio@gmail.com>
Date: Mon, 21 May 2018 12:15:05 +0200
Subject: [PATCH 1/2] Graphics: Fix transition when new scene has gray tone
 effect

Rendering the scene may cause PingPong swaps of front / backbuffer,
so don't take references to those buffers until after rendering.

Fixes #199
---
 src/graphics.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/graphics.cpp b/src/graphics.cpp
index 6a12cb3..c53fe0e 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -708,6 +708,9 @@ void Graphics::transition(int duration,
 
 	setBrightness(255);
 
+	/* Capture new scene */
+	p->screen.composite();
+
 	/* The PP frontbuffer will hold the current scene after the
 	 * composition step. Since the backbuffer is unused during
 	 * the transition, we can reuse it as the target buffer for
@@ -715,9 +718,6 @@ void Graphics::transition(int duration,
 	TEXFBO &currentScene = p->screen.getPP().frontBuffer();
 	TEXFBO &transBuffer  = p->screen.getPP().backBuffer();
 
-	/* Capture new scene */
-	p->screen.composite();
-
 	/* If no transition bitmap is provided,
 	 * we can use a simplified shader */
 	TransShader &transShader = shState->shaders().trans;

From 6613d5a6168c8406a8790c1672a9e0d4bd5a5142 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Tue, 3 Jul 2018 11:36:24 -0700
Subject: [PATCH 2/2] Bump version number

---
 make-oneshot-mac.command  | 2 +-
 patches/mac/Info.plist.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/make-oneshot-mac.command b/make-oneshot-mac.command
index 9b40905..3c9accf 100755
--- a/make-oneshot-mac.command
+++ b/make-oneshot-mac.command
@@ -4,7 +4,7 @@ set -e
 cd `dirname $0`
 
 # User-configurable variables
-mac_version="1.0.2"
+mac_version="1.0.4"
 make_threads=8
 ONESHOT_PATH=$HOME/Library/Application\ Support/Steam/steamapps/common/OneShot
 
diff --git a/patches/mac/Info.plist.in b/patches/mac/Info.plist.in
index 21c4a28..7f693f7 100755
--- a/patches/mac/Info.plist.in
+++ b/patches/mac/Info.plist.in
@@ -19,7 +19,7 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleVersion</key>
-		<string>macOS Port v.ONESHOTMACVERSION (OneShot Solstice Update)</string>
+		<string>macOS Port v.ONESHOTMACVERSION</string>
 		<key>CFBundleShortVersionString</key>
 		<string>ONESHOTMACVERSION</string>
 		<key>LSApplicationCategoryType</key>