mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
alsa-oss: Drop now not needed patch
Upstream has completely dropped including libio.h which makes it redundant [1] moreover glibc is no longer shipping this header either [1] https://github.com/alsa-project/alsa-oss/commit/8564df1c8d114de6ddbc082004c2a74719a46717 Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,53 +0,0 @@
|
||||
From 54b1c2e27bf81f94c727b4923d4ed592110e2796 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||
Date: Sun, 29 May 2011 21:05:15 +0200
|
||||
|
||||
---
|
||||
alsa/stdioemu.c | 8 +++++++-
|
||||
configure.ac | 6 ++++++
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/alsa/stdioemu.c b/alsa/stdioemu.c
|
||||
index f7f9ab5..b673fe3 100644
|
||||
--- a/alsa/stdioemu.c
|
||||
+++ b/alsa/stdioemu.c
|
||||
@@ -37,7 +37,9 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
-
|
||||
+#ifdef HAVE_LIBIO_H
|
||||
+#include <libio.h>
|
||||
+#endif
|
||||
struct fd_cookie {
|
||||
int fd;
|
||||
};
|
||||
@@ -98,7 +100,11 @@ static FILE *fake_fopen(const char *path, const char *mode, int flags)
|
||||
|
||||
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;
|
||||
}
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 583b95f..60a1025 100644
|
||||
--- a/configure.ac
|
||||
+++ b/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)
|
||||
@@ -1,26 +1,3 @@
|
||||
# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
|
||||
# The following is the difference between the old and the new license text.
|
||||
# Please update the LICENSE value if needed, and summarize the changes in
|
||||
# the commit message via 'License-Update:' tag.
|
||||
# (example: 'License-Update: copyright years updated.')
|
||||
#
|
||||
# The changes:
|
||||
#
|
||||
# --- COPYING
|
||||
# +++ COPYING
|
||||
# @@ -2,7 +2,8 @@
|
||||
# Version 2, June 1991
|
||||
#
|
||||
# Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
# - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
# + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
# +
|
||||
# Everyone is permitted to copy and distribute verbatim copies
|
||||
# of this license document, but changing it is not allowed.
|
||||
#
|
||||
#
|
||||
#
|
||||
|
||||
SUMMARY = "Alsa OSS Compatibility Package"
|
||||
SECTION = "libs/multimedia"
|
||||
LICENSE = "GPLv2"
|
||||
@@ -28,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a"
|
||||
DEPENDS = "alsa-lib"
|
||||
|
||||
SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
|
||||
file://libio.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874"
|
||||
SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e"
|
||||
|
||||
Reference in New Issue
Block a user