diff options
| author | Jirka Novak <j.novak@netsystem.cz> | 2019-11-18 23:55:25 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-01-20 07:50:08 +0000 |
| commit | 12a13a69264fdef4281e4b13c8c7d92a272cc99e (patch) | |
| tree | 8e50468ac880e72697fdbf107f8afc25e22aa739 /packaging | |
| parent | 7bd57479b62de93f86ad33b38d5503c29f32e23e (diff) | |
RTP: decode iLBC payload
It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc).
Bug: 16314
Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e
Reviewed-on: https://code.wireshark.org/review/35686
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 1 | ||||
| -rw-r--r-- | packaging/rpm/wireshark.spec.in | 9 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | packaging/wix/Plugins.wxi | 4 |
5 files changed, 17 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index cd225e6505..a6459f28fd 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -150,7 +150,7 @@ foreach(_dll ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} + ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} # Needed for mmdbresolve ${MAXMINDDB_DLL} ) diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 816ba067c8..21705d4afa 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1031,6 +1031,7 @@ File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\g726.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\g729.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\l16mono.dll" File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\sbc.dll" +File "${STAGING_DIR}\plugins\${VERSION_MAJOR}.${VERSION_MINOR}\codecs\ilbc.dll" SectionEnd Section "Configuration Profiles" SecProfiles diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index b5352eec03..e271b328ae 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -20,6 +20,7 @@ %bcond_with guides %bcond_with brotli %bcond_with zstd +%bcond_with ilbc # Set at most one of these two: # Note that setcap requires rpmbuild 4.7.0 or later. @@ -340,6 +341,11 @@ cmake3 \ %if %{with ninja} -G Ninja \ %endif +%if %{with ilbc} + -DENABLE_ILBC=ON \ +%else + -DENABLE_ILBC=OFF \ +%endif %if %{with ninja} # Older RPM-based distributions used ninja-build in order to prevent a collision with @@ -497,6 +503,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/wireshark.pc %changelog +* Sun Jan 19 2019 Jiri Novak +- Added ilbc codec as an option + * Fri Nov 22 2019 Gerald Combs - c-ares is a required package diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index ba89480b62..eb625ebc10 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -135,7 +135,7 @@ foreach(_dll ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} + ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} # Required for mmdbresolve ${MAXMINDDB_DLL} ) @@ -174,7 +174,7 @@ foreach(_dll ${CARES_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} + ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} # mmdbresolve ${MAXMINDDB_DLL} ) diff --git a/packaging/wix/Plugins.wxi b/packaging/wix/Plugins.wxi index f6f729be2e..384acd7e1d 100644 --- a/packaging/wix/Plugins.wxi +++ b/packaging/wix/Plugins.wxi @@ -126,6 +126,9 @@ <Component Id="cmpSBC_dll" Guid="*"> <File Id="filSBC_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\sbc.dll" /> </Component> + <Component Id="cmpILBC_dll" Guid="*"> + <File Id="filILBC_dll" KeyPath="yes" Source="$(var.Plugins.Dir)\$(var.WiresharkMajorVersion).$(var.WiresharkMinorVersion)\codecs\ilbc.dll" /> + </Component> </DirectoryRef> </Fragment> <Fragment> @@ -136,6 +139,7 @@ <ComponentRef Id="cmpG729_dll" /> <ComponentRef Id="cmpL16mono_dll" /> <ComponentRef Id="cmpSBC_dll" /> + <ComponentRef Id="cmpILBC_dll" /> </ComponentGroup> </Fragment> |