[oe-commits] org.oe.dev alsa-oss: fix stdioemu.c for uclibc

[woglinde2 commit]

alsa-oss: fix stdioemu.c for uclibc
*on none glibc systems libio.h is not there and FILE._fileno is not defined
*on uclibc _fileno is _filedes
*provide autoconf magic which check for structure
*bump PR

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 377e4d7bcf91440bd806ee920d1b7ff72c44b991
ViewMTN: http://monotone.openembedded.org/revision/info/377e4d7bcf91440bd806ee920d1b7ff72c44b991
Files:
1
packages/alsa/files/libio.patch
packages/alsa/alsa-oss_1.0.15.bb
Diffs:

#
# mt diff -r1979059342fd0fe3a4faa80a3628242cbb830d11 -r377e4d7bcf91440bd806ee920d1b7ff72c44b991
#
#
#
# add_file "packages/alsa/files/libio.patch"
#  content [30802aa19da7dcd1632c7665450df841a03f3eda]
# 
# patch "packages/alsa/alsa-oss_1.0.15.bb"
#  from [7ca8c991dd2976fe24201983328f2b96c073e203]
#    to [aae010357d2d0209e7df3dcae5dbf441fc4029be]
#
============================================================
--- packages/alsa/files/libio.patch	30802aa19da7dcd1632c7665450df841a03f3eda
+++ packages/alsa/files/libio.patch	30802aa19da7dcd1632c7665450df841a03f3eda
@@ -0,0 +1,43 @@
+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
+@@ -37,7 +37,9 @@
+ #endif
+ 
+ #include <stdio.h>
++#ifdef HAVE_LIBIO_H
+ #include <libio.h>
++#endif
+ 
+ struct fd_cookie {
+ 	int fd;
+@@ -99,7 +101,11 @@
+ 
+ 	if (open_mode && fdc->fd > 0) {
+ 		result = fopencookie (fdc,"w", fns);
++#ifdef HAVE_FILENO
+ 		result->_fileno = fdc->fd;		/* ugly patchy slimy kludgy hack */
++else
++		result->_filedes = fdc->fd;
++#endif
+ 	}
+ 	return result;
+ }
+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
+@@ -33,6 +33,12 @@
+   LIBS="$OLD_LIBS"
+ fi
+ 
++AC_CHECK_HEADERS_ONCE([libio.h])
++
++AC_CHECK_MEMBER([struct _IO_FILE._fileno],
++		[AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])],
++		[],[])
++
+ AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
+ 	  oss-redir/Makefile test/Makefile \
+           alsa/testaoss test/testaoss)
============================================================
--- packages/alsa/alsa-oss_1.0.15.bb	7ca8c991dd2976fe24201983328f2b96c073e203
+++ packages/alsa/alsa-oss_1.0.15.bb	aae010357d2d0209e7df3dcae5dbf441fc4029be
@@ -2,8 +2,11 @@ DEPENDS = "alsa-lib"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
+PR = "1"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
+	   file://libio.patch;patch=1 \
+	  "
 
 inherit autotools