summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-04-06 16:58:11 -0700
committerKhem Raj <raj.khem@gmail.com>2019-04-06 16:59:58 -0700
commit99a49e059fd82180f943d8cd6651b2c8e0d6289f (patch)
treea79bf9fa9a88fe17eef55a6fff96acefbb44a3f6
parent82b8ae6bd2167748ca3ffb4cd5d251f20ed30af1 (diff)
downloadmeta-openembedded-99a49e059fd82180f943d8cd6651b2c8e0d6289f.tar.gz
alsa-oss: Upgrade to 1.1.8
OE-core has upgraded alsa-lib to 1.1.8 as well so we need to be in sysnc Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch32
-rw-r--r--meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb (renamed from meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.6.bb)4
2 files changed, 23 insertions, 13 deletions
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
index 5299945e1..835b26601 100644
--- a/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
+++ b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
@@ -1,18 +1,28 @@
1Index: alsa-oss-1.0.28/alsa/stdioemu.c 1From 54b1c2e27bf81f94c727b4923d4ed592110e2796 Mon Sep 17 00:00:00 2001
2=================================================================== 2From: Martin Jansa <Martin.Jansa@gmail.com>
3--- alsa-oss-1.0.28.orig/alsa/stdioemu.c 3Date: Sun, 29 May 2011 21:05:15 +0200
4+++ alsa-oss-1.0.28/alsa/stdioemu.c 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
5@@ -37,7 +37,9 @@ 14@@ -37,7 +37,9 @@
6 #endif 15 #endif
7 16
8 #include <stdio.h> 17 #include <stdio.h>
18-
9+#ifdef HAVE_LIBIO_H 19+#ifdef HAVE_LIBIO_H
10 #include <libio.h> 20+#include <libio.h>
11+#endif 21+#endif
12
13 struct fd_cookie { 22 struct fd_cookie {
14 int fd; 23 int fd;
15@@ -99,7 +101,11 @@ static FILE *fake_fopen(const char *path 24 };
25@@ -98,7 +100,11 @@ static FILE *fake_fopen(const char *path, const char *mode, int flags)
16 26
17 if (open_mode && fdc->fd > 0) { 27 if (open_mode && fdc->fd > 0) {
18 result = fopencookie (fdc,"w", fns); 28 result = fopencookie (fdc,"w", fns);
@@ -24,10 +34,10 @@ Index: alsa-oss-1.0.28/alsa/stdioemu.c
24 } 34 }
25 return result; 35 return result;
26 } 36 }
27Index: alsa-oss-1.0.28/configure.ac 37diff --git a/configure.ac b/configure.ac
28=================================================================== 38index 583b95f..60a1025 100644
29--- alsa-oss-1.0.28.orig/configure.ac 39--- a/configure.ac
30+++ alsa-oss-1.0.28/configure.ac 40+++ b/configure.ac
31@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then 41@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then
32 LIBS="$OLD_LIBS" 42 LIBS="$OLD_LIBS"
33 fi 43 fi
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.6.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
index 6c2176f79..46ab50316 100644
--- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.6.bb
+++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb
@@ -30,8 +30,8 @@ DEPENDS = "alsa-lib"
30SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ 30SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
31 file://libio.patch \ 31 file://libio.patch \
32" 32"
33SRC_URI[md5sum] = "fc845cafc4444193510ab1865c7350b8" 33SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874"
34SRC_URI[sha256sum] = "c3d3f743e61f05ff95c5cba3b06bc9c91ff86c37495f1d19dab844e6b90845ea" 34SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e"
35 35
36inherit autotools 36inherit autotools
37 37