summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-01-18 00:27:21 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-01-18 00:27:21 +0000
commitf61f3efe2389249c001107ccd55dac39e79ef2a1 (patch)
treea57f0b32abf603e22f93646f485b91f25d0b5c34
parentdb46ab483b16f9ca9c5d148817cee0363b288ddd (diff)
alsa-lib: fix "error: field 'tstamp' has incomplete type" when including alsa headers with strict compilation options
-rw-r--r--packages/alsa/alsa-lib/.mtn2git_empty0
-rw-r--r--packages/alsa/alsa-lib/fix-tstamp-declaration.patch13
-rw-r--r--packages/alsa/alsa-lib_1.0.13.bb5
3 files changed, 16 insertions, 2 deletions
diff --git a/packages/alsa/alsa-lib/.mtn2git_empty b/packages/alsa/alsa-lib/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/alsa-lib/.mtn2git_empty
diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch
new file mode 100644
index 0000000000..59b3b6d150
--- /dev/null
+++ b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch
@@ -0,0 +1,13 @@
+Index: alsa-lib-1.0.13/include/global.h
+===================================================================
+--- alsa-lib-1.0.13.orig/include/global.h
++++ alsa-lib-1.0.13/include/global.h
+@@ -29,6 +29,8 @@
+ #define __ALSA_GLOBAL_H_
+
+ /* for timeval and timespec */
++#define __need_timeval
++#define __need_timespec
+ #include <time.h>
+
+ #ifdef __cplusplus
diff --git a/packages/alsa/alsa-lib_1.0.13.bb b/packages/alsa/alsa-lib_1.0.13.bb
index 987a5901f4..8b6b7af409 100644
--- a/packages/alsa/alsa-lib_1.0.13.bb
+++ b/packages/alsa/alsa-lib_1.0.13.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
# configure.in sets -D__arm__ on the command line for any arm system
# (not just those with the ARM instruction set), this should be removed,
@@ -10,7 +10,8 @@ PR = "r0"
#FIXME: remove the following
ARM_INSTRUCTION_SET = "arm"
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+ file://fix-tstamp-declaration.patch;patch=1"
inherit autotools pkgconfig