diff options
author | Philip Balister <philip@balister.org> | 2007-01-18 15:15:25 +0000 |
---|---|---|
committer | Philip Balister <philip@balister.org> | 2007-01-18 15:15:25 +0000 |
commit | 585f4e7c27219d784cbed507eab188b91d9ad0f1 (patch) | |
tree | 77c2025f3ebdbac1c07e17bc923a4efb8fde9a5c /packages/alsa | |
parent | 4e96c29dc9b9ea5f6652ed63bcfd82d912ab41b8 (diff) | |
parent | 419ef2d081af1db73844871ce0858abda1bf7ec9 (diff) |
merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'
and 'c77de7a09c5852f1bfe63afbd011ef701c76bdf6'
Diffstat (limited to 'packages/alsa')
-rw-r--r-- | packages/alsa/alsa-lib/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/alsa/alsa-lib/fix-tstamp-declaration.patch | 13 | ||||
-rw-r--r-- | packages/alsa/alsa-lib_1.0.13.bb | 5 |
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 |