diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-07-26 23:23:12 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-30 05:22:35 +0000 |
| commit | 3e54cabf8193e6a8cd607b1671defb8b6800b53d (patch) | |
| tree | 63297098c0c26c1c875ab0959d9679d70b3c6e65 /packaging | |
| parent | 32b446d5a8f146565b81324d1a18bcb053e07c5f (diff) | |
Add G.729 decoding based on bcg729 library
Bug: 13635
Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512
Reviewed-on: https://code.wireshark.org/review/22808
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 11 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 278eedc664..4e2b970fa9 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -150,7 +150,7 @@ set(_all_manifest_contents "# Files required for all sections. Generated by CMak foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 48a295d9c7..827f446e9c 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -13,6 +13,7 @@ %global with_c_ares 1 %global with_portaudio 0 %global with_spandsp 0 +%global with_bcg729 0 %global with_libxml2 1 %global with_nghttp2 1 %global with_extcap 1 @@ -241,6 +242,10 @@ Requires: portaudio BuildRequires: spandsp-devel Requires: spandsp %endif +%if %{with_bcg729} +BuildRequires: bcg729-devel +Requires: bcg729 +%endif %if %{with_libxml2} BuildRequires: libxml2-devel Requires: libxml2 @@ -282,6 +287,9 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %if %{with_spandsp} --with-spandsp \ %endif +%if %{with_bcg729} + --with-bcg729 \ +%endif %if %{with_libxml2} --with-libxml2 \ %else @@ -486,6 +494,9 @@ fi %endif %changelog +* Wed Jul 26 2017 Pascal Quantin +- Added bcg729 (as an option, defaulting to not required). + * Tue Apr 4 2017 Ahmad Fatoum - Added libxml2 (as an option, defaulting to required). diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 2835633b72..e2c80889a5 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -140,7 +140,7 @@ SET(unique_component "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)") @@ -165,7 +165,7 @@ SET(unique_file "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") |