alsa-lib: drop salsa support

It's not maintained here (upstream has newer versions) and upstream seems
to be dead as well (Last release in 2009).

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 2 insertions, 69 deletions

diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index 058453ce6..adba896ac 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -13,32 +13,6 @@ menuconfig ALSA_LIB
 
 if ALSA_LIB
 
-choice
-	prompt "Base library"
-	default ALSA_LIB_FULL
-
-	config ALSA_LIB_FULL
-		bool
-		prompt "full featured ALSA libs"
-		help
-		  Full featured ALSA library. No limits.
-
-	config ALSA_LIB_LIGHT
-		bool
-		prompt "embedded ALSA libs"
-		help
-		  SALSA-Lib is a small, light-weight, hot and spicy version of
-		  the ALSA library, mainly for embedded systems with limited
-		  resources. The library is designed to be source-level
-		  compatible with ALSA library API for limited contents.  Most
-		  of function calls are inlined, and accesses directly to the
-		  hardware via system calls.
-		  Some components like ALSA sequencer aren't supported, and
-		  most of all, the alsa-lib plugins and configurations are
-		  completely dropped.  Thus, neither dmix nor format
-		  conversion is available with SALSA-lib.
-endchoice
-
 config ALSA_LIB_ASOUND_CONF
 	bool
 	prompt "install /etc/asound.conf from projectroot"
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 4a5493f63..3dac61ea5 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -15,24 +15,13 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
 #
 # Paths and names
 #
-ALSA_LIB_SUFFIX		:= tar.bz2
-
-ifdef PTXCONF_ALSA_LIB_FULL
 ALSA_LIB_VERSION	:= 1.1.9
 ALSA_LIB_MD5		:= e6d429dbdcfaa0f034d907fa6dc3735e
 ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
+ALSA_LIB_SUFFIX		:= tar.bz2
 ALSA_LIB_URL		:= \
 	https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
 	ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
-endif
-
-ifdef PTXCONF_ALSA_LIB_LIGHT
-ALSA_LIB_VERSION	:= 0.0.17
-ALSA_LIB_MD5		:= 81f209f58a3378f5553763b7735e1d58
-ALSA_LIB		:= salsa-lib-$(ALSA_LIB_VERSION)
-ALSA_LIB_URL		:= ftp://ftp.suse.com/pub/people/tiwai/salsa-lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
-endif
-
 ALSA_LIB_SOURCE		:= $(SRCDIR)/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
 ALSA_LIB_DIR		:= $(BUILDDIR)/$(ALSA_LIB)
 ALSA_LIB_LICENSE	:= LGPL-2.1-or-later
@@ -76,23 +65,6 @@ ALSA_LIB_CONF_OPT	:= \
 	--with-aload-devdir=/dev \
 	--with-pcm-plugins=all
 
-ifdef PTXCONF_ALSA_LIB_LIGHT
-ALSA_LIB_CONF_OPT += \
-	--enable-everyhing \
-	--enable-tlv \
-	--enable-timer \
-	--enable-conf \
-	--enable-async \
-	--enable-libasound \
-	--enable-rawmidi
-endif
-
-# unhandled, yet
-# --with-configdir=dir    path where ALSA config files are stored
-#  --with-plugindir=dir    path where ALSA plugin files are stored
-#  --with-ctl-plugins=<list>
-#                          build control plugins (default = all)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -106,18 +78,8 @@ $(STATEDIR)/alsa-lib.targetinstall:
 	@$(call install_fixup, alsa-lib, AUTHOR,"Erwin Rol <ero@pengutronix.de>")
 	@$(call install_fixup, alsa-lib, DESCRIPTION,missing)
 
-ifdef PTXCONF_ALSA_LIB_LIGHT
-	@$(call install_lib, alsa-lib, 0, 0, 0644, libsalsa)
-	@$(call install_link, alsa-lib, libsalsa.so, /usr/lib/libasound.so)
-endif
-
-ifdef PTXCONF_ALSA_LIB_FULL
 	@$(call install_lib, alsa-lib, 0, 0, 0644, libasound)
-
-	@$(call install_tree, alsa-lib, \
-		0, 0, -, /usr/share/alsa/)
-endif
-
+	@$(call install_tree, alsa-lib, 0, 0, -, /usr/share/alsa)
 ifdef PTXCONF_ALSA_LIB_ASOUND_CONF
 	@$(call install_alternative, alsa-lib, 0, 0, 0644, /etc/asound.conf)
 endif
diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
index e78a51cbf..b6529d75d 100644
--- a/rules/alsa-utils.in
+++ b/rules/alsa-utils.in
@@ -4,8 +4,6 @@ menuconfig ALSA_UTILS
 	tristate
 	prompt "alsa utils                    "
 	select ALSA_LIB
-# alsa-utils fails with the salsa-lib
-	select ALSA_LIB_FULL
 # all tools from this package rely on special parts in the library:
 	select ALSA_LIB_MIXER
 	select ALSA_LIB_PCM
diff --git a/rules/python3-pyalsaaudio.in b/rules/python3-pyalsaaudio.in
index a3c3b4454..a2384df16 100644
--- a/rules/python3-pyalsaaudio.in
+++ b/rules/python3-pyalsaaudio.in
@@ -5,7 +5,6 @@ config PYTHON3_PYALSAAUDIO
 	prompt "python3-pyalsaaudio"
 	select PYTHON3
 	select ALSA_LIB
-	select ALSA_LIB_FULL
 	help
 	  Wrappers for accessing the ALSA API from Python. Fairly complete for
 	  PCM devices and mixer access.