summaryrefslogtreecommitdiff
path: root/packages/alsa/files
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-03-19 20:56:09 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-03-19 20:56:09 +0100
commit6a21d65d2840c58cfa7cd749a04669d8f7980646 (patch)
tree00b1aa153b69cda8cf9406c4700fd7730c34d3a5 /packages/alsa/files
parentdcfe7349b369a87881cf1fa43085d9e9c5609fcf (diff)
parent6f854d71c347475d53d5080a5490625345d95d12 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/alsa/files')
-rw-r--r--packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch43
-rw-r--r--packages/alsa/files/alsa-utils-automake.patch10
-rw-r--r--packages/alsa/files/alsa-utils-remove-xmlto.patch15
-rw-r--r--packages/alsa/files/alsa-utils-sys-siglist.patch15
-rw-r--r--packages/alsa/files/libio.patch43
5 files changed, 0 insertions, 126 deletions
diff --git a/packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch b/packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch
deleted file mode 100644
index d736abbdab..0000000000
--- a/packages/alsa/files/alsa-utils-autoconf-strl-funcs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: alsa-utils-1.0.18/alsactl/init_sysdeps.c
-===================================================================
---- alsa-utils-1.0.18.orig/alsactl/init_sysdeps.c 2008-10-29 05:42:11.000000000 -0700
-+++ alsa-utils-1.0.18/alsactl/init_sysdeps.c 2009-02-10 23:17:47.000000000 -0800
-@@ -17,7 +17,7 @@
- *
- */
-
--#ifdef __GLIBC__
-+#if !HAVE_STRLCPY
- static size_t strlcpy(char *dst, const char *src, size_t size)
- {
- size_t bytes = 0;
-@@ -36,7 +36,10 @@
- *q = '\0';
- return bytes;
- }
-+#endif /* !HAVE_STRLCPY */
-
-+
-+#if !HAVE_STRLCAT
- static size_t strlcat(char *dst, const char *src, size_t size)
- {
- size_t bytes = 0;
-@@ -60,4 +63,4 @@
- *q = '\0';
- return bytes;
- }
--#endif /* __GLIBC__ */
-+#endif /* !HAVE_STRLCAT */
-Index: alsa-utils-1.0.18/configure.in
-===================================================================
---- alsa-utils-1.0.18.orig/configure.in 2008-10-29 05:48:01.000000000 -0700
-+++ alsa-utils-1.0.18/configure.in 2009-02-10 23:02:07.000000000 -0800
-@@ -6,7 +6,7 @@
-
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION([0.15])
--
-+AC_CHECK_FUNCS([strlcat strlcpy])
- dnl Checks for programs.
-
- dnl try to gues cross-compiler if not set
diff --git a/packages/alsa/files/alsa-utils-automake.patch b/packages/alsa/files/alsa-utils-automake.patch
deleted file mode 100644
index de0eee94fd..0000000000
--- a/packages/alsa/files/alsa-utils-automake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: alsa-utils-1.0.14/seq/aseqnet/Makefile.am
-===================================================================
---- alsa-utils-1.0.14.orig/seq/aseqnet/Makefile.am 2007-05-31 10:07:21.000000000 +0200
-+++ alsa-utils-1.0.14/seq/aseqnet/Makefile.am 2007-10-31 21:11:41.000000000 +0100
-@@ -3,4 +3,5 @@
-
- bin_PROGRAMS = aseqnet
- aseqnet_SOURCES = aseqnet.c
-+aseqnet_LDADD = $(INTLLIBS)
- man_MANS = aseqnet.1
diff --git a/packages/alsa/files/alsa-utils-remove-xmlto.patch b/packages/alsa/files/alsa-utils-remove-xmlto.patch
deleted file mode 100644
index a02bdba5aa..0000000000
--- a/packages/alsa/files/alsa-utils-remove-xmlto.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- alsa-utils-1.0.18.orig/alsactl/Makefile.am 2008-10-29 12:42:11.000000000 +0000
-+++ alsa-utils-1.0.18/alsactl/Makefile.am 2009-01-21 23:43:19.000000000 +0000
-@@ -1,11 +1,8 @@
- SUBDIRS = init
-
- sbin_PROGRAMS=alsactl
--man_MANS=alsactl.1 alsactl_init.7
-+man_MANS=alsactl.1
- EXTRA_DIST=alsactl.1 alsactl_init.xml
-
- alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
- noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
--
--%.7: %.xml
-- xmlto man $?
diff --git a/packages/alsa/files/alsa-utils-sys-siglist.patch b/packages/alsa/files/alsa-utils-sys-siglist.patch
deleted file mode 100644
index 8c499e8d63..0000000000
--- a/packages/alsa/files/alsa-utils-sys-siglist.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-sys_siglist is not supported by default on uclibc and is, in general,
-a bad thing for the same reasons as sys_errlist is a bad thing. GNU
-supports strsignal in the manner of strerror
-
---- alsa-utils-1.0.8/alsamixer/alsamixer.c.orig 2005-09-06 12:44:41.415219126 -0700
-+++ alsa-utils-1.0.8/alsamixer/alsamixer.c 2005-09-06 12:44:43.407344482 -0700
-@@ -2188,7 +2188,7 @@
- mixer_signal_handler (int signal)
- {
- if (signal != SIGSEGV)
-- mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0);
-+ mixer_abort (ERR_SIGNAL, strsignal(signal), 0);
- else
- {
- fprintf (stderr, "\nSegmentation fault.\n");
diff --git a/packages/alsa/files/libio.patch b/packages/alsa/files/libio.patch
deleted file mode 100644
index a053e4c604..0000000000
--- a/packages/alsa/files/libio.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: alsa-oss-1.0.15/alsa/stdioemu.c
-===================================================================
---- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200
-+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200
-@@ -37,7 +37,9 @@
- #endif
-
- #include <stdio.h>
-+#ifdef HAVE_LIBIO_H
- #include <libio.h>
-+#endif
-
- struct fd_cookie {
- int fd;
-@@ -99,7 +101,11 @@
-
- if (open_mode && fdc->fd > 0) {
- result = fopencookie (fdc,"w", fns);
-+#ifdef HAVE_FILENO
- result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */
-+#else
-+ result->__filedes = fdc->fd;
-+#endif
- }
- return result;
- }
-Index: alsa-oss-1.0.15/configure.in
-===================================================================
---- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200
-+++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200
-@@ -33,6 +33,12 @@
- LIBS="$OLD_LIBS"
- fi
-
-+AC_CHECK_HEADERS_ONCE([libio.h])
-+
-+AC_CHECK_MEMBER([struct _IO_FILE._fileno],
-+ [AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])],
-+ [],[])
-+
- AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
- oss-redir/Makefile test/Makefile \
- alsa/testaoss test/testaoss)