From 6be0e7749cdce2da26e3ae569b4c734d2216bb24 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sun, 3 Feb 2019 19:01:00 +0100
Subject: [PATCH 1/3] CMake: don't search SDL on macOS

It doesn't compile when enabled.
---
 build/cmake/init.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake
index 4f85330814..0c320ae1d7 100644
--- a/build/cmake/init.cmake
+++ b/build/cmake/init.cmake
@@ -362,7 +362,7 @@ if(wxUSE_GUI)
         set(wxUSE_GSTREAMER_PLAYER OFF)
     endif()
 
-    if(wxUSE_SOUND AND UNIX AND wxUSE_LIBSDL)
+    if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE)
         find_package(SDL2)
         if(NOT SDL2_FOUND)
             find_package(SDL)

From b1057cad056053fedf136d8b5e4e05374f00e983 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Feb 2019 22:51:10 +0100
Subject: [PATCH 2/3] Also disable SDL under macOS for configure-based builds

SDL-based wxSound backend doesn't currently compile under macOS and is
probably not very useful there anyhow.
---
 configure    | 2 +-
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 14a8931a16..8a02696b71 100755
--- a/configure
+++ b/configure
@@ -34514,7 +34514,7 @@ fi
 
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
-  if test "$USE_UNIX" = 1 ; then
+  if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then
     if test "$wxUSE_LIBSDL" != "no"; then
 
 pkg_failed=no
diff --git a/configure.in b/configure.in
index 0cb8ed4d74..eb780172d7 100644
--- a/configure.in
+++ b/configure.in
@@ -5560,7 +5560,7 @@ fi
 
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
-  if test "$USE_UNIX" = 1 ; then
+  if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then
     if test "$wxUSE_LIBSDL" != "no"; then
       PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0.0],
                   [

From 606659d27cb9dc08ae78e120fcfeb28f0433e690 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Feb 2019 22:52:43 +0100
Subject: [PATCH 3/3] De-TAB-ify configure

No real changes, just remove the hard TABs.
---
 configure    | 2 +-
 configure.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 8a02696b71..e6ec44da26 100755
--- a/configure
+++ b/configure
@@ -32133,7 +32133,7 @@ if test "x$ac_cv_lib_socket_inet_addr" = xyes; then :
   INET_LINK="socket"
 else
 
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnetwork" >&5
 $as_echo_n "checking for inet_addr in -lnetwork... " >&6; }
 if ${ac_cv_lib_network_inet_addr+:} false; then :
   $as_echo_n "(cached) " >&6
diff --git a/configure.in b/configure.in
index eb780172d7..0d498f3ea9 100644
--- a/configure.in
+++ b/configure.in
@@ -4530,7 +4530,7 @@ AC_CHECK_FUNCS(inet_addr,
                         AC_CHECK_LIB(socket, inet_addr,
                             INET_LINK="socket",
                             [
-				AC_CHECK_LIB(network, inet_addr,
+                                AC_CHECK_LIB(network, inet_addr,
                                    INET_LINK="network"
                                 )
                             ]
@@ -5579,7 +5579,7 @@ if test "$wxUSE_SOUND" = "yes"; then
                                   AC_DEFINE(wxUSE_LIBSDL)
                                 ],
                                 [wxUSE_LIBSDL="no"])
-		  ])
+                  ])
       if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then
         WITH_PLUGIN_SDL=1
       fi