[Buildroot] [PATCH 1/1] package/wireshark: bump to version 3.4.0
Fabrice Fontaine
fontaine.fabrice at gmail.com
Sun Nov 1 16:30:57 UTC 2020
- Disable ilibc which is available and enabled by default since
https://github.com/wireshark/wireshark/commit/12a13a69264fdef4281e4b13c8c7d92a272cc99e
- LTO can be enabled since
https://github.com/wireshark/wireshark/commit/e6b5bd09766a1320c5540f78eb0e4ba03ce8f108
- opus is an optional dependency since
https://github.com/wireshark/wireshark/commit/6136c719da4ec9b96c01adb4b0fd7f01af171688
https://www.wireshark.org/docs/relnotes/wireshark-3.4.0.html
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
---
package/wireshark/wireshark.hash | 6 +++---
package/wireshark/wireshark.mk | 16 +++++++++++++++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash
index 8d1a3b3a2e..667d8a371e 100644
--- a/package/wireshark/wireshark.hash
+++ b/package/wireshark/wireshark.hash
@@ -1,6 +1,6 @@
-# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.2.8.txt
-sha1 5fdcbbe3a50cea38a8fa5f10b21f58cbef31793e wireshark-3.2.8.tar.xz
-sha256 a8a595d08f38c6bd083886f6c199b9d4fb007e363031b263667c7da72323cc32 wireshark-3.2.8.tar.xz
+# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.0.txt
+sha1 6fdf4f394c287f1e21b48c5293ec1a6e6b627996 wireshark-3.4.0.tar.xz
+sha256 67e4ebbd9153fc589fd67dc21b93176674c73adc3d5a43934c3ac69d8594a8ae wireshark-3.4.0.tar.xz
# Locally calculated
sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 0d4fedb3f0..58262f2d2e 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WIRESHARK_VERSION = 3.2.8
+WIRESHARK_VERSION = 3.4.0
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz
WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
@@ -18,6 +18,7 @@ WIRESHARK_MAKE_ENV = \
WIRESHARK_CONF_OPTS = \
-DDISABLE_WERROR=ON \
+ -DENABLE_ILBC=OFF \
-DENABLE_PCAP=ON \
-DENABLE_SMI=OFF
@@ -35,6 +36,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
@@ -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
--
2.28.0
More information about the buildroot
mailing list