From 2e99ebcd7ed4229921e2c8476f06a8bcd977e21b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 5 Feb 2018 23:46:15 -0800 Subject: alsa-oss: Upgrade to 1.0.28 Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../alsa/alsa-oss-1.0.17/libio.patch | 43 ---------------------- .../recipes-multimedia/alsa/alsa-oss/libio.patch | 43 ++++++++++++++++++++++ meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb | 22 ----------- meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb | 20 ++++++++++ 4 files changed, 63 insertions(+), 65 deletions(-) delete mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch create mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch delete mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb create mode 100644 meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb (limited to 'meta-oe/recipes-multimedia') 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 deleted file mode 100644 index a053e4c604..0000000000 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch new file mode 100644 index 0000000000..5299945e19 --- /dev/null +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch @@ -0,0 +1,43 @@ +Index: alsa-oss-1.0.28/alsa/stdioemu.c +=================================================================== +--- alsa-oss-1.0.28.orig/alsa/stdioemu.c ++++ alsa-oss-1.0.28/alsa/stdioemu.c +@@ -37,7 +37,9 @@ + #endif + + #include ++#ifdef HAVE_LIBIO_H + #include ++#endif + + struct fd_cookie { + int fd; +@@ -99,7 +101,11 @@ static FILE *fake_fopen(const char *path + + 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.28/configure.ac +=================================================================== +--- alsa-oss-1.0.28.orig/configure.ac ++++ alsa-oss-1.0.28/configure.ac +@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then + 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 deleted file mode 100644 index 8966dbbc1a..0000000000 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "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" diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb new file mode 100644 index 0000000000..0c4a9f5456 --- /dev/null +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb @@ -0,0 +1,20 @@ +SUMMARY = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ + file://libio.patch \ +" +SRC_URI[md5sum] = "91f57e8cee1ad4cc956caa8b62ac5d43" +SRC_URI[sha256sum] = "3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5" + +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 +} -- cgit 1.2.3-korg