From ce3bdf3c9d4546aa8e43f9f6e23ad2e009205f3d Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Tue, 31 Dec 2019 16:08:55 +0100
Subject: [PATCH] macOS: require 10.14 or newer

Several functions of `std::optional` are only available
on Mojave (10.14) and newer, unfortunately.
---
 ac/c++-features.m4        | 2 +-
 packaging/macos/build.sh  | 2 +-
 packaging/macos/config.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ac/c++-features.m4 b/ac/c++-features.m4
index c43ea2c29..1d34f2b44 100644
--- a/ac/c++-features.m4
+++ b/ac/c++-features.m4
@@ -469,7 +469,7 @@ AC_DEFUN([AX_CXX17_STD_OPTIONAL],[
       [
   std::optional<int> moo;
   moo = 42;
-  return moo.value_or(54);
+  return moo ? moo.value() : moo.value_or(54);
 ],
       [ax_cv_cxx17_std_optional="yes"],
       [ax_cv_cxx17_std_optional="no"])
diff --git a/packaging/macos/build.sh b/packaging/macos/build.sh
index c8324507a..d3e1ca89f 100755
--- a/packaging/macos/build.sh
+++ b/packaging/macos/build.sh
@@ -487,7 +487,7 @@ MKVToolNix – macOS specific notes
 Configuration files are stored in ~/.config/bunkus.org and temporary
 files are stored in the folder automatically set via TMPDIR.
 
-This build works only with macOS 10.12 "Sierra" or newer. Older
+This build works only with macOS 10.14 "Mojave" or newer. Older
 releases that work on older macOS versions can be found at
 https://mkvtoolnix.download/downloads.html#macosx-old
 
diff --git a/packaging/macos/config.sh b/packaging/macos/config.sh
index d963f7e9d..f763cafd3 100644
--- a/packaging/macos/config.sh
+++ b/packaging/macos/config.sh
@@ -11,7 +11,7 @@ export CXXCPP="clang++ -E"
 export CFLAGS=""
 export CXXFLAGS="-std=c++17"
 export QT_CXXFLAGS="-stdlib=libc++"
-export MACOSX_DEPLOYMENT_TARGET="10.9"
+export MACOSX_DEPLOYMENT_TARGET="10.14"
 export DRAKETHREADS=${DRAKETHREADS:-4}
 export MAKEFLAGS="-j ${DRAKETHREADS}"
 export SHARED_QT=1