pulseaudio: corrected OSS options, added ipv6 option, disabled polkit as

configure no longer supports it, re-ordered dependency list for easy
updating, added missing deps and database selection.

4 files changed, 90 insertions, 46 deletions

diff --git a/audio-drivers/pulseaudio/BUILD b/audio-drivers/pulseaudio/BUILD
index ffdce6d392..06e658d645 100755
--- a/audio-drivers/pulseaudio/BUILD
+++ b/audio-drivers/pulseaudio/BUILD
@@ -1,3 +1,3 @@
-OPTS="$PULSE_OSS $OPTS" &&
+OPTS="$PULSE_OSS $PULSE_IP6 --with-database=$PULSE_DB $OPTS" &&
 LDFLAGS="${LDFLAGS/-Wl,--as-needed}" &&
 default_build
diff --git a/audio-drivers/pulseaudio/CONFIGURE b/audio-drivers/pulseaudio/CONFIGURE
index 669e488615..8b67f7607d 100755
--- a/audio-drivers/pulseaudio/CONFIGURE
+++ b/audio-drivers/pulseaudio/CONFIGURE
@@ -1 +1,7 @@
-config_query_option PULSE_OSS 'build OSS support?' n '--enable-oss' '--disable-oss'
+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_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 b44f12a16f..4abbddccc7 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -1,72 +1,101 @@
 depends liboil                                    &&
-depends libsamplerate                             &&
 depends libsndfile                                &&
 depends libatomic_ops                             &&
-depends gdbm                                      &&
 depends speex                                     &&
-optional_depends -sub HWDB udev                \
-                 "--enable-udev"               \
-                 "--disable-udev"              \
-                 "for device hotplug support"  &&
-optional_depends dbus                          \
-                 "--enable-dbus"               \
-                 "--disable-dbus"              \
-                 "for D-BUS system messaging"  &&
-optional_depends hal                              \
-                 "--enable-hal"                   \
-                 "--disable-hal"                  \
-                 "Enable Hardware Abstraction Layer support?"  &&
-optional_depends tcp_wrappers                     \
-                 "--enable-tcpwrap"               \
-                 "--disable-tcpwrap"              \
-                 "Enable TCP network filtering?"  &&
+
+if [[ "$PULSE_DB" == 'gdbm' ]]; then
+   depends gdbm
+elif [[ "$PULSE_DB" == 'tdb' ]]; then
+   depends tdb
+else
+   message "using configuration database $PULSE_DB"
+fi &&
+
+optional_depends gettext                        \
+                 "--enable-nls"                 \
+                 "--disable-nls"                \
+                 "for Native Language Support"  &&
+optional_depends xorg-libs                        \
+                 "--enable-x11"                   \
+                 "--disable-x11"                  \
+                 "Enable X11 support?"            &&
+depends libsamplerate                             &&
 optional_depends alsa-lib                         \
                  "--enable-alsa"                  \
                  "--disable-alsa"                 \
                  "Enable Advanced Linux Sound Architecture support? (RECOMMENDED)"  &&
-optional_depends JACK-DRIVER                      \
-                 "--enable-jack"                  \
-                 "--disable-jack"                 \
-                 "for low-latency sound server support?"  &&
 optional_depends glib2                            \
                  "--enable-glib2"                 \
                  "--disable-glib2"                \
                  "Enable glib2 support?"          &&
-optional_depends lirc                             \
-                 "--enable-lirc"                  \
-                 "--disable-lirc"                 \
-                 "Enable infra-red remote control support?"  &&
+optional_depends gtk+2 \
+                 "--enable-gtk2" \
+                 "--disable-gtk2" \
+                 "for GTK+2 support" &&
+optional_depends gconf2 \
+                 "--enable-gconf" \
+                 "--disable-gconf" \
+                 "for gconf support" &&
+optional_depends avahi                                \
+                 "--enable-avahi"                     \
+                 "--disable-avahi"                    \
+                 "for ZerConf configuration support"  &&
+optional_depends JACK-DRIVER                      \
+                 "--enable-jack"                  \
+                 "--disable-jack"                 \
+                 "for low-latency sound server support?"  &&
 optional_depends libasyncns                       \
                  "--enable-asyncns"               \
                  "--disable-asyncns"              \
                  "for asynchronous service queries?"  &&
