audio-drivers/pulseaudio: version 15.0

7 files changed, 94 insertions, 78 deletions

diff --git a/audio-drivers/pulseaudio/BUILD b/audio-drivers/pulseaudio/BUILD
index de071be5d8..e8f518df71 100755
--- a/audio-drivers/pulseaudio/BUILD
+++ b/audio-drivers/pulseaudio/BUILD
@@ -1,4 +1,4 @@
-OPTS="--with-database=${PULSE_DB} ${PULSEAUDIO_OPTS} ${OPTS}" &&
+OPTS="${PULSEAUDIO_OPTS} ${OPTS}" &&
 LDFLAGS="${LDFLAGS/-Wl,--as-needed}" &&
 
 default_build
diff --git a/audio-drivers/pulseaudio/CONFIGURE b/audio-drivers/pulseaudio/CONFIGURE
index 5f72841d70..38cd91d26a 100755
--- a/audio-drivers/pulseaudio/CONFIGURE
+++ b/audio-drivers/pulseaudio/CONFIGURE
@@ -1,6 +1,8 @@
+. "${GRIMOIRE}/MESON_CONFIGURE" &&
+
 config_query_option PULSEAUDIO_OPTS "Enable Adrian's echo canceller?" n \
-                                    "--enable-adrian-aec" \
-                                    "--disable-adrian-aec" &&
+                                    "adrian-aec=true" \
+                                    "adrian-aec=false" &&
 
 # backporting legacy options
 for o in PULSE_OSS PULSE_IP6; do
@@ -11,11 +13,11 @@ for o in PULSE_OSS PULSE_IP6; do
 done &&
 
 config_query_option PULSEAUDIO_OPTS "Enable OSS output support?" n \
-                                    "--enable-oss-output --enable-oss-wrapper" \
-                                    "--disable-oss-output --disable-oss-wrapper" &&
+                                    "oss-output=enabled" \
+                                    "oss-output=disabled" &&
 
 config_query_option PULSEAUDIO_OPTS "Enable IPv6 support?" n \
-                                    "--enable-ipv6" \
-                                    "--disable-ipv6" &&
+                                    "ipv6=true" \
+                                    "ipv6=false" &&
 
 config_query_list PULSE_DB 'which configuration database do you want?' gdbm tdb simple auto
diff --git a/audio-drivers/pulseaudio/DEPENDS b/audio-drivers/pulseaudio/DEPENDS
index e7b8058755..8554fbdf46 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -1,20 +1,20 @@
+depends meson &&
+depends cmake &&
+depends check &&
+
 if [[ "$PULSE_DB" == 'gdbm' ]]; then
-   depends gdbm
+   depends gdbm "database=gdbm"
 elif [[ "$PULSE_DB" == 'tdb' ]]; then
-   depends tdb
+   depends tdb "database=tdb"
 else
    message "using configuration database $PULSE_DB"
 fi &&
 
 # gettext is needed in order to build the desktop files
 depends GETTEXT   &&
-#optional_depends GETTEXT                        \
-#                 "--enable-nls"                 \
-#                 "--disable-nls"                \
-#                 "for Native Language Support"  &&
 optional_depends libx11                           \
-                 "--enable-x11"                   \
-                 "--disable-x11"                  \
+                 "x11=enabled"                   \
+                 "x11=disabled"                  \
                  "Enable X11 support?"            &&
 
 if is_depends_enabled $SPELL libx11; then
@@ -23,17 +23,21 @@ if is_depends_enabled $SPELL libx11; then
   depends  libxext  &&
   depends  libxtst
 fi  &&
-optional_depends alsa-lib                         \
-                 "--enable-alsa"                  \
-                 "--disable-alsa"                 \
+optional_depends alsa-lib                     \
+                 "alsa=enabled"                  \
+                 "alsa=disabled"                 \
                  "Enable Advanced Linux Sound Architecture support? (RECOMMENDED)"  &&
-optional_depends glib2                            \
-                 "--enable-glib2"                 \
-                 "--disable-glib2"                \
-                 "Enable glib2 support?"          &&
+optional_depends elogind                       \
+                 "elogind=enabled"                 \
+                 "elogind=disabled"                \
+                 "Enable elogind support?"     &&
+optional_depends glib2                       \
+                 "glib=enabled"                 \
+                 "glib=disabled"                \
+                 "Enable glib2 support?"     &&
 optional_depends gtk+3 \
