summaryrefslogtreecommitdiff
path: root/package/alsa-lib/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-05-23 18:47:06 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-05-23 19:32:08 +0200
commit9d07d2abb446d1dbbe701aac002e99fd98b658c2 (patch)
tree620381a662b05960ff1c3f7c5f6097c0c5bab644 /package/alsa-lib/patches
parentb266877a008800c5dbc48a313be879356ac8f18d (diff)
alsa-lib: update to 1.1.4
Diffstat (limited to 'package/alsa-lib/patches')
-rw-r--r--package/alsa-lib/patches/patch-configure_ac26
-rw-r--r--package/alsa-lib/patches/patch-include_pcm_h28
-rw-r--r--package/alsa-lib/patches/patch-include_sound_asound_h11
-rw-r--r--package/alsa-lib/patches/patch-src_pcm_pcm_direct_c25
-rw-r--r--package/alsa-lib/patches/patch-src_pcm_pcm_shm_c23
-rw-r--r--package/alsa-lib/patches/patch-utils_alsa_pc_in11
6 files changed, 0 insertions, 124 deletions
diff --git a/package/alsa-lib/patches/patch-configure_ac b/package/alsa-lib/patches/patch-configure_ac
deleted file mode 100644
index c9e7cfbf6..000000000
--- a/package/alsa-lib/patches/patch-configure_ac
+++ /dev/null
@@ -1,26 +0,0 @@
---- alsa-lib-1.0.29.orig/configure.ac 2015-02-26 13:34:52.000000000 +0100
-+++ alsa-lib-1.0.29/configure.ac 2016-11-20 18:20:58.456540169 +0100
-@@ -67,21 +67,13 @@ dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
- AC_CHECK_FUNCS([uselocale])
-
-+AC_CHECK_FUNC([fork])
-+
- SAVE_LIBRARY_VERSION
- AC_SUBST(LIBTOOL_VERSION_INFO)
-
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
--dnl Do not build static and shared libraries together
--if test "$enable_static" = "$enable_shared" -a "$enable_static" = "yes"; then
--cat <<EOF
-- Please, do not try to compile static and shared libraries together.
-- See INSTALL file for more details (do not use --enable-shared=yes with
-- --enable-static=yes).
--EOF
-- exit 1
--fi
--
- dnl ALSA configuration directory
- AC_ARG_WITH(configdir,
- AS_HELP_STRING([--with-configdir=dir],
diff --git a/package/alsa-lib/patches/patch-include_pcm_h b/package/alsa-lib/patches/patch-include_pcm_h
deleted file mode 100644
index a82c1a7b2..000000000
--- a/package/alsa-lib/patches/patch-include_pcm_h
+++ /dev/null
@@ -1,28 +0,0 @@
-* added idea/patch from https://github.com/rofl0r/sabotage
-
---- alsa-lib-1.0.29.orig/include/pcm.h 2015-02-26 13:34:52.000000000 +0100
-+++ alsa-lib-1.0.29/include/pcm.h 2016-11-20 18:14:09.708758715 +0100
-@@ -33,6 +33,8 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
-+
- /**
- * \defgroup PCM PCM Interface
- * See the \ref pcm page for more details.
-@@ -1063,10 +1065,10 @@ int snd_pcm_format_width(snd_pcm_format_
- int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
- ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
--u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
--u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
--u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
--u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
-+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
-+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
-+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
-
- snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
diff --git a/package/alsa-lib/patches/patch-include_sound_asound_h b/package/alsa-lib/patches/patch-include_sound_asound_h
deleted file mode 100644
index ed7354094..000000000
--- a/package/alsa-lib/patches/patch-include_sound_asound_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-lib-1.0.27.2.orig/include/sound/asound.h 2013-07-08 14:31:36.000000000 +0200
-+++ alsa-lib-1.0.27.2/include/sound/asound.h 2013-09-17 09:40:33.000000000 +0200
-@@ -24,7 +24,7 @@
- #define _UAPI__SOUND_ASOUND_H
-
- #include <linux/types.h>
--
-+#undef off_t
-
- /*
- * protocol version
diff --git a/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c b/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c
deleted file mode 100644
index 0ca0e211f..000000000
--- a/package/alsa-lib/patches/patch-src_pcm_pcm_direct_c
+++ /dev/null
@@ -1,25 +0,0 @@
---- alsa-lib-1.0.29.orig/src/pcm/pcm_direct.c 2015-02-26 13:34:52.000000000 +0100
-+++ alsa-lib-1.0.29/src/pcm/pcm_direct.c 2016-11-20 18:20:58.456540169 +0100
-@@ -424,13 +424,21 @@ int snd_pcm_direct_server_create(snd_pcm
- close(dmix->server_fd);
- return ret;
- }
--
-+
-+#ifdef HAVE_FORK
- ret = fork();
-+#else
-+ ret = vfork();
-+#endif
- if (ret < 0) {
- close(dmix->server_fd);
- return ret;
- } else if (ret == 0) {
-+#ifdef HAVE_FORK
- ret = fork();
-+#else
-+ ret = vfork();
-+#endif
- if (ret == 0)
- server_job(dmix);
- _exit(EXIT_SUCCESS);
diff --git a/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c b/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c
deleted file mode 100644
index decd44bc8..000000000
--- a/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c
+++ /dev/null
@@ -1,23 +0,0 @@
---- alsa-lib-1.0.22.orig/src/pcm/pcm_shm.c 2009-12-16 16:18:51.000000000 +0100
-+++ alsa-lib-1.0.22/src/pcm/pcm_shm.c 2010-04-04 10:53:44.000000000 +0200
-@@ -482,15 +482,19 @@ static int snd_pcm_shm_drop(snd_pcm_t *p
-
- static int snd_pcm_shm_drain(snd_pcm_t *pcm)
- {
-+ struct timespec ts;
- snd_pcm_shm_t *shm = pcm->private_data;
- volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl;
- int err;
-+ ts.tv_sec = 0;
-+ ts.tv_nsec = 10000000;
-+
- do {
- ctrl->cmd = SNDRV_PCM_IOCTL_DRAIN;
- err = snd_pcm_shm_action(pcm);
- if (err != -EAGAIN)
- break;
-- usleep(10000);
-+ nanosleep(&ts, NULL);
- } while (1);
- if (err < 0)
- return err;
diff --git a/package/alsa-lib/patches/patch-utils_alsa_pc_in b/package/alsa-lib/patches/patch-utils_alsa_pc_in
deleted file mode 100644
index 6ca74b395..000000000
--- a/package/alsa-lib/patches/patch-utils_alsa_pc_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-lib-1.0.28.orig/utils/alsa.pc.in 2014-06-17 14:34:19.000000000 +0200
-+++ alsa-lib-1.0.28/utils/alsa.pc.in 2014-06-29 09:21:14.651388400 +0200
-@@ -7,7 +7,7 @@ Name: alsa
- Description: Advanced Linux Sound Architecture (ALSA) - Library
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} -lasound
-+Libs: -lasound
- Libs.private: @ALSA_DEPLIBS@
- # -I${includedir}/alsa below is just for backward compatibility
- # (it was set so mistakely in the older version)