Hi Michael and Peter, On 09/01/2023 15:21, Michael Tremer wrote: > Hey Adolf, > > Thank you. That was very quick! Whoops - I was so quick that I forgot to also remove the spandsp entry from make.sh - sorry. Just realised with the latest staged update because spandsp removal was included in that and my build failed because it couldn't find the lfs file. Can this be manually fixed in the nightly build or do I need to raise a v2 patch that updates make.sh as well as removing the lfs and rootfile. Regards, Adolf. > > Best, > -Michael > > Reviewed-by: Michael Tremer > >> On 9 Jan 2023, at 13:13, Adolf Belka wrote: >> >> - This package was used by the asterisk addon which was dropped some time ago so >> spandsp is no longer needed >> >> Signed-off-by: Adolf Belka >> --- >> config/rootfiles/packages/spandsp | 155 ------------------------------ >> lfs/spandsp | 89 ----------------- >> 2 files changed, 244 deletions(-) >> delete mode 100644 config/rootfiles/packages/spandsp >> delete mode 100644 lfs/spandsp >> >> diff --git a/config/rootfiles/packages/spandsp b/config/rootfiles/packages/spandsp >> deleted file mode 100644 >> index 28fd397f7..000000000 >> --- a/config/rootfiles/packages/spandsp >> +++ /dev/null >> @@ -1,155 +0,0 @@ >> -#usr/include/spandsp >> -#usr/include/spandsp.h >> -#usr/include/spandsp/ademco_contactid.h >> -#usr/include/spandsp/adsi.h >> -#usr/include/spandsp/arctan2.h >> -#usr/include/spandsp/async.h >> -#usr/include/spandsp/at_interpreter.h >> -#usr/include/spandsp/awgn.h >> -#usr/include/spandsp/bell_r2_mf.h >> -#usr/include/spandsp/bert.h >> -#usr/include/spandsp/biquad.h >> -#usr/include/spandsp/bit_operations.h >> -#usr/include/spandsp/bitstream.h >> -#usr/include/spandsp/complex.h >> -#usr/include/spandsp/complex_filters.h >> -#usr/include/spandsp/complex_vector_float.h >> -#usr/include/spandsp/complex_vector_int.h >> -#usr/include/spandsp/crc.h >> -#usr/include/spandsp/dc_restore.h >> -#usr/include/spandsp/dds.h >> -#usr/include/spandsp/dtmf.h >> -#usr/include/spandsp/echo.h >> -#usr/include/spandsp/expose.h >> -#usr/include/spandsp/fast_convert.h >> -#usr/include/spandsp/fax.h >> -#usr/include/spandsp/fax_modems.h >> -#usr/include/spandsp/fir.h >> -#usr/include/spandsp/fsk.h >> -#usr/include/spandsp/g168models.h >> -#usr/include/spandsp/g711.h >> -#usr/include/spandsp/g722.h >> -#usr/include/spandsp/g726.h >> -#usr/include/spandsp/gsm0610.h >> -#usr/include/spandsp/hdlc.h >> -#usr/include/spandsp/ima_adpcm.h >> -#usr/include/spandsp/image_translate.h >> -#usr/include/spandsp/logging.h >> -#usr/include/spandsp/lpc10.h >> -#usr/include/spandsp/math_fixed.h >> -#usr/include/spandsp/modem_connect_tones.h >> -#usr/include/spandsp/modem_echo.h >> -#usr/include/spandsp/noise.h >> -#usr/include/spandsp/oki_adpcm.h >> -#usr/include/spandsp/playout.h >> -#usr/include/spandsp/plc.h >> -#usr/include/spandsp/power_meter.h >> -#usr/include/spandsp/private >> -#usr/include/spandsp/private/ademco_contactid.h >> -#usr/include/spandsp/private/adsi.h >> -#usr/include/spandsp/private/async.h >> -#usr/include/spandsp/private/at_interpreter.h >> -#usr/include/spandsp/private/awgn.h >> -#usr/include/spandsp/private/bell_r2_mf.h >> -#usr/include/spandsp/private/bert.h >> -#usr/include/spandsp/private/bitstream.h >> -#usr/include/spandsp/private/dtmf.h >> -#usr/include/spandsp/private/echo.h >> -#usr/include/spandsp/private/fax.h >> -#usr/include/spandsp/private/fax_modems.h >> -#usr/include/spandsp/private/fsk.h >> -#usr/include/spandsp/private/g711.h >> -#usr/include/spandsp/private/g722.h >> -#usr/include/spandsp/private/g726.h >> -#usr/include/spandsp/private/gsm0610.h >> -#usr/include/spandsp/private/hdlc.h >> -#usr/include/spandsp/private/ima_adpcm.h >> -#usr/include/spandsp/private/image_translate.h >> -#usr/include/spandsp/private/logging.h >> -#usr/include/spandsp/private/lpc10.h >> -#usr/include/spandsp/private/modem_connect_tones.h >> -#usr/include/spandsp/private/modem_echo.h >> -#usr/include/spandsp/private/noise.h >> -#usr/include/spandsp/private/oki_adpcm.h >> -#usr/include/spandsp/private/queue.h >> -#usr/include/spandsp/private/schedule.h >> -#usr/include/spandsp/private/sig_tone.h >> -#usr/include/spandsp/private/silence_gen.h >> -#usr/include/spandsp/private/super_tone_rx.h >> -#usr/include/spandsp/private/super_tone_tx.h >> -#usr/include/spandsp/private/swept_tone.h >> -#usr/include/spandsp/private/t30.h >> -#usr/include/spandsp/private/t30_dis_dtc_dcs_bits.h >> -#usr/include/spandsp/private/t31.h >> -#usr/include/spandsp/private/t38_core.h >> -#usr/include/spandsp/private/t38_gateway.h >> -#usr/include/spandsp/private/t38_non_ecm_buffer.h >> -#usr/include/spandsp/private/t38_terminal.h >> -#usr/include/spandsp/private/t4_rx.h >> -#usr/include/spandsp/private/t4_t6_decode.h >> -#usr/include/spandsp/private/t4_t6_encode.h >> -#usr/include/spandsp/private/t4_tx.h >> -#usr/include/spandsp/private/time_scale.h >> -#usr/include/spandsp/private/timezone.h >> -#usr/include/spandsp/private/tone_detect.h >> -#usr/include/spandsp/private/tone_generate.h >> -#usr/include/spandsp/private/v17rx.h >> -#usr/include/spandsp/private/v17tx.h >> -#usr/include/spandsp/private/v18.h >> -#usr/include/spandsp/private/v22bis.h >> -#usr/include/spandsp/private/v27ter_rx.h >> -#usr/include/spandsp/private/v27ter_tx.h >> -#usr/include/spandsp/private/v29rx.h >> -#usr/include/spandsp/private/v29tx.h >> -#usr/include/spandsp/private/v42.h >> -#usr/include/spandsp/private/v42bis.h >> -#usr/include/spandsp/private/v8.h >> -#usr/include/spandsp/queue.h >> -#usr/include/spandsp/saturated.h >> -#usr/include/spandsp/schedule.h >> -#usr/include/spandsp/sig_tone.h >> -#usr/include/spandsp/silence_gen.h >> -#usr/include/spandsp/stdbool.h >> -#usr/include/spandsp/super_tone_rx.h >> -#usr/include/spandsp/super_tone_tx.h >> -#usr/include/spandsp/swept_tone.h >> -#usr/include/spandsp/t30.h >> -#usr/include/spandsp/t30_api.h >> -#usr/include/spandsp/t30_fcf.h >> -#usr/include/spandsp/t30_logging.h >> -#usr/include/spandsp/t31.h >> -#usr/include/spandsp/t35.h >> -#usr/include/spandsp/t38_core.h >> -#usr/include/spandsp/t38_gateway.h >> -#usr/include/spandsp/t38_non_ecm_buffer.h >> -#usr/include/spandsp/t38_terminal.h >> -#usr/include/spandsp/t4_rx.h >> -#usr/include/spandsp/t4_t6_decode.h >> -#usr/include/spandsp/t4_t6_encode.h >> -#usr/include/spandsp/t4_tx.h >> -#usr/include/spandsp/telephony.h >> -#usr/include/spandsp/time_scale.h >> -#usr/include/spandsp/timezone.h >> -#usr/include/spandsp/timing.h >> -#usr/include/spandsp/tone_detect.h >> -#usr/include/spandsp/tone_generate.h >> -#usr/include/spandsp/v17rx.h >> -#usr/include/spandsp/v17tx.h >> -#usr/include/spandsp/v18.h >> -#usr/include/spandsp/v22bis.h >> -#usr/include/spandsp/v27ter_rx.h >> -#usr/include/spandsp/v27ter_tx.h >> -#usr/include/spandsp/v29rx.h >> -#usr/include/spandsp/v29tx.h >> -#usr/include/spandsp/v42.h >> -#usr/include/spandsp/v42bis.h >> -#usr/include/spandsp/v8.h >> -#usr/include/spandsp/vector_float.h >> -#usr/include/spandsp/vector_int.h >> -#usr/include/spandsp/version.h >> -#usr/lib/libspandsp.a >> -#usr/lib/libspandsp.la >> -usr/lib/libspandsp.so >> -usr/lib/libspandsp.so.2 >> -usr/lib/libspandsp.so.2.0.0 >> -#usr/lib/pkgconfig/spandsp.pc >> diff --git a/lfs/spandsp b/lfs/spandsp >> deleted file mode 100644 >> index 5d609cb06..000000000 >> --- a/lfs/spandsp >> +++ /dev/null >> @@ -1,89 +0,0 @@ >> -############################################################################### >> -# # >> -# IPFire.org - A linux based firewall # >> -# Copyright (C) 2007-2018 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 >> - >> -SUMMARY = A DSP library for Telephony and SoftFAX >> - >> -VER = 0.0.6 >> - >> -THISAPP = spandsp-$(VER) >> -DL_FILE = $(THISAPP).tar.gz >> -DL_FROM = $(URL_IPFIRE) >> -DIR_APP = $(DIR_SRC)/$(THISAPP) >> -TARGET = $(DIR_INFO)/$(THISAPP) >> -PROG = spandsp >> -PAK_VER = 6 >> - >> -DEPS = >> - >> -SERVICES = >> - >> -############################################################################### >> -# Top-level Rules >> -############################################################################### >> - >> -objects = $(DL_FILE) >> - >> -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> - >> -$(DL_FILE)_BLAKE2 = 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 >> - >> -install : $(TARGET) >> - >> -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> - >> -download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> - >> -b2 : $(subst %,%_BLAKE2,$(objects)) >> - >> -dist: >> - $(PAK) >> - >> -############################################################################### >> -# 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 zxf $(DIR_DL)/$(DL_FILE) >> - $(UPDATE_AUTOMAKE) >> - cd $(DIR_APP) && ./configure --prefix=/usr >> - cd $(DIR_APP) && make $(MAKETUNING) >> - cd $(DIR_APP) && make install >> - @rm -rf $(DIR_APP) >> - @$(POSTBUILD) >> -- >> 2.39.0 >> >