From 36816acfe2f4661301ef647e9d4a19bbbbde2b34 Mon Sep 17 00:00:00 2001
From: Robert Kausch <robert.kausch@freac.org>
Date: Thu, 2 Jan 2020 18:04:41 +0100
Subject: [PATCH] mac: fix include paths (#4521)

---
 media-sound/mac/mac-5.11.recipe           |  2 +-
 media-sound/mac/patches/mac-5.11.patchset | 33 +++++++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/media-sound/mac/mac-5.11.recipe b/media-sound/mac/mac-5.11.recipe
index d488b150e..7c17d726d 100644
--- a/media-sound/mac/mac-5.11.recipe
+++ b/media-sound/mac/mac-5.11.recipe
@@ -5,7 +5,7 @@ files."
 HOMEPAGE="https://www.monkeysaudio.com/"
 COPYRIGHT="2000-2019 Matthew T. Ashland"
 LICENSE="Monkey's Audio SDK and Source Code License Agreement"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.monkeysaudio.com/files/MAC_SDK_${portVersion/./}.zip"
 CHECKSUM_SHA256="4ec04c57be9f8519a02cc3a90ec5977ac202d865843b19ffa557093d91970e9d"
 SOURCE_DIR=""
diff --git a/media-sound/mac/patches/mac-5.11.patchset b/media-sound/mac/patches/mac-5.11.patchset
index 3022b6b91..304401933 100644
--- a/media-sound/mac/patches/mac-5.11.patchset
+++ b/media-sound/mac/patches/mac-5.11.patchset
@@ -1,11 +1,11 @@
-From d3ba1a87284e0325202ba694976346659d5cdc32 Mon Sep 17 00:00:00 2001
+From 47b385e0397e0f45e9e998df6521ff39cf701287 Mon Sep 17 00:00:00 2001
 From: Robert Kausch <robert.kausch@freac.org>
 Date: Sun, 28 Apr 2019 22:50:39 +0000
 Subject: Fix file access
 
 
 diff --git a/Source/Shared/StdLibFileIO.cpp b/Source/Shared/StdLibFileIO.cpp
-index eee3c01..17b03e9 100644
+index 105c3a7..83787e6 100644
 --- a/Source/Shared/StdLibFileIO.cpp
 +++ b/Source/Shared/StdLibFileIO.cpp
 @@ -218,9 +218,7 @@ int64 CStdLibFileIO::GetPosition()
@@ -13,12 +13,35 @@ index eee3c01..17b03e9 100644
  #ifdef PLATFORM_ANDROID
      return ftell(m_pFile);
 -#elif defined(PLATFORM_LINUX)
--	return ftello64(m_pFile);
+-    return ftello64(m_pFile);
 -#elif PLATFORM_APPLE
 +#elif !defined(PLATFORM_WINDOWS)
      return ftello(m_pFile);
  #else
- 	return _ftelli64(m_pFile);
+     return _ftelli64(m_pFile);
 -- 
-2.21.0
+2.24.1
+
+
+From 96be7df8791de9346c659395b94f65fb388cded8 Mon Sep 17 00:00:00 2001
+From: Robert Kausch <robert.kausch@freac.org>
+Date: Thu, 2 Jan 2020 12:36:43 +0000
+Subject: Fix include paths.
+
+
+diff --git a/Source/Projects/NonWindows/Makefile b/Source/Projects/NonWindows/Makefile
+index b97d7fa..70947dc 100644
+--- a/Source/Projects/NonWindows/Makefile
++++ b/Source/Projects/NonWindows/Makefile
+@@ -3,7 +3,7 @@ UNAME	 = $(shell uname)
+ 
+ VERSION	  = 5
+ 
+-CXXOPTS   = -O2 -I Shared -I Source/Shared -I Source/MACLib -c
++CXXOPTS   = -O2 -I Source/Shared -I Source/MACLib -c
+ LDOPTS	  = -lstdc++
+ 
+ DLLLDOPTS = -shared
+-- 
+2.24.1