diff options
author | schmonz <schmonz@pkgsrc.org> | 2021-03-22 11:59:23 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2021-03-22 11:59:23 +0000 |
commit | d04453250f9ec087ba783b4d64767f4a0d954835 (patch) | |
tree | 394dec5134529cb2b94be80a34be54e1a730f4cf /audio | |
parent | 50d5589ec384c082f9aa98278c84ce27c066db7c (diff) | |
download | pkgsrc-d04453250f9ec087ba783b4d64767f4a0d954835.tar.gz |
Remove old NSIG workaround for macOS to fix configure.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/pulseaudio/distinfo | 4 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-configure.ac | 33 |
2 files changed, 24 insertions, 13 deletions
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 357bc01485a..d6ef1d7bb67 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,10 +1,10 @@ -$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 diff --git a/audio/pulseaudio/patches/patch-configure.ac b/audio/pulseaudio/patches/patch-configure.ac index c939501fef9..b91313e45d2 100644 --- a/audio/pulseaudio/patches/patch-configure.ac +++ b/audio/pulseaudio/patches/patch-configure.ac @@ -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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ * 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ #### 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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 @@ $NetBSD: patch-configure.ac,v 1.15 2021/02/07 06:25:31 ryoon Exp $ 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) |