4 files changed, 15 insertions, 25 deletions
diff --git a/repo/media/alsa-firmware.xibuild b/repo/media/alsa-firmware.xibuild
index b7c6973..d6311a9 100644
--- a/repo/media/alsa-firmware.xibuild
+++ b/repo/media/alsa-firmware.xibuild
@@ -7,6 +7,13 @@ DESC="Firmware binaries for loader programs in alsa-tools and hotplug firmware l
 
 PKG_VER=1.2.4
 SOURCE=https://www.alsa-project.org/files/pub/firmware/alsa-firmware-$PKG_VER.tar.bz2
+ADDITIONAL="
+    use-uint32_t-instead-u_int32_t.patch
+"
+
+prepare () {
+    apply_patches
+}
 
 build () {
     ./configure --prefix=/usr &&
diff --git a/repo/media/alsa-oss.xibuild b/repo/media/alsa-oss.xibuild
deleted file mode 100644
index 3409c37..0000000
--- a/repo/media/alsa-oss.xibuild
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-MAKEDEPS="make"
-DEPS="alsa-lib"
-
-DESC="OSS compatibility library"
-
-PKG_VER=1.1.8
-SOURCE=https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-$PKG_VER.tar.bz2
-
-build () {
-    ./configure --disable-static &&
-    make
-}
-
-package () {
-    make DESTDIR=$PKG_DEST install
-}
diff --git a/repo/media/alsa-tools.xibuild b/repo/media/alsa-tools.xibuild
index a31327f..5901538 100644
--- a/repo/media/alsa-tools.xibuild
+++ b/repo/media/alsa-tools.xibuild
@@ -13,6 +13,7 @@ prepare () {
 }
 
 build () {
+    buildroot=$(pwd)
     for tool in *; do
       case $tool in
         seq )
@@ -23,13 +24,13 @@ build () {
         ;;
       esac
 
-  pushd $tool_dir
-    ./configure --prefix=/usr
-    make
-    make DESTDIR=$PKG_DEST install
-  popd
+      cd $tool_dir
+        ./configure --prefix=/usr
+        make
+        make DESTDIR=$PKG_DEST install
+    cd $buildroot
 
-done
+    done
 unset tool tool_dir
 
 }
diff --git a/repo/media/pulseaudio.xibuild b/repo/media/pulseaudio.xibuild
index 572205d..9554c72 100644
--- a/repo/media/pulseaudio.xibuild
+++ b/repo/media/pulseaudio.xibuild
@@ -22,5 +22,5 @@ build () {
 
 package () {
     DESTDIR=$PKG_DEST ninja install
-    rm -fv $PKG_DEST/etc/dbus-1/system.d/pulseaudio-system.conf
+    rm -f $PKG_DEST/etc/dbus-1/system.d/pulseaudio-system.conf
 }