mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/wireshark: bump to version 3.4.0

Browse Source 
- c-ares is mandatory since
  451a241e50
- Disable ilibc which is available and enabled by default since
  12a13a6926
- LTO can be enabled since
  e6b5bd0976
- opus is an optional dependency since
  6136c719da

https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
Tested-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2020-11-02 20:57:37 +01:00
committed by Peter Korsgaard
parent c599d69902
commit 5bd8c591e3
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/wireshark/Config.in
View File

@@ -5,6 +5,7 @@ config BR2_PACKAGE_WIRESHARK
depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_MMU # fork(), glib2
depends on BR2_USE_WCHAR # glib2 depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
select BR2_PACKAGE_C_ARES
select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2

6
package/wireshark/wireshark.hash
View File

@@ -1,6 +1,6 @@
# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.8.txt # From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.0.txt
sha1 5fdcbbe3a50cea38a8fa5f10b21f58cbef31793e wireshark-3.2.8.tar.xz sha1 6fdf4f394c287f1e21b48c5293ec1a6e6b627996 wireshark-3.4.0.tar.xz
sha256 a8a595d08f38c6bd083886f6c199b9d4fb007e363031b263667c7da72323cc32 wireshark-3.2.8.tar.xz sha256 67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae wireshark-3.4.0.tar.xz
# Locally calculated # Locally calculated
sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING

31
package/wireshark/wireshark.mk
View File

@@ -4,12 +4,18 @@
# #
################################################################################ ################################################################################
WIRESHARK_VERSION = 3.2.8 WIRESHARK_VERSION = 3.4.0
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING WIRESHARK_LICENSE_FILES = COPYING
WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \ WIRESHARK_DEPENDENCIES = \
c-ares \
host-pkgconf \
host-python3 \
libgcrypt \
libglib2 \
libpcap \
speexdsp speexdsp
WIRESHARK_MAKE_ENV = \ WIRESHARK_MAKE_ENV = \
@@ -18,6 +24,7 @@ WIRESHARK_MAKE_ENV = \
WIRESHARK_CONF_OPTS = \ WIRESHARK_CONF_OPTS = \
-DDISABLE_WERROR=ON \ -DDISABLE_WERROR=ON \
-DENABLE_ILBC=OFF \
-DENABLE_PCAP=ON \ -DENABLE_PCAP=ON \
-DENABLE_SMI=OFF -DENABLE_SMI=OFF
@@ -35,6 +42,12 @@ endef
WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL WIRESHARK_PRE_BUILD_HOOKS += WIRESHARK_BUILD_LEMON_TOOL
ifeq ($(BR2_GCC_ENABLE_LTO),y)
WIRESHARK_CONF_OPTS += -DENABLE_LTO=ON
else
WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF
endif
ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y) ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),y)
WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON
WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools
@@ -56,13 +69,6 @@ else
WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF
endif endif
ifeq ($(BR2_PACKAGE_C_ARES),y)
WIRESHARK_CONF_OPTS += -DENABLE_CARES=ON
WIRESHARK_DEPENDENCIES += c-ares
else
WIRESHARK_CONF_OPTS += -DENABLE_CARES=OFF
endif
ifeq ($(BR2_PACKAGE_GNUTLS),y) ifeq ($(BR2_PACKAGE_GNUTLS),y)
WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON
WIRESHARK_DEPENDENCIES += gnutls WIRESHARK_DEPENDENCIES += gnutls
@@ -127,6 +133,13 @@ else
WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPUS),y)
WIRESHARK_CONF_OPTS += -DENABLE_OPUS=ON
WIRESHARK_DEPENDENCIES += opus
else
WIRESHARK_CONF_OPTS += -DENABLE_OPUS=OFF
endif
ifeq ($(BR2_PACKAGE_SBC),y) ifeq ($(BR2_PACKAGE_SBC),y)
WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON
WIRESHARK_DEPENDENCIES += sbc WIRESHARK_DEPENDENCIES += sbc