+optional_depends tcp_wrappers                     \
+                 "--enable-tcpwrap"               \
+                 "--disable-tcpwrap"              \
+                 "Enable TCP network filtering?"  &&
+optional_depends lirc                             \
+                 "--enable-lirc"                  \
+                 "--disable-lirc"                 \
+                 "Enable infra-red remote control support?"  &&
+optional_depends hal                              \
+                 "--enable-hal"                   \
+                 "--disable-hal"                  \
+                 "Enable Hardware Abstraction Layer support?"  &&
+optional_depends -sub HWDB udev                \
+                 "--enable-udev"               \
+                 "--disable-udev"              \
+                 "for device hotplug support"  &&
+optional_depends bluez \
+                 "--enable-bluez" \
+                 "--disable-bluez" \
+                 "for BlueZ support" &&
+optional_depends dbus                          \
+                 "--enable-dbus"               \
+                 "--disable-dbus"              \
+                 "for D-BUS system messaging"  &&
+optional_depends openssl \
+                 "--enable-openssl" \
+                 "--disable-openssl" \
+                 "for SSL support (Airtunes/RAOP)" &&
+optional_depends doxygen \
+                 "--enable-manpages" \
+                 "--disable-manpages" \
+                 "for manpage generation" &&
 optional_depends libcap                           \
                  "--with-caps"                    \
                  "--without-caps"                 \
-                 "Enable POSIX support?"          &&
-optional_depends xorg-libs                        \
-                 "--enable-x11"                   \
-                 "--disable-x11"                  \
-                 "Enable X11 support?"            &&
+                 "Enable POSIX capability support?"          &&
 
 if is_depends_enabled $SPELL xorg-libs; then
   depends libxtst
 fi &&
 
-optional_depends policykit                        \
-                 "--enable-polkit"                \
-                 "--disable-polkit"               \
-                 "for PolicyKit authentication support"  &&
-optional_depends avahi                                \
-                 "--enable-avahi"                     \
-                 "--disable-avahi"                    \
-                 "for ZerConf configuration support"  &&
-optional_depends gettext                        \
-                 "--enable-nls"                 \
-                 "--disable-nls"                \
-                 "for Native Language Support"  &&
+#optional_depends policykit                        \
+#                 "--enable-polkit"                \
+#                 "--disable-polkit"               \
+#                 "for PolicyKit authentication support"  &&
 
 suggest_depends  padevchooser  ''  ''  'for Preferences tool'     &&
 suggest_depends  paprefs       ''  ''  'for Preferences tool'     &&
 suggest_depends  pavucontrol   ''  ''  'for Volume Control tool'  &&
-suggest_depends  pavumeter     ''  ''  'for Volume Meter tool'
+suggest_depends  pavumeter     ''  ''  'for Volume Meter tool'    &&
+suggest_depends  paman         ''  ''  'for Manager tool'
diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY
index a0a4425b01..313aa4c063 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,12 @@
+2011-09-19 Arjan Bouter <abouter@sourcemage.org>
+	* CONFIGURE: corrected oss options and added ipv6 switches
+	* DEPENDS: disabled polkit, no longer supported by configure.
+	  Re-ordered all deps like configure for easy checking.
+	  Added optional deps for gtk+2, gconf2, bluez, openssl, paman and
+	  doxygen.
+	  Added configuration database selection.
+	* BUILD: added ipv6 and database options to OPTS
+
 2011-07-13 Arjan Bouter <abouter@sourcemage.org>
 	* DEPENDS: switched the udev sub_depends from extras to hwdb.