skip driver build, fixed userland tools

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index e828df3310cfb1096b3fec0c50746004915c4517..5a7efd2ee251481d87eff90f5dfa1af92a4692b1 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,5 +1,6 @@
 *) 2004-07-25
 
+- alsa: fixed userland tools, skip driver build as available in 2.6
 - fixed wine package, fixed gimp-print
 
 *) 2004-07-24

diff --git a/packages/soundtools/alsa/alsa b/packages/soundtools/alsa/alsa
index 475d32dab3ff26f251f5b4b0d5254471afbb249f..eb58edcfd979693ba5a70ae6e13fc7ee8918269d 100644 (file)
--- a/packages/soundtools/alsa/alsa
+++ b/packages/soundtools/alsa/alsa
@@ -4,46 +4,39 @@
 #
 # [V] 1.0.5
 # [S] 3-10
-# [D] alsa-driver-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/driver/
+## [D] alsa-driver-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/driver/
 # [D] alsa-lib-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/lib/
 # [D] alsa-oss-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/oss-lib/
 # [D] alsa-utils-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/utils/
 # [D] alsa-tools-1.0.5.tar.bz2 ftp://ftp.alsa-project.org/pub/tools/
 
-# only build the drivers?
-onlydriver=0
-
 # popular drivers (i have those ;)
 card="emu10k1,intel8x0"
 
-oss_ver="0.9.8"
-
 confopt_x="$confopt"
 confopt="$confopt --with-sequencer=yes --with-oss=yes --with-cards=$card"
 
-if [ "$onlydriver" = "0" ] ; then
-
 post_install() {
-       echo "extracting lib, utils and tools source ..."
-       for i in alsa-lib alsa-utils alsa-tools; do
+       echo "extracting lib, utils, tools and oss source ..."
+       for i in alsa-lib alsa-utils alsa-tools alsa-oss; do
                tar --use-compress-program=bzip2 -xf \
                        $archdir/$i-${ver}.tar.bz2 -C ../
        done
-       tar --use-compress-program=bzip2 -xf \
-               $archdir/alsa-oss-${oss_ver}.tar.bz2 -C ../
        # building stuff
-       for i in alsa-lib- alsa-oss- alsa-utils-; do 
-               echo "building ${i}..."
-               cd ../${i}* && ./configure $confopt_x &&
-               make $make_conf && make $install_conf install
+       echo "building alsa libraries ..."
+       cd ../alsa-lib-*
+       ./configure $confopt_x --enable-static
+       make $make_conf ; make $install_conf install
+       for i in alsa-utils- alsa-oss-; do 
+               echo "building ${i} ..."
+               cd ../${i}* ; ./configure $confopt_x
+               make $make_conf ; make $install_conf install
        done
-       cd ../alsa-tools-* &&
-       for i in ac3dec as10k1 seq/sbiload; do
-               echo "building ${i}..."
-               cd ./${i}* && ./configure $confopt_x &&
-               make $make_conf && make $install_conf install && cd ../
+       cd ../alsa-tools-*
+       for i in ac3dec as10k1 envy24control sb16_csp; do
+               echo "building alsa tools - $i ..."
+               cd ${i}* ; ./configure $confopt_x
+               make $make_conf ; make $install_conf install
+               cd ..
        done
-       cd ../
                }
-
-fi

diff --git a/packages/soundtools/alsa/no_depmod.patch b/packages/soundtools/alsa/no_depmod.patch
deleted file mode 100644 (file)
index f8612c7..0000000
--- a/packages/soundtools/alsa/no_depmod.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./Makefile.orig    2003-09-04 05:06:40.000000000 +0200
-+++ ./Makefile 2003-09-04 05:07:08.000000000 +0200
-@@ -140,11 +140,6 @@
-       rm -f $(DESTDIR)$(moddir)/snd*.o $(DESTDIR)$(moddir)/persist.o $(DESTDIR)$(moddir)/isapnp.o
- endif
-       @for d in $(SUBDIRS); do if ! $(MAKE) -C $$d modules_install; then exit 1; fi; done
--ifeq ($(DESTDIR),)
--      -/sbin/depmod -a $(kaversion) $(SYSTEM_MAP_OPT)
--else
--      -/sbin/depmod -a -b $(DESTDIR)/ $(SYSTEM_MAP_OPT) $(kaversion)
--endif
- 
- .PHONY: install-scripts
- install-scripts:

diff --git a/packages/soundtools/alsa/no_kconfig_check.patch b/packages/soundtools/alsa/no_kconfig_check.patch
deleted file mode 100644 (file)
index 460d098..0000000
--- a/packages/soundtools/alsa/no_kconfig_check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./alsa-kernel/core/sound_oss.c.orig        2003-09-04 05:08:07.000000000 +0200
-+++ ./alsa-kernel/core/sound_oss.c     2003-09-04 05:08:57.000000000 +0200
-@@ -23,10 +23,6 @@
- 
- #ifdef CONFIG_SND_OSSEMUL
- 
--#if !defined(CONFIG_SOUND) && !(defined(MODULE) && defined(CONFIG_SOUND_MODULE))
--#error "Enable the OSS soundcore multiplexer (CONFIG_SOUND) in the kernel."
--#endif
--
- #include <linux/init.h>
- #include <linux/slab.h>
- #include <linux/time.h>