3 files changed, 7 insertions, 20 deletions
diff --git a/packages/alsa/alsa-oss_1.0.15.bb b/packages/alsa/alsa-oss_1.0.15.bb
index 3cfe886d61..de840e73fe 100644
--- a/packages/alsa/alsa-oss_1.0.15.bb
+++ b/packages/alsa/alsa-oss_1.0.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa OSS Compatibility Package"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
-PR = "1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
 	   file://libio.patch;patch=1 \
@@ -10,6 +10,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
 
 inherit autotools 
 
+LEAD_SONAME = "libaoss.so.0"
+
 do_configure_prepend () {
 	touch NEWS README AUTHORS ChangeLog
 }
diff --git a/packages/alsa/alsa-versym.inc b/packages/alsa/alsa-versym.inc
index 6d585ecf4a..07ca89cafb 100644
--- a/packages/alsa/alsa-versym.inc
+++ b/packages/alsa/alsa-versym.inc
@@ -4,18 +4,3 @@ def get_alsa_versym_setting(bb, d):
     if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
         return "--with-versioned=no"
     return ""
-    
-
-def get_alsa_versym_setting(bb, d):
-    # Versioned symbols don't work propery with uClibc
-    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
-        return "--with-versioned=no"
-    return ""
-    
-
-def get_alsa_versym_setting(bb, d):
-    # Versioned symbols don't work propery with uClibc
-    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
-        return "--with-versioned=no"
-    return ""
-    
diff --git a/packages/alsa/files/libio.patch b/packages/alsa/files/libio.patch
index 83345a98d3..a053e4c604 100644
--- a/packages/alsa/files/libio.patch
+++ b/packages/alsa/files/libio.patch
@@ -1,7 +1,7 @@
 Index: alsa-oss-1.0.15/alsa/stdioemu.c
 ===================================================================
 --- alsa-oss-1.0.15.orig/alsa/stdioemu.c	2007-10-15 10:50:40.000000000 +0200
-+++ alsa-oss-1.0.15/alsa/stdioemu.c	2008-07-20 22:29:46.767474560 +0200
++++ alsa-oss-1.0.15/alsa/stdioemu.c	2008-07-21 22:17:06.303161438 +0200
 @@ -37,7 +37,9 @@
  #endif
  
@@ -18,8 +18,8 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c
  		result = fopencookie (fdc,"w", fns);
 +#ifdef HAVE_FILENO
  		result->_fileno = fdc->fd;		/* ugly patchy slimy kludgy hack */
-+else
-+		result->_filedes = fdc->fd;
++#else
++		result->__filedes = fdc->fd;
 +#endif
  	}
  	return result;
@@ -27,7 +27,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c
 Index: alsa-oss-1.0.15/configure.in
 ===================================================================
 --- alsa-oss-1.0.15.orig/configure.in	2007-10-15 10:50:40.000000000 +0200
-+++ alsa-oss-1.0.15/configure.in	2008-07-20 22:49:45.455837502 +0200
++++ alsa-oss-1.0.15/configure.in	2008-07-21 22:16:11.719837298 +0200
 @@ -33,6 +33,12 @@
    LIBS="$OLD_LIBS"
  fi