summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-07-30 09:49:50 -0700
committerKhem Raj <raj.khem@gmail.com>2019-07-30 19:15:24 -0700
commitb0e1cd4d7dea3c83dbc09c6585292b77a11eb77a (patch)
tree89c66687c1d3d4a20b0b637ac4eb1870ccb5f106 /meta-oe/recipes-multimedia
parent2332aa3f9ad6310feed4f6aed33e777588801caa (diff)
downloadmeta-openembedded-b0e1cd4d7dea3c83dbc09c6585292b77a11eb77a.tar.gz
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>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch53
-rw-r--r--meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb24
2 files changed, 0 insertions, 77 deletions
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
deleted file mode 100644
index 835b26601..000000000
--- a/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 54b1c2e27bf81f94c727b4923d4ed592110e2796 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 29 May 2011 21:05:15 +0200
4
5---
6 alsa/stdioemu.c | 8 +++++++-
7 configure.ac | 6 ++++++
8 2 files changed, 13 insertions(+), 1 deletion(-)
9
10diff --git a/alsa/stdioemu.c b/alsa/stdioemu.c
11index f7f9ab5..b673fe3 100644
12--- a/alsa/stdioemu.c
13+++ b/alsa/stdioemu.c
14@@ -37,7 +37,9 @@
15 #endif
16
17 #include <stdio.h>
18-
19+#ifdef HAVE_LIBIO_H
20+#include <libio.h>
21+#endif
22 struct fd_cookie {
23 int fd;
24 };
25@@ -98,7 +100,11 @@ static FILE *fake_fopen(const char *path, const char *mode, int flags)
26
27 if (open_mode && fdc->fd > 0) {
28 result = fopencookie (fdc,"w", fns);
29+#ifdef HAVE_FILENO
30 result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */
31+#else
32+ result->__filedes = fdc->fd;
33+#endif
34 }
35 return result;
36 }
37diff --git a/configure.ac b/configure.ac
38index 583b95f..60a1025 100644
39--- a/configure.ac
40+++ b/configure.ac
41@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then
42 LIBS="$OLD_LIBS"
43 fi
44
45+AC_CHECK_HEADERS_ONCE([libio.h])
46+
47+AC_CHECK_MEMBER([struct _IO_FILE._fileno],
48+ [AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])],
49+ [],[])
50+
51 AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
52 oss-redir/Makefile test/Makefile \
53 alsa/testaoss test/testaoss)
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
index 46ab50316..67a24cf9d 100644
--- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
+++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
@@ -1,26 +1,3 @@
1# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
2# The following is the difference between the old and the new license text.
3# Please update the LICENSE value if needed, and summarize the changes in
4# the commit message via 'License-Update:' tag.
5# (example: 'License-Update: copyright years updated.')
6#
7# The changes:
8#
9# --- COPYING
10# +++ COPYING
11# @@ -2,7 +2,8 @@
12# Version 2, June 1991
13#
14# Copyright (C) 1989, 1991 Free Software Foundation, Inc.
15# - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16# + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
17# +
18# Everyone is permitted to copy and distribute verbatim copies
19# of this license document, but changing it is not allowed.
20#
21#
22#
23
24SUMMARY = "Alsa OSS Compatibility Package" 1SUMMARY = "Alsa OSS Compatibility Package"
25SECTION = "libs/multimedia" 2SECTION = "libs/multimedia"
26LICENSE = "GPLv2" 3LICENSE = "GPLv2"
@@ -28,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a"
28DEPENDS = "alsa-lib" 5DEPENDS = "alsa-lib"
29 6
30SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ 7SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
31 file://libio.patch \
32" 8"
33SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874" 9SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874"
34SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e" 10SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e"