diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-19 20:56:09 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-19 20:56:09 +0100 |
| commit | 6a21d65d2840c58cfa7cd749a04669d8f7980646 (patch) | |
| tree | 00b1aa153b69cda8cf9406c4700fd7730c34d3a5 /packages/alsa/alsa-lib | |
| parent | dcfe7349b369a87881cf1fa43085d9e9c5609fcf (diff) | |
| parent | 6f854d71c347475d53d5080a5490625345d95d12 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/alsa/alsa-lib')
| -rw-r--r-- | packages/alsa/alsa-lib/fix-tstamp-declaration.patch | 13 | ||||
| -rw-r--r-- | packages/alsa/alsa-lib/fix_libmath.patch | 17 | ||||
| -rw-r--r-- | packages/alsa/alsa-lib/unbreak_plugindir.patch | 12 |
3 files changed, 0 insertions, 42 deletions
diff --git a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch b/packages/alsa/alsa-lib/fix-tstamp-declaration.patch deleted file mode 100644 index 59b3b6d150..0000000000 --- a/packages/alsa/alsa-lib/fix-tstamp-declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/fix_libmath.patch b/packages/alsa/alsa-lib/fix_libmath.patch deleted file mode 100644 index 23309ce381..0000000000 --- a/packages/alsa/alsa-lib/fix_libmath.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: alsa-lib-1.0.15/configure.in -=================================================================== ---- alsa-lib-1.0.15.orig/configure.in 2007-10-15 10:45:26.000000000 +0200 -+++ alsa-lib-1.0.15/configure.in 2008-07-19 15:51:34.177119589 +0200 -@@ -191,9 +191,9 @@ - AC_MSG_RESULT(no) - fi - --ALSA_DEPLIBS="" --if test "$softfloat" != "yes"; then -- ALSA_DEPLIBS="-lm" -+ALSA_DEPLIBS="-lm" -+if test "$softfloat" = "yes"; then -+ AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""]) - fi - - dnl Check for libdl diff --git a/packages/alsa/alsa-lib/unbreak_plugindir.patch b/packages/alsa/alsa-lib/unbreak_plugindir.patch deleted file mode 100644 index 7d13166809..0000000000 --- a/packages/alsa/alsa-lib/unbreak_plugindir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in ---- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500 -+++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500 -@@ -93,7 +93,7 @@ - esac - plugindir="$dir/$PACKAGE" - fi --AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules]) -+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules]) - ALSA_PLUGIN_DIR="$plugindir" - AC_SUBST(ALSA_PLUGIN_DIR) - |