-                 "--enable-gtk3" \
-                 "--disable-gtk3" \
+                 "gtk=enabled" \
+                 "gtk=disabled" \
                  "for GTK+3 support" &&
 
 if is_depends_enabled $SPELL gtk+3; then
@@ -41,88 +45,94 @@ if is_depends_enabled $SPELL gtk+3; then
 fi  &&
 
 optional_depends gconf2 \
-                 "--enable-gconf" \
-                 "--disable-gconf" \
-                 "for gconf support" &&
-optional_depends avahi                                \
-                 "--enable-avahi"                     \
-                 "--disable-avahi"                    \
+                 "gsettings=enabled" \
+                 "gsettings=disabled" \
+                 "for gsettings support" &&
+optional_depends avahi                            \
+                 "avahi=enabled"                     \
+                 "avahi=disabled"                    \
                  "for ZerConf configuration support"  &&
 optional_depends JACK-DRIVER                      \
-                 "--enable-jack"                  \
-                 "--disable-jack"                 \
+                 "jack=enabled"                  \
+                 "jack=disabled"                 \
                  "for low-latency sound server support?"  &&
 optional_depends libasyncns                       \
-                 "--enable-asyncns"               \
-                 "--disable-asyncns"              \
+                 "asyncns=enabled"               \
+                 "asyncns=disabled"              \
                  "for asynchronous service queries?"  &&
 optional_depends tcp_wrappers                     \
-                 "--enable-tcpwrap"               \
-                 "--disable-tcpwrap"              \
+                 "tcpwrap=enabled"               \
+                 "tcpwrap=disabled"              \
                  "Enable TCP network filtering?"  &&
 optional_depends lirc                             \
-                 "--enable-lirc"                  \
-                 "--disable-lirc"                 \
+                 "lirc=enabled"                  \
+                 "lirc=disabled"                 \
                  "Enable infra-red remote control support?"  &&
 optional_depends DEVICE-MANAGER                \
-                 "--enable-udev --disable-hal-compat" \
-                 "--disable-udev"              \
+                 "udev=enabled hal-compat=false" \
+                 "udev=disabled"              \
                  "for device hotplug support"  &&
 optional_depends bluez5 \
-                 "--enable-bluez5" \
-                 "--disable-bluez5" \
+                 "bluez5=enabled" \
+                 "bluez5=disabled" \
                  "for BlueZ-5 support" &&
 optional_depends gstreamer-1.0 \
-                 "--enable-gstreamer" \
-                 "--disable-gstreamer" \
+                 "gstreamer=enabled" \
+                 "gstreamer=disabled" \
                  "for GStreamer-based RTP support" &&
+if is_depends_enabled $SPELL bluez5 && \
+    is_depends_enabled $SPELL gstreamer-1.0; then
+  OPTS+=" bluez5-gstreamer=enabled"
+fi &&
 
 if is_depends_enabled $SPELL bluez ||
    is_depends_enabled $SPELL bluez5; then
   depends sbc &&
-  depends dbus "--enable-dbus"
+  depends dbus "dbus=enabled"
 else
-  optional_depends dbus                        \
-                   "--enable-dbus"             \
-                   "--disable-dbus"            \
+  optional_depends dbus                    \
+                   "dbus=enabled"             \
+                   "dbus=disabled"            \
                    "for D-BUS system messaging" 
 fi &&
 
 optional_depends SSL \
-                 "--enable-openssl" \
-                 "--disable-openssl" \
+                 "openssl=enabled" \
+                 "openssl=disabled" \
                  "for SSL support (Airtunes/RAOP)" &&
 optional_depends doxygen \
-                 "--enable-manpages" \
-                 "--disable-manpages" \
-                 "for manpage generation" &&
-optional_depends libcap                           \
-                 "--with-caps"                    \
-                 "--without-caps"                 \
-                 "Enable POSIX capability support?"          &&
+                 "doxygen=true man=true" \
+                 "doxygen=false man=false" \
+                 "for doxygen-generated documentation" &&
 
 optional_depends fftw \
-                '--with-fftw' \
-                '--without-fftw' \
+                'fftw=enabled' \
+                'fftw=disabled' \
                 'build equalizer' &&
 
 optional_depends orc \
-                 '--enable-orc' \
-                 '--disable-orc' \
+                 'orc=enabled' \
+                 'orc=disabled' \
                  'improve code' &&
