diff options
| -rw-r--r-- | README.macos | 10 | ||||
| -rw-r--r-- | cmake/modules/FindPORTAUDIO.cmake | 85 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 3 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | epan/prefs.c | 18 | ||||
| -rw-r--r-- | epan/prefs.h | 2 | ||||
| -rwxr-xr-x | tools/debian-setup.sh | 2 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 2 | ||||
| -rw-r--r-- | ui/Makefile.am | 2 | ||||
| -rw-r--r-- | ui/cli/Makefile.am | 2 |
10 files changed, 6 insertions, 122 deletions
diff --git a/README.macos b/README.macos index e53e946d2f..cf630451b8 100644 --- a/README.macos +++ b/README.macos @@ -139,16 +139,6 @@ is to run the configure script with the --disable-asm argument, so that the assembler-language routines are not used. The tools/macos-setup.sh will configure libgcrypt with that option. -PortAudio - when compiling on macOS, the configure script for the -pa_stable_v19_20071207 version of PortAudio will cause certain -platform-dependent build environment #defines to be set in the Makefile -rules, and to cause a universal build to be done; those #defines will be -incorrect for all but one of the architectures for which the build is -being done, and that will cause a compile-time error on Snow Leopard. -Newer versions don't have this problem, but still fail to build on Lion -if a universal build is attempted. The tools/macos-setup.sh script -downloads a newer version, and also suppresses the universal build. - If you want to build Wireshark installer packages on a system that doesn't include Xcode 3.x or earlier, you will need to install some additional tools. From the Xcode menu, select the Open Developer Tool diff --git a/cmake/modules/FindPORTAUDIO.cmake b/cmake/modules/FindPORTAUDIO.cmake deleted file mode 100644 index d8f27d38e1..0000000000 --- a/cmake/modules/FindPORTAUDIO.cmake +++ /dev/null @@ -1,85 +0,0 @@ -# -# - Find portaudio -# Find the native PORTAUDIO includes and library -# -# PORTAUDIO_INCLUDE_DIRS - where to find portaudio.h, etc. -# PORTAUDIO_LIBRARIES - List of libraries when using portaudio. -# PORTAUDIO_FOUND - True if portaudio found. -# -# For Windows, Portaudio is just a set of headers, there is no library -# we build an archive ourselves -# So set PORTAUDIO_SRC_DIR and PORT_AUDIO_INCLUDE_DIRS - - -IF (PORTAUDIO_INCLUDE_DIRS) - # Already in cache, be silent - SET(PORTAUDIO_FIND_QUIETLY TRUE) -ENDIF (PORTAUDIO_INCLUDE_DIRS) - -INCLUDE(FindWSWinLibs) -FindWSWinLibs("portaudio_.*" "PORTAUDIO_HINTS") - -find_package(PkgConfig) -pkg_search_module(PORTAUDIO portaudio-2.0) - -FIND_PATH(PORTAUDIO_INCLUDE_DIR portaudio.h - HINTS - "${PORTAUDIO_INCLUDEDIR}" - "${PORTAUDIO_HINTS}/include" -) - -SET(PORTAUDIO_NAMES portaudio) -FIND_LIBRARY(PORTAUDIO_LIBRARY NAMES ${PORTAUDIO_NAMES} - HINTS "${PORTAUDIO_LIBDIR}") - -# handle the QUIETLY and REQUIRED arguments and set PORTAUDIO_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -IF(WIN32) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(PORTAUDIO DEFAULT_MSG PORTAUDIO_INCLUDE_DIR) -ELSE(WIN32) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(PORTAUDIO DEFAULT_MSG PORTAUDIO_LIBRARY PORTAUDIO_INCLUDE_DIR) -ENDIF(WIN32) - -IF(PORTAUDIO_FOUND) - IF(WIN32) - SET( PORTAUDIO_LIBRARIES "" ) - SET( PORTAUDIO_SRC_DIR "${PORTAUDIO_HINTS}/src" ) - SET( PORTAUDIO_INCLUDE_DIR - ${PORTAUDIO_INCLUDE_DIR} - ${PORTAUDIO_SRC_DIR}/common - ${PORTAUDIO_SRC_DIR}/os/win - ) - ELSE(WIN32) - SET( PORTAUDIO_LIBRARIES ${PORTAUDIO_LIBRARY} ) - ENDIF(WIN32) - SET( PORTAUDIO_INCLUDE_DIRS ${PORTAUDIO_INCLUDE_DIR} ) - - # Check for newer PortAudio V19 API - # http://www.portaudio.com/docs/proposals/018-VersionInformationInterface.html - IF(WIN32) - # We only have the newer version on Windows - SET( PORTAUDIO_API_1 ) - ELSE(WIN32) - INCLUDE(CMakePushCheckState) - INCLUDE(CheckFunctionExists) - CMAKE_PUSH_CHECK_STATE() - SET(CMAKE_REQUIRED_INCLUDES ${PORTAUDIO_INCLUDE_DIRS}) - SET(CMAKE_REQUIRED_LIBRARIES ${PORTAUDIO_LIBRARIES}) - CHECK_FUNCTION_EXISTS(Pa_GetVersion HAVE_PA_GETVERSION) - CMAKE_POP_CHECK_STATE() - IF(HAVE_PA_GETVERSION) - # Symbol found, must be the newer V19 API - SET( PORTAUDIO_API_1 ) - ELSE(HAVE_PA_GETVERSION) - # Symbol not found, must be the older V18 API - SET( PORTAUDIO_API_1 1 ) - ENDIF(HAVE_PA_GETVERSION) - ENDIF(WIN32) -ELSE(PORTAUDIO_FOUND) - SET( PORTAUDIO_LIBRARIES ) - SET( PORTAUDIO_INCLUDE_DIRS ) - SET( PORTAUDIO_SRC_DIR ) -ENDIF(PORTAUDIO_FOUND) - -MARK_AS_ADVANCED( PORTAUDIO_LIBRARIES PORTAUDIO_INCLUDE_DIRS PORTAUDIO_SRC_DIR ) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index d3881196a1..6a1c993074 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -345,9 +345,6 @@ /* Support for pcapng */ #cmakedefine PCAP_NG_DEFAULT 1 -/* Define if we are using version of of the Portaudio library API */ -#cmakedefine PORTAUDIO_API_1 1 - /* Define if we have QtMultimedia */ #cmakedefine QT_MULTIMEDIA_LIB 1 diff --git a/debian/control b/debian/control index 0ca79538ac..c1c0cdc457 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: lsb-release, # libgnutls28-dev (>= 3.2.14-1~), # enable backports-compatible libgnutls-dev libgnutls-dev, - libgcrypt-dev, portaudio19-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev, + libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev, libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor, cmake (>= 2.8.12), libsbc-dev, libnghttp2-dev, libssh-gcrypt-dev, diff --git a/epan/prefs.c b/epan/prefs.c index 1f96ab8f27..6bf9aa11f0 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -2310,12 +2310,6 @@ stats_callback(void) if (prefs.tap_update_interval < 100 || prefs.tap_update_interval > 10000) prefs.tap_update_interval = TAP_UPDATE_DEFAULT_INTERVAL; -#ifdef HAVE_LIBPORTAUDIO - /* Test for a sane max channels entry */ - if (prefs.rtp_player_max_visible < 1 || prefs.rtp_player_max_visible > 10) - prefs.rtp_player_max_visible = RTP_PLAYER_DEFAULT_VISIBLE; -#endif - /* burst resolution can't be less than 1 (ms) */ if (prefs.st_burst_resolution < 1) { prefs.st_burst_resolution = 1; @@ -3557,13 +3551,7 @@ prefs_register_modules(void) 10, &prefs.tap_update_interval); -#ifdef HAVE_LIBPORTAUDIO - prefs_register_uint_preference(stats_module, "rtp_player_max_visible", - "Max visible channels in RTP Player", - "Determines maximum height of RTP Player window", - 10, - &prefs.rtp_player_max_visible); -#endif + prefs_register_obsolete_preference(stats_module, "rtp_player_max_visible"); prefs_register_bool_preference(stats_module, "st_enable_burstinfo", "Enable the calculation of burst information", @@ -4172,7 +4160,6 @@ pre_init_prefs(void) /* set the default values for the tap/statistics dialog box */ prefs.tap_update_interval = TAP_UPDATE_DEFAULT_INTERVAL; - prefs.rtp_player_max_visible = RTP_PLAYER_DEFAULT_VISIBLE; prefs.st_enable_burstinfo = TRUE; prefs.st_burst_showcount = FALSE; prefs.st_burst_resolution = ST_DEF_BURSTRES; @@ -5768,8 +5755,7 @@ set_pref(gchar *pref_name, const gchar *value, void *private_data _U_, } } else if (strcmp(module->name, "taps") == 0) { /* taps preferences moved to "statistics" module */ - if (strcmp(dotp, "update_interval") == 0 || - strcmp(dotp, "rtp_player_max_visible") == 0) + if (strcmp(dotp, "update_interval") == 0) pref = prefs_find_preference(stats_module, dotp); } else if (strcmp(module->name, "packet_list") == 0) { /* packet_list preferences moved to protocol module */ diff --git a/epan/prefs.h b/epan/prefs.h index 7010a45de7..5e2f357271 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -32,7 +32,6 @@ extern "C" { #define MAX_VAL_LEN 1024 -#define RTP_PLAYER_DEFAULT_VISIBLE 4 #define TAP_UPDATE_DEFAULT_INTERVAL 3000 #define ST_DEF_BURSTRES 5 #define ST_DEF_BURSTLEN 100 @@ -204,7 +203,6 @@ typedef struct _e_prefs { gboolean capture_no_extcap; gboolean capture_show_info; GList *capture_columns; - guint rtp_player_max_visible; guint tap_update_interval; gboolean display_hidden_proto_items; gboolean display_byte_fields_with_spaces; diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 7202bbe286..6ca11a0606 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -43,7 +43,7 @@ BASIC_LIST="libgtk2.0-dev libpcap-dev bison flex make automake \ ADDITIONAL_LIST="libnl-3-dev qttools5-dev qttools5-dev-tools libgtk-3-dev \ libc-ares-dev libkrb5-dev libqt5svg5-dev libsmi2-dev \ - portaudio19-dev asciidoctor libsbc-dev \ + asciidoctor libsbc-dev \ qtmultimedia5-dev liblua5.2-dev libnl-cli-3-dev \ libparse-yapp-perl qt5-default cmake libcap-dev \ liblz4-dev libsnappy-dev libspandsp-dev libxml2-dev \ diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 0d6366e81d..8de1622090 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -106,7 +106,6 @@ $Win64Archives = @{ "lz4-1.7.5-win64ws.zip" = ""; "MaxMindDB-1.3.2-win64ws.zip" = ""; "nghttp2-1.14.0-1-win64ws.zip" = ""; - "portaudio_v19_2.zip" = ""; "sbc-1.3-1-win64ws.zip" = ""; "snappy-1.1.3-1-win64ws.zip" = ""; "spandsp-0.0.6-1-win64ws.zip" = ""; @@ -130,7 +129,6 @@ $Win32Archives = @{ "lz4-1.7.5-win32ws.zip" = ""; "MaxMindDB-1.3.2-win32ws.zip" = ""; "nghttp2-1.14.0-1-win32ws.zip" = ""; - "portaudio_v19_2.zip" = ""; "sbc-1.3-1-win32ws.zip" = ""; "snappy-1.1.3-1-win32ws.zip" = ""; "spandsp-0.0.6-1-win32ws.zip" = ""; diff --git a/ui/Makefile.am b/ui/Makefile.am index 7b52e815c0..fc90967b79 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.am.inc # The installation location and DOC_DIR in ui/help_url.c must match. AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DDOC_DIR=\"$(docdir)\" \ - $(GLIB_CFLAGS) $(PCAP_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) + $(GLIB_CFLAGS) $(PCAP_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) noinst_LIBRARIES = libui.a libui_generated.a diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index b628d09e82..8cac1601c9 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) \ - $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) + $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) noinst_LIBRARIES = libcliui.a |