diff mbox series

[4/4] speexdsp: New package required for build of tshark-4.2.5

Message ID 20240619104052.3494272-4-adolf.belka@ipfire.org
State Staged
Commit 5b24b5559a6acaa905a32196166ff50f727e9ac2
Headers
Series [1/4] tshark: Update to version 4.2.5 |

Commit Message

Adolf Belka June 19, 2024, 10:40 a.m. UTC 
  - 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 <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 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 mbox series

Patch

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  <info@ipfire.org>                     #
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# 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