-#optional_depends policykit                        \
-#                 "--enable-polkit"                \
-#                 "--disable-polkit"               \
-#                 "for PolicyKit authentication support"  &&
 
 optional_depends speexdsp \
-                 "--with-speex" \
-                 "--without-speex" \
-                 "for resampling support" &&
+                 "speex=enabled" \
+                 "speex=disabled" \
+                 "for speex resampling support" &&
+
+optional_depends soxr \
+                 "soxr=enabled" \
+                 "soxr=disabled" \
+                 "for SoXR resampling support" &&
+
+optional_depends systemd \
+                 "systemd=enabled" \
+                 "systemd=disabled" \
+                 "for systemd support" &&
 
 optional_depends webrtc-audio-processing \
-                 "--enable-webrtc-aec" \
-                 "--disable-webrtc-aec" \
+                 "webrtc-aec=enabled" \
+                 "webrtc-aec=disabled" \
                  "for WebRTC-based echo canceller" &&
 
 if is_depends_enabled ${SPELL} webrtc-audio-processing; then
@@ -130,7 +140,8 @@ if is_depends_enabled ${SPELL} webrtc-audio-processing; then
 fi &&
 
 suggest_depends  pasystray     ''  ''  'for Preferences tool & System Tray' &&
-suggest_depends  paprefs       ''  ''  'for Preferences tool'     &&
-suggest_depends  pavucontrol   ''  ''  'for Volume Control tool'  &&
-suggest_depends  pavumeter     ''  ''  'for Volume Meter tool'    &&
+suggest_depends  paprefs       ''  ''  'for Preferences tool'               &&
+suggest_depends  pavucontrol   ''  ''  'for Volume Control tool'            &&
+suggest_depends  ncpamixer     ''  ''  'for TUI Volume Control tool'        &&
+suggest_depends  pavumeter     ''  ''  'for Volume Meter tool'              &&
 suggest_depends  paman         ''  ''  'for Manager tool'
diff --git a/audio-drivers/pulseaudio/DETAILS b/audio-drivers/pulseaudio/DETAILS
index 0064199969..23f8db4841 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,6 +1,7 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=pulseaudio
-         VERSION=14.2
-     SOURCE_HASH=sha512:196338cbb26c542301b6d0579070dfbcc42e76dc17405f3e216af70519bec2003089b80c573a32d5f96bdab078631ca09ce89998ab7a0a8ffa26955a9bcb3c4a
+         VERSION=15.0
+     SOURCE_HASH=sha512:352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
           SOURCE=${SPELL}-${VERSION}.tar.xz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=https://freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY
index 9f89efd9f8..ed92950e47 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,6 @@
+2021-08-21  Florian Franzmann  <bwlf@bandrate.org>
+	* DETAILS, BUILD, DEPENDS, SUB_DEPENDS, CONFIGURE: version 15.0
+
 2021-05-07 Florian Franzmann <bwlf@bandrate.org>
 	* DETAILS, DEPENDS: version 14.2
 
diff --git a/audio-drivers/pulseaudio/PRE_BUILD b/audio-drivers/pulseaudio/PRE_BUILD
index aac16a131c..b831fbc600 100755
--- a/audio-drivers/pulseaudio/PRE_BUILD
+++ b/audio-drivers/pulseaudio/PRE_BUILD
@@ -1,6 +1,5 @@
 default_pre_build  &&
 cd $SOURCE_DIRECTORY &&
-sed -i 's/-Werror//' configure &&
 
 for group in pulse{,-rt,-access}; do
   create_group $group
diff --git a/audio-drivers/pulseaudio/SUB_DEPENDS b/audio-drivers/pulseaudio/SUB_DEPENDS
index 4e48b80f61..e72305eb65 100755
--- a/audio-drivers/pulseaudio/SUB_DEPENDS
+++ b/audio-drivers/pulseaudio/SUB_DEPENDS
@@ -1,9 +1,9 @@
 case $THIS_SUB_DEPENDS in
   AVAHI) echo "ZeroConf support requested, forcing avahi dependency."
-         depends  avahi  '--enable-avahi'
+         depends  avahi  'avahi=enabled'
          ;;
    GLIB) echo "GNOME support requested, forcing glib2 dependency."
-         depends  glib2  '--enable-glib2'
+         depends  glib2  'gsettings=enabled'
          ;;
       *) echo "Unknown sub-dependency $THIS_SUB_DEPENDS!"
          return 1