sox: Remove from IPFire as no longer needed for asterix

- sox was used for asterix but that addon was removed in Core Update 158 so sox is no
   longer needed.
- remove the lfs and rootfile files and remove sox from the make.sh script

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/sox b/config/rootfiles/packages/sox
deleted file mode 100644 (file)
index a3b2d71..0000000
--- a/config/rootfiles/packages/sox
+++ /dev/null
@@ -1,19 +0,0 @@
-usr/bin/play
-usr/bin/rec
-usr/bin/sox
-usr/bin/soxi
-#usr/include/sox.h
-#usr/lib/libsox.a
-#usr/lib/libsox.la
-#usr/lib/libsox.so
-usr/lib/libsox.so.3
-usr/lib/libsox.so.3.0.0
-#usr/lib/pkgconfig/sox.pc
-#usr/share/man/man1/play.1
-#usr/share/man/man1/rec.1
-#usr/share/man/man1/sox.1
-#usr/share/man/man1/soxi.1
-#usr/share/man/man3/libsox.3
-#usr/share/man/man7/soxeffect.7
-#usr/share/man/man7/soxformat.7
-

diff --git a/lfs/sox b/lfs/sox
deleted file mode 100644 (file)
index a9470d5..0000000
--- a/lfs/sox
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2020  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
-
-SUMMARY    = Sound Conversion Tools
-
-VER        = 14.4.2
-
-THISAPP    = sox-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = sox
-PAK_VER    = 2
-
-DEPS       = libvorbis
-
-SERVICES   =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 89c7dd4818864087add1c53c65fd934655a8df30f62b2d5fe1be12e5527e94330e50b65aef5626eda893d3841d5c38a875347521e8735ef9475c5cc12b2792e0
-
-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 jxf $(DIR_DL)/$(DL_FILE)
-       $(UPDATE_AUTOMAKE)
-       cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && make $(EXTRA_MAKE)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index d41e6bd6bfb2998ab5a1c286633a4f17938d808c..b0a4b89268939f8cf964848aee7ae84261e5eb17 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1465,7 +1465,6 @@ buildipfire() {
   lfsmake2 libvorbis
   lfsmake2 flac
   lfsmake2 lame
-  lfsmake2 sox
   lfsmake2 soxr
   lfsmake2 libshout
   lfsmake2 xvid