From a0629d7a76c6c05496e4bbbc0c87b7614c05a791 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 29 May 2011 21:05:15 +0200 Subject: alsa-oss: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d Signed-off-by: Martin Jansa --- .../alsa/alsa-oss-1.0.17/libio.patch | 43 ++++++++++++++++++++++ meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb | 22 +++++++++++ 2 files changed, 65 insertions(+) create mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch create mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch new file mode 100644 index 000000000..a053e4c60 --- /dev/null +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch @@ -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-21 22:17:06.303161438 +0200 +@@ -37,7 +37,9 @@ + #endif + + #include ++#ifdef HAVE_LIBIO_H + #include ++#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-21 22:16:11.719837298 +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) diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb new file mode 100644 index 000000000..52634c156 --- /dev/null +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" +DEPENDS = "alsa-lib" +PR = "r1" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ + file://libio.patch \ + " + +inherit autotools + +LEAD_SONAME = "libaoss.so.0" + +do_configure_prepend () { + touch NEWS README AUTHORS ChangeLog + sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in +} + +SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" +SRC_URI[sha256sum] = "8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca" -- cgit v1.2.3-54-g00ecf