aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-04-14 18:41:05 -0700
committerAnders Broman <a.broman58@gmail.com>2018-04-15 05:33:12 +0000
commit08c234445855bdc038912b943499511fd97e0d91 (patch)
treea8774c696551cb23e3c9d080f746266ef3dc928b
parent4adaa3a4b184ac6f59f7a257dfec56db87ae87c5 (diff)
Remove some references to PortAudio.
Change-Id: Icfe9516ff814db5362aa345e6f527551dcb13935 Reviewed-on: https://code.wireshark.org/review/26946 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--docbook/wsdg_src/WSDG_chapter_libraries.asciidoc22
-rw-r--r--docbook/wsug_src/WSUG_chapter_build_install.asciidoc2
-rw-r--r--version_info.c9
-rw-r--r--version_info.h9
4 files changed, 9 insertions, 33 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
index 2549749..b6eb8ae 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
@@ -312,28 +312,6 @@ http://www.lua.org/download.html[].
We provide a copy of the official package at
https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[].
-[[ChLibsPortAudio]]
-
-=== PortAudio (optional)
-
-The PortAudio library enables audio output for RTP streams.
-
-[[ChLibsUnixPortAudio]]
-
-==== Unix
-
-If this library isn't already installed or available as a
-package for your platform, you can get it at
-http://www.portaudio.com/download.html[].
-
-[[ChLibsWin32PortAudio]]
-
-==== Win32 MSVC
-
-The PortAudio sources are downloaded from
-https://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/[] and compiled
-locally.
-
[[ChLibsMaxMindDB]]
=== MaxMindDB (optional)
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
index 2ed9f6d..60461b9 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc
@@ -378,7 +378,7 @@ Use the following command to install Wireshark under Gentoo Linux with all of
the extra features:
----
-$ USE="c-ares ipv6 portaudio snmp ssl kerberos threads selinux" emerge wireshark
+$ USE="c-ares ipv6 snmp ssl kerberos threads selinux" emerge wireshark
----
==== Installing from packages under FreeBSD
diff --git a/version_info.c b/version_info.c
index 6c80bd9..b6ddc6a 100644
--- a/version_info.c
+++ b/version_info.c
@@ -93,9 +93,8 @@ get_zlib_compiled_version_info(void)
*
* "append_info" is called at the end to append any additional
* information after the standard library information. This is
- * required in order to, for example, put the Portaudio information
- * at the end of the string, as we currently don't use Portaudio in
- * TShark.
+ * required in order to, for example, put Qt information at the
+ * end of the string, as we don't use Qt in TShark.
*/
GString *
get_compiled_version_info(void (*prepend_info)(GString *),
@@ -301,8 +300,8 @@ get_locale(void)
*
* "additional_info" is called at the end to append any additional
* information; this is required in order to, for example, put the
- * Portaudio information at the end of the string, as we currently
- * don't use Portaudio in TShark.
+ * libcap information at the end of the string, as we currently
+ * don't use libcap in TShark.
*/
GString *
get_runtime_version_info(void (*additional_info)(GString *))
diff --git a/version_info.h b/version_info.h
index e581b67..4dfb74f 100644
--- a/version_info.h
+++ b/version_info.h
@@ -27,9 +27,8 @@ extern "C" {
*
* "append_info" is called at the end to append any additional
* information after the standard library information. This is
- * required in order to, for example, put the Portaudio information
- * at the end of the string, as we currently don't use Portaudio in
- * TShark.
+ * required in order to, for example, put Qt information at the
+ * end of the string, as we don't use Qt in TShark.
*/
GString *get_compiled_version_info(void (*prepend_info)(GString *),
void (*append_info)(GString *));
@@ -40,8 +39,8 @@ GString *get_compiled_version_info(void (*prepend_info)(GString *),
*
* "additional_info" is called at the end to append any additional
* information; this is required in order to, for example, put the
- * Portaudio information at the end of the string, as we currently
- * don't use Portaudio in TShark.
+ * libcap information at the end of the string, as we currently
+ * don't use libcap in TShark.
*/
GString *get_runtime_version_info(void (*additional_info)(GString *));