From patchwork Wed Jun 19 10:40:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7894 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4W40Xj4KLWz3wnw for ; Wed, 19 Jun 2024 10:41:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4W40XW3mHZz5p7; Wed, 19 Jun 2024 10:41:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4W40XR4vwkz33Cm; Wed, 19 Jun 2024 10:41:11 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4W40XD0sVGz3309 for ; Wed, 19 Jun 2024 10:41:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4W40XC6RQszsZ; Wed, 19 Jun 2024 10:40:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1718793660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jo7aAVsKIVrXpzz/T2WO0YWd6PYB9itEM63G5UxP8os=; b=uNRQzw379YcbTt/ETtU/UQrDB7Q4soGHhxfIFgcw3UHFwKRJRdPsHW2JTdBKRd0nR7G5w+ XetCZqUClpPcdzBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1718793660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jo7aAVsKIVrXpzz/T2WO0YWd6PYB9itEM63G5UxP8os=; b=ikV7R4fH+u/JLj2UG60ZAXbwL+IBrwHbgGuRdQaNORwMPfyVv1wqCwm6vQ4I2nqE1X0RNP nqB5NLFXgtRiuULcIKbpEOO6AomBBlWr7ttBcN+Z+hK2gdvke48rDzDvBDie1Zx4IExpBp QHeDJgi6K4yiYO+Eh6SR02+poLObZOoEZaV0cQa7mPa0imgnvgSQpWOczjmV+NsCAPL+uY 21qdorRya/gjAa4iFaLESAikNjlfCksaDR+bdmwbtjFgPZwjCDCgK62e/XC/Ynwg+wPO2a 310owg9/BWCBSlBecZs7buFllCqOWwbtjVbu7pXoJrA2Jb8hndDjKDczfEpm9Q== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 4/4] speexdsp: New package required for build of tshark-4.2.5 Date: Wed, 19 Jun 2024 12:40:52 +0200 Message-ID: <20240619104052.3494272-4-adolf.belka@ipfire.org> In-Reply-To: <20240619104052.3494272-1-adolf.belka@ipfire.org> References: <20240619104052.3494272-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: D7CGJH4UCAVOPMMPXKYOX4DJGJIXCATN X-Message-ID-Hash: D7CGJH4UCAVOPMMPXKYOX4DJGJIXCATN X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - tshark in the past had its own version of speexdsp used only for some "arbitrary resampling code" used for the build of tshark. - speexdsp has been removed from tshark so it is now a build requirement. - It is only used for the build of tshark so the rootfile has all entries commented out. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/speexdsp | 14 ++++++ lfs/speexdsp | 80 ++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 95 insertions(+) create mode 100644 config/rootfiles/common/speexdsp create mode 100644 lfs/speexdsp diff --git a/config/rootfiles/common/speexdsp b/config/rootfiles/common/speexdsp new file mode 100644 index 000000000..aa26b3b4f --- /dev/null +++ b/config/rootfiles/common/speexdsp @@ -0,0 +1,14 @@ +#usr/include/speex +#usr/include/speex/speex_echo.h +#usr/include/speex/speex_jitter.h +#usr/include/speex/speex_preprocess.h +#usr/include/speex/speex_resampler.h +#usr/include/speex/speexdsp_config_types.h +#usr/include/speex/speexdsp_types.h +#usr/lib/libspeexdsp.la +#usr/lib/libspeexdsp.so +#usr/lib/libspeexdsp.so.1 +#usr/lib/libspeexdsp.so.1.5.2 +#usr/lib/pkgconfig/speexdsp.pc +#usr/share/doc/speexdsp +#usr/share/doc/speexdsp/manual.pdf diff --git a/lfs/speexdsp b/lfs/speexdsp new file mode 100644 index 000000000..308f6f6a6 --- /dev/null +++ b/lfs/speexdsp @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.2.1 + +THISAPP = speexdsp-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 9105967eaee3ea8fcba2df1739d92a520407e086d3f4645763d8c7f26adff4f6c46b653e873b3e5ca04fce2ee5f765f8f7a242172d7cc4873fe15c3295a5913b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 211654dc5..4ef2e0a19 100755 --- a/make.sh +++ b/make.sh @@ -1690,6 +1690,7 @@ buildipfire() { lfsmake2 firmware-update lfsmake2 ruby lfsmake2 asciidoctor + lfsmake2 speexdsp lfsmake2 tshark lfsmake2 speedtest-cli lfsmake2 amazon-ssm-agent