From f809e62b2a9c56a9b3e4bc6fbad2b99923cb8408 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 21 Dec 2022 12:27:04 -0800
Subject: [PATCH] Tools: Move speexdsp to the Alpine and RPM basic lists.

---
 tools/alpine-setup.sh | 70 ++++++++++++++++++++++---------------------
 tools/rpm-setup.sh    |  8 ++---
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/tools/alpine-setup.sh b/tools/alpine-setup.sh
index 79462ab7c8..047d365300 100755
--- a/tools/alpine-setup.sh
+++ b/tools/alpine-setup.sh
@@ -49,42 +49,44 @@ then
 	exit 1
 fi
 
-BASIC_LIST="cmake \
-	ninja \
-	gcc \
-	g++ \
-	glib-dev \
-	libgcrypt-dev \
-	flex \
-	tiff-dev \
-	c-ares-dev \
-	pcre2-dev \
-	qt5-qtbase-dev \
-	qt5-qttools-dev \
-	qt5-qtmultimedia-dev \
-	qt5-qtsvg-dev"
+BASIC_LIST="
+	cmake
+	ninja
+	gcc
+	g++
+	glib-dev
+	libgcrypt-dev
+	flex
+	tiff-dev
+	c-ares-dev
+	pcre2-dev
+	qt5-qtbase-dev
+	qt5-qttools-dev
+	qt5-qtmultimedia-dev
+	qt5-qtsvg-dev
+	speexdsp-dev
+	"
 
 ADDITIONAL_LIST="
-	git \
-	asciidoctor \
-	libssh-dev \
-	spandsp-dev \
-	libcap-dev \
-	libpcap-dev \
-	libxml2-dev \
-	libmaxminddb-dev \
-	krb5-dev \
-	lz4-dev \
-	gnutls-dev \
-	snappy-dev \
-	nghttp2-dev \
-	lua5.2-dev \
-	libnl3-dev \
-	sbc-dev \
-	minizip-dev \
-	speexdsp-dev \
-	brotli-dev \
-	perl \
+	git
+	asciidoctor
+	libssh-dev
+	spandsp-dev
+	libcap-dev
+	libpcap-dev
+	libxml2-dev
+	libmaxminddb-dev
+	krb5-dev
+	lz4-dev
+	gnutls-dev
+	snappy-dev
+	nghttp2-dev
+	lua5.2-dev
+	libnl3-dev
+	sbc-dev
+	minizip-dev
+	brotli-dev
+	perl
 	"
 
 # Uncomment to add PNG compression utilities used by compress-pngs:
diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh
index 076e472244..4ed8915573 100755
--- a/tools/rpm-setup.sh
+++ b/tools/rpm-setup.sh
@@ -180,6 +180,9 @@ echo "Required package zlib|libz1 is unavailable" >&2
 add_package BASIC_LIST c-ares-devel || add_package BASIC_LIST libcares-devel ||
 echo "Required package c-ares-devel|libcares-devel is unavailable" >&2
 
+add_package BASIC_LIST speexdsp-devel || add_package BASIC_LIST speex-devel ||
+echo "Required package speexdsp-devel|speex-devel is unavailable" >&2
+
 if [ $HAVE_ADD_QT -eq 0 ]
 then
 	# Try to select Qt version from distro
@@ -229,7 +232,7 @@ then
 			qt6-qt5compat-devel
 			qt6-qtmultimedia-devel
 			libxkbcommon-devel)
-		
+
 	for pkg in ${QT6_LIST[@]}
 	do
 		add_package BASIC_LIST "$pkg" ||
@@ -287,9 +290,6 @@ echo "Optional package libxslt|libxslt1 is unavailable" >&2
 add_package ADDITIONAL_LIST brotli-devel || add_packages ADDITIONAL_LIST libbrotli-devel libbrotlidec1 ||
 echo "Optional packages brotli-devel|libbrotli-devel is unavailable" >&2
 
-add_package ADDITIONAL_LIST speexdsp-devel || add_package ADDITIONAL_LIST speex-devel ||
-echo "Optional package speexdsp-devel|speex-devel is unavailable" >&2
-
 add_package ADDITIONAL_LIST libnl3-devel || add_package ADDITIONAL_LIST libnl-devel ||
 echo "Optional package libnl3-devel|libnl-devel are unavailable" >&2