aboutsummaryrefslogtreecommitdiff
path: root/package/wireshark/wireshark.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/wireshark/wireshark.mk')
-rw-r--r--package/wireshark/wireshark.mk39
1 files changed, 30 insertions, 9 deletions
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 04e3e13ff1..de29417ccd 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,12 +4,19 @@
#
################################################################################
-WIRESHARK_VERSION = 3.2.6
+WIRESHARK_VERSION = 3.4.2
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = host-pkgconf host-python3 libgcrypt libpcap libglib2 \
+WIRESHARK_CPE_ID_VENDOR = wireshark
+WIRESHARK_DEPENDENCIES = \
+ c-ares \
+ host-pkgconf \
+ host-python3 \
+ libgcrypt \
+ libglib2 \
+ libpcap \
speexdsp
WIRESHARK_MAKE_ENV = \
@@ -18,6 +25,7 @@ WIRESHARK_MAKE_ENV = \
WIRESHARK_CONF_OPTS = \
-DDISABLE_WERROR=ON \
+ -DENABLE_ILBC=OFF \
-DENABLE_PCAP=ON \
-DENABLE_SMI=OFF
@@ -35,6 +43,12 @@ endef
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)
WIRESHARK_CONF_OPTS += -DBUILD_wireshark=ON
WIRESHARK_DEPENDENCIES += qt5base qt5multimedia qt5svg qt5tools
@@ -56,13 +70,6 @@ else
WIRESHARK_CONF_OPTS += -DENABLE_BROTLI=OFF
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)
WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=ON
WIRESHARK_DEPENDENCIES += gnutls
@@ -127,6 +134,13 @@ else
WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=OFF
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)
WIRESHARK_CONF_OPTS += -DENABLE_SBC=ON
WIRESHARK_DEPENDENCIES += sbc
@@ -155,6 +169,13 @@ else
WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF
endif
+ifeq ($(BR2_PACKAGE_ZSTD),y)
+WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON
+WIRESHARK_DEPENDENCIES += zstd
+else
+WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=OFF
+endif
+
# Disable plugins as some of them (like l16mono) can't be built
# statically. ENABLE_STATIC=ON actually means "disable shared library"
# and ENABLE_STATIC=OFF means "enable shared library". So for the