pulseaudio: => 12.2

5 files changed, 46 insertions, 10 deletions

diff --git a/audio-drivers/pulseaudio/BUILD b/audio-drivers/pulseaudio/BUILD
index 06e658d645..de071be5d8 100755
--- a/audio-drivers/pulseaudio/BUILD
+++ b/audio-drivers/pulseaudio/BUILD
@@ -1,3 +1,4 @@
-OPTS="$PULSE_OSS $PULSE_IP6 --with-database=$PULSE_DB $OPTS" &&
+OPTS="--with-database=${PULSE_DB} ${PULSEAUDIO_OPTS} ${OPTS}" &&
 LDFLAGS="${LDFLAGS/-Wl,--as-needed}" &&
+
 default_build
diff --git a/audio-drivers/pulseaudio/CONFIGURE b/audio-drivers/pulseaudio/CONFIGURE
index 8b67f7607d..5f72841d70 100755
--- a/audio-drivers/pulseaudio/CONFIGURE
+++ b/audio-drivers/pulseaudio/CONFIGURE
@@ -1,7 +1,21 @@
-config_query_option PULSE_OSS 'build OSS support?' n \
-                    '--enable-oss-output --enable-oss-wrapper' \
-                    '--disable-oss-output --disable-oss-wrapper' &&
-config_query_option PULSE_IP6 'enable IPv6 support?' n \
-                    '--enable-ipv6' \
-                    '--disable-ipv6' &&
+config_query_option PULSEAUDIO_OPTS "Enable Adrian's echo canceller?" n \
+                                    "--enable-adrian-aec" \
+                                    "--disable-adrian-aec" &&
+
+# backporting legacy options
+for o in PULSE_OSS PULSE_IP6; do
+  if [[ -n ${!o} ]]; then
+    list_add "PULSEAUDIO_OPTS" "${!o}"
+    persistent_remove ${o}
+  fi
+done &&
+
+config_query_option PULSEAUDIO_OPTS "Enable OSS output support?" n \
+                                    "--enable-oss-output --enable-oss-wrapper" \
+                                    "--disable-oss-output --disable-oss-wrapper" &&
+
+config_query_option PULSEAUDIO_OPTS "Enable IPv6 support?" n \
+                                    "--enable-ipv6" \
+                                    "--disable-ipv6" &&
+
 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 b234f6f747..0b4886d59b 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -115,7 +115,19 @@ optional_depends orc \
 #                 "--disable-polkit"               \
 #                 "for PolicyKit authentication support"  &&
 
-optional_depends speex '' '--without-speex' 'resampling support' &&
+optional_depends speexdsp \
+                 "--with-speex" \
+                 "--without-speex" \
+                 "for resampling support" &&
+
+optional_depends webrtc-audio-processing \
+                 "--enable-webrtc-aec" \
+                 "--disable-webrtc-aec" \
+                 "for WebRTC-based echo canceller" &&
+
+if is_depends_enabled ${SPELL} webrtc-audio-processing; then
+  depends -sub CXX gcc
+fi &&
 
 suggest_depends  pasystray     ''  ''  'for Preferences tool & System Tray' &&
 suggest_depends  paprefs       ''  ''  'for Preferences tool'     &&
diff --git a/audio-drivers/pulseaudio/DETAILS b/audio-drivers/pulseaudio/DETAILS
index ac32523e66..8c9a36c7e4 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pulseaudio
-         VERSION=11.1
-     SOURCE_HASH=sha512:8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
+         VERSION=12.2
+     SOURCE_HASH=sha512:877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
           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 fae0bcfd2c..1bcc612ee6 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,12 @@
+2019-04-12 Vlad Glagolev <stealth@sourcemage.org>
+	* DEPENDS: updated speex flags, correct dependency is speexdsp; added
+	  webrtc-audio-processing optional dependency
+	* CONFIGURE: revamped; added Adrian AEC flags
+	* BUILD: use PULSEAUDIO_OPTS
+
+2019-04-10 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 12.2
+
 2018-02-26 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 11.1
 	* DEPENDS: multiple changes