@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.16 2021/03/22 11:59:23 schmonz Exp $
* Don't assume sys/capability.h is guaranteed present on Linux.
* Fix NetBSD detection for libatomics_ops check.
@@ -9,9 +9,10 @@
* Avoid hardcoded SDK paths on Darwin.
* Check for memfd_create instead of assuming libc does not define it.
(Will be included in next release after 11.1)
-* On Darwin, do not use macosx-version-min.
+* On Darwin, do not use macosx-version-min, and remove old NSIG
+ workaround.
---- configure.ac.orig 2020-11-23 18:31:13.000000000 +0000
+--- configure.ac.orig 2021-01-16 17:26:36.000000000 +0000
+++ configure.ac
@@ -21,7 +21,7 @@
@@ -22,7 +23,7 @@
AC_CONFIG_SRCDIR([src/daemon/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
-@@ -123,7 +123,6 @@ AC_MSG_CHECKING([host operating system])
+@@ -120,7 +120,6 @@ AC_MSG_CHECKING([host operating system])
case "$host_os" in
linux*)
AC_MSG_RESULT([linux])
@@ -30,7 +31,17 @@
os_is_linux=1
;;
freebsd*)
-@@ -620,6 +619,9 @@ AS_IF([test "x$enable_memfd" = "xyes" &&
+@@ -151,9 +150,6 @@ AC_SUBST([OS_IS_WIN32], [$os_is_win32])
+
+ # Platform specific hacks
+ case "$host_os" in
+- darwin* )
+- AC_DEFINE([_DARWIN_C_SOURCE], [200112L], [Needed to get NSIG on Mac OS X])
+- ;;
+ mingw* )
+ AC_DEFINE([WIN32_LEAN_AND_MEAN], 1, [Needed to avoid including unnecessary headers on Windows])
+ ;;
+@@ -617,6 +613,9 @@ AS_IF([test "x$enable_memfd" = "xyes" &&
AS_IF([test "x$HAVE_MEMFD" = "x1"],
AC_CHECK_FUNCS([memfd_create]))
@@ -40,7 +51,7 @@
AC_SUBST(HAVE_MEMFD)
AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
-@@ -1073,7 +1075,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
+@@ -1070,7 +1069,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE
PA_MACHINE_ID="${sysconfdir}/machine-id"
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
@@ -49,7 +60,7 @@
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
[Fallback machine-id file])
-@@ -1378,9 +1380,9 @@ fi
+@@ -1375,9 +1374,9 @@ fi
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
@@ -61,7 +72,7 @@
AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
PA_BINARY=${bindir}/pulseaudio${EXEEXT}
-@@ -1392,8 +1394,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
+@@ -1389,8 +1388,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY
AC_SUBST(PA_SOEXT, [.so])
AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
@@ -73,7 +84,7 @@
#### Mac OSX specific stuff #####
-@@ -1410,8 +1413,6 @@ AC_ARG_WITH(mac-sysroot,
+@@ -1407,8 +1407,6 @@ AC_ARG_WITH(mac-sysroot,
mac_sysroot=$withval)
if test "x$os_is_darwin" = "x1" ; then
@@ -82,7 +93,7 @@
if test "x$mac_sysroot" != "x" ; then
LDFLAGS="$LDFLAGS -isysroot $mac_sysroot"
-@@ -1481,7 +1482,7 @@ fi
+@@ -1478,7 +1476,7 @@ fi
AC_ARG_ENABLE([stream-restore-clear-old-devices],
AS_HELP_STRING([--enable-stream-restore-clear-old-devices], [Forget per-stream routing settings that have been set before version 14.0. Recommended when using GNOME. See https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/832]))
@@ -91,7 +102,7 @@
AC_DEFINE(STREAM_RESTORE_CLEAR_OLD_DEVICES, [1], [module-stream-restore: Clear old devices])
fi
-@@ -1661,7 +1662,7 @@ AS_IF([test "x$HAVE_ESOUND" = "x1" -a "x
+@@ -1658,7 +1656,7 @@ AS_IF([test "x$HAVE_ESOUND" = "x1" -a "x
AS_IF([test "x$HAVE_GCOV" = "x1"], ENABLE_GCOV=yes, ENABLE_GCOV=no)
AS_IF([test "x$HAVE_LIBCHECK" = "x1"], ENABLE_TESTS=yes, ENABLE_TESTS=no)
AS_IF([test "x$enable_legacy_database_entry_format" != "xno"], ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=yes, ENABLE_LEGACY_DATABASE_ENTRY_FORMAT=no)