From 057da10b2d3ea1ef76eef01c17d46f98437f7868 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@localhost.localdomain>
Date: Wed, 18 Mar 2009 19:39:55 +0100
Subject: [PATCH] fix alsa build

---
 packages/audio/alsa-lib/build            |  4 ++++
 packages/audio/alsa-lib/config/PMac.conf | 13 -------------
 packages/audio/alsa-utils/build          | 22 +++++++++++++++++-----
 packages/audio/alsa-utils/init.d/40_alsa |  5 ++++-
 packages/audio/alsa-utils/install        | 13 +++++++++++--
 5 files changed, 36 insertions(+), 21 deletions(-)
 delete mode 100644 packages/audio/alsa-lib/config/PMac.conf

diff --git a/packages/audio/alsa-lib/build b/packages/audio/alsa-lib/build
index 2dbebd8805..55760c0615 100755
--- a/packages/audio/alsa-lib/build
+++ b/packages/audio/alsa-lib/build
@@ -4,6 +4,8 @@
 
 $SCRIPTS/build toolchain
 
+CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32 -fPIC -DPIC"
+
 cd $BUILD/$1*
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -15,6 +17,8 @@ cd $BUILD/$1*
             --disable-python \
             --disable-dependency-tracking
 
+sed -i 's/.*PKGLIBDIR.*/#define PKGLIBDIR ""/' include/config.h
+
 $MAKE
 
 $STRIP src/.libs/libasound.so*
diff --git a/packages/audio/alsa-lib/config/PMac.conf b/packages/audio/alsa-lib/config/PMac.conf
deleted file mode 100644
index c6ac09290d..0000000000
--- a/packages/audio/alsa-lib/config/PMac.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# configuration for PMac
-
-<confdir:pcm/front.conf>
-
-PMac.pcm.front.0 {
-	@args [ CARD ]
-	@args.CARD {
-		type string
-	}
-	type hw
-	card $CARD
-	device 0
-}
diff --git a/packages/audio/alsa-utils/build b/packages/audio/alsa-utils/build
index 127aafcfe8..57eb84b5bf 100755
--- a/packages/audio/alsa-utils/build
+++ b/packages/audio/alsa-utils/build
@@ -4,6 +4,13 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build alsa-lib
+[ "$DEVTOOLS" = yes ] && $SCRIPTS/build ncurses
+
+export CPPFLAGS="$CPPFLAGS -I$LIB_PREFIX/include/ncurses"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/usr/lib64 -L$LIB_PREFIX/lib"
+
+ALSAMIXER_CONFIG="--disable-alsamixer"
+[ "$DEVTOOLS" = yes ] && ALSAMIXER_CONFIG="--enable-alsamixer"
 
 cd $BUILD/$1*
 ./configure --host=$TARGET_NAME \
@@ -11,10 +18,15 @@ cd $BUILD/$1*
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
             --disable-dependency-tracking \
-            --disable-alsamixer
+            $ALSAMIXER_CONFIG
 
-$MAKE -C amixer
-$STRIP amixer/amixer
\ No newline at end of file
+make -C amixer
+
+if [ "$DEVTOOLS" = yes ]; then
+  make -C alsamixer
+  make -C aplay
+  make -C iecset
+fi
+
+exit 0
diff --git a/packages/audio/alsa-utils/init.d/40_alsa b/packages/audio/alsa-utils/init.d/40_alsa
index 011e2b1776..7408a4c485 100755
--- a/packages/audio/alsa-utils/init.d/40_alsa
+++ b/packages/audio/alsa-utils/init.d/40_alsa
@@ -85,13 +85,16 @@ mixer 'IEC958 Capture Monitor' 0% off
 mixer 'Headphone Jack Sense' 0% off
 mixer 'Line Jack Sense' 0% off
 
+# Required on some Vaio notebooks (B3XP):
+mixer 'External Amplifier' 0% mute
+
 # Required for either Analog or Digital output
 mixer 'SB Live Analog/Digital Output Jack' $SBL_AUDIGY
 mixer 'Audigy Analog/Digital Output Jack' $SBL_AUDIGY
 
 # set SPDIF mixer params
 if [ "$SOUNDCARD_MODE" = SPDIF ]; then
-  mixer 'IEC958' 90%
+  mixer 'IEC958' 90% on
   mixer 'IEC958 Output' 90%
   mixer 'IEC958 Playback AC97-SPSA' $AC97_SPSA
   mixer 'IEC958 Coaxial' 90%
diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install
index 2c65e1c4ee..cd3666513d 100755
--- a/packages/audio/alsa-utils/install
+++ b/packages/audio/alsa-utils/install
@@ -1,7 +1,16 @@
 #!/bin/sh
 
 . config/options
-$SCRIPTS/install alsa-lib
+
+[ "$DEVTOOLS" = yes ] && $SCRIPTS/install ncurses
 
 mkdir -p $INSTALL/usr/bin
-cp $BUILD/$1*/amixer/amixer $INSTALL/usr/bin
\ No newline at end of file
+cp $BUILD/$1*/amixer/amixer $INSTALL/usr/bin
+
+if [ "$DEVTOOLS" = yes ]; then
+  cp $BUILD/$1*/alsamixer/alsamixer $INSTALL/usr/bin
+  cp $BUILD/$1*/aplay/aplay $INSTALL/usr/bin
+  cp $BUILD/$1*/iecset/iecset $INSTALL/usr/bin
+fi
+
+exit 0