 @@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.76 2021/02/20 22:10:39 ryoon Exp $
+$NetBSD: distinfo,v 1.77 2021/03/22 11:59:23 schmonz Exp $
 SHA1 (pulseaudio-14.2.tar.xz) = 5dfc46595e981f0eb6308d07666f4108a69b2106
 RMD160 (pulseaudio-14.2.tar.xz) = 5e52b8549a0ece2b52df854b5edaa2998c438ccd
 SHA512 (pulseaudio-14.2.tar.xz) = 196338cbb26c542301b6d0579070dfbcc42e76dc17405f3e216af70519bec2003089b80c573a32d5f96bdab078631ca09ce89998ab7a0a8ffa26955a9bcb3c4a
 Size (pulseaudio-14.2.tar.xz) = 1951300 bytes
-SHA1 (patch-configure.ac) = 125098049a779b7afb70a7a4a625706a0c172683
+SHA1 (patch-configure.ac) = aac9be87aae9b3a4b3a8a8adc03a24cc038206a4
 SHA1 (patch-src_Makefile.am) = 5d136002c12016a8b451e84103a627685ec403de
 SHA1 (patch-src_modules_module-detect.c) = 860529fef9a14cbaa3979d985f5fde391b121484
 SHA1 (patch-src_modules_oss_module-oss.c) = d254f6c346d34470c9e178199c485e929bfd84c5
 SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb
 SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
 SHA1 (patch-src_pulsecore_shm.c) = c7079e8ac3461f5069e1415a2816784781aaa59c
 SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
 SHA1 (patch-src_utils_padsp.c) = e893d6848e2a2f6ef0cc11d1b1f5fb51abbc26a7

 @@ -1,102 +1,113 @@
-$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.
 * Fix unportable test(1) construct.
 * Adapt /var-paths for pkgsrc defaults.
 * Install default config files in example directory; pkgsrc config
   file framework will install them in the right place.
 * 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 @@
  AC_PREREQ(2.63)
 -AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
 +AC_INIT([pulseaudio],[14.2],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/])
  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])
 -        host_has_caps=1
          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]))
 +AS_IF([test "x$HAVE_MEMFD" = "x1"],
 +    AC_CHECK_FUNCS([memfd_create]))
++
  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])
 -PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
 +PA_MACHINE_ID_FALLBACK="${localstatedir}/db/dbus/machine-id"
  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])
 -PA_SYSTEM_CONFIG_PATH="${localstatedir}/lib/pulse"
 +PA_SYSTEM_CONFIG_PATH="${localstatedir}/db/pulse"
  AX_DEFINE_DIR(PA_SYSTEM_CONFIG_PATH, PA_SYSTEM_CONFIG_PATH, [System config dir])
 -PA_SYSTEM_STATE_PATH="${localstatedir}/lib/pulse"
 +PA_SYSTEM_STATE_PATH="${localstatedir}/db/pulse"
  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])
 -AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
 -AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
 +AC_SUBST(pulseconfdirreal, ["${sysconfdir}/pulse"])
 +AC_SUBST(pulseconfdir, ["${EGDIR}"])
 +AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdirreal, [Location of configuration files])
  #### 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
 -    LDFLAGS="$LDFLAGS -mmacosx-version-min=$mac_version_min"
 -    CFLAGS="$CFLAGS -mmacosx-version-min=$mac_version_min"
      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]))
 -if test "x$enable_stream_restore_clear_old_devices" == "xyes" ; then
 +if test "x$enable_stream_restore_clear_old_devices" = "xyes" ; then
      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)
 -AS_IF([test "x$enable_stream_restore_clear_old_devices" == "xyes"], ENABLE_STREAM_RESTORE_CLEAR_OLD_DEVICES=yes, ENABLE_STREAM_RESTORE_CLEAR_OLD_DEVICES=no)
 +AS_IF([test "x$enable_stream_restore_clear_old_devices" = "xyes"], ENABLE_STREAM_RESTORE_CLEAR_OLD_DEVICES=yes, ENABLE_STREAM_RESTORE_CLEAR_OLD_DEVICES=no)
  echo "
   ---{ $PACKAGE_NAME $VERSION }---