commit: f9226fb96d893ff6a4dd4762a74cc0b52bacc1f4 parent 0eea2ddc78b26afd26a24ab86a31cdeea83021c3 Author: Michael Forney <mforney@mforney.org> Date: Sun, 7 Jul 2019 19:23:46 -0700 alsa-lib: Remove unnecessary patch for parameter qualifiers I was mistaken about how type compatibility worked for function types.Diffstat:
9 files changed, 1 insertion(+), 125 deletions(-)diff --git a/pkg/alsa-lib/patch/0005-Make-sure-parameter-qualifiers-match-between-declara.patch b/pkg/alsa-lib/patch/0005-Make-sure-parameter-qualifiers-match-between-declara.patch@@ -1,90 +0,0 @@ -From a10d0b074483dc20ddd3678442a15bc47a63f549 Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Fri, 31 May 2019 15:52:45 -0700 -Subject: [PATCH] Make sure parameter qualifiers match between declaration and - definition - -Signed-off-by: Michael Forney <mforney@mforney.org> ---- - src/pcm/pcm.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index 3a71d79b..c58f5933 100644 ---- a/src/pcm/pcm.c -+++ b/src/pcm/pcm.c -@@ -1997,7 +1997,7 @@ static const char *const snd_pcm_tstamp_type_names[] = { - * \param stream PCM stream type - * \return ascii name of PCM stream type - */ --const char *snd_pcm_stream_name(snd_pcm_stream_t stream) -+const char *snd_pcm_stream_name(const snd_pcm_stream_t stream) - { - if (stream > SND_PCM_STREAM_LAST) - return NULL; -@@ -2009,7 +2009,7 @@ const char *snd_pcm_stream_name(snd_pcm_stream_t stream) - * \param acc PCM access type - * \return ascii name of PCM access type - */ --const char *snd_pcm_access_name(snd_pcm_access_t acc) -+const char *snd_pcm_access_name(const snd_pcm_access_t acc) - { - if (acc > SND_PCM_ACCESS_LAST) - return NULL; -@@ -2021,7 +2021,7 @@ const char *snd_pcm_access_name(snd_pcm_access_t acc) - * \param format PCM sample format - * \return ascii name of PCM sample format - */ --const char *snd_pcm_format_name(snd_pcm_format_t format) -+const char *snd_pcm_format_name(const snd_pcm_format_t format) - { - if (format > SND_PCM_FORMAT_LAST) - return NULL; -@@ -2033,7 +2033,7 @@ const char *snd_pcm_format_name(snd_pcm_format_t format) - * \param format PCM sample format - * \return ascii description of PCM sample format - */ --const char *snd_pcm_format_description(snd_pcm_format_t format) -+const char *snd_pcm_format_description(const snd_pcm_format_t format) - { - if (format > SND_PCM_FORMAT_LAST) - return NULL; -@@ -2072,7 +2072,7 @@ snd_pcm_format_t snd_pcm_format_value(const char* name) - * \param subformat PCM sample subformat - * \return ascii name of PCM sample subformat - */ --const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat) -+const char *snd_pcm_subformat_name(const snd_pcm_subformat_t subformat) - { - if (subformat > SND_PCM_SUBFORMAT_LAST) - return NULL; -@@ -2084,7 +2084,7 @@ const char *snd_pcm_subformat_name(snd_pcm_subformat_t subformat) - * \param subformat PCM sample subformat - * \return ascii description of PCM sample subformat - */ --const char *snd_pcm_subformat_description(snd_pcm_subformat_t subformat) -+const char *snd_pcm_subformat_description(const snd_pcm_subformat_t subformat) - { - if (subformat > SND_PCM_SUBFORMAT_LAST) - return NULL; -@@ -2128,7 +2128,7 @@ link_warning(snd_pcm_xrun_mode_name, "Warning: xrun_mode is deprecated, consider - * \param mode PCM tstamp mode - * \return ascii name of PCM tstamp mode setting - */ --const char *snd_pcm_tstamp_mode_name(snd_pcm_tstamp_t mode) -+const char *snd_pcm_tstamp_mode_name(const snd_pcm_tstamp_t mode) - { - if (mode > SND_PCM_TSTAMP_LAST) - return NULL; -@@ -2152,7 +2152,7 @@ const char *snd_pcm_tstamp_type_name(snd_pcm_tstamp_type_t type) - * \param state PCM state - * \return ascii name of PCM state - */ --const char *snd_pcm_state_name(snd_pcm_state_t state) -+const char *snd_pcm_state_name(const snd_pcm_state_t state) - { - if (state > SND_PCM_STATE_LAST) - return NULL; --- -2.20.1 -diff --git a/pkg/alsa-lib/patch/0006-Remove-unused-empty-struct.patch b/pkg/alsa-lib/patch/0005-Remove-unused-empty-struct.patchdiff --git a/pkg/alsa-lib/patch/0007-Avoid-pointer-arithmetic-on-void.patch b/pkg/alsa-lib/patch/0006-Avoid-pointer-arithmetic-on-void.patchdiff --git a/pkg/alsa-lib/patch/0008-Use-define-for-constants-that-can-t-be-represented-a.patch b/pkg/alsa-lib/patch/0007-Use-define-for-constants-that-can-t-be-represented-a.patchdiff --git a/pkg/alsa-lib/patch/0010-Prevent-empty-top-level-declarations.patch b/pkg/alsa-lib/patch/0008-Prevent-empty-top-level-declarations.patchdiff --git a/pkg/alsa-lib/patch/0011-Don-t-use-inline-asm-on-non-GNU-compilers.patch b/pkg/alsa-lib/patch/0009-Don-t-use-inline-asm-on-non-GNU-compilers.patchdiff --git a/pkg/alsa-lib/patch/0009-Remove-forward-declarations-of-vfscanf-and-vsscanf.patch b/pkg/alsa-lib/patch/0009-Remove-forward-declarations-of-vfscanf-and-vsscanf.patch@@ -1,34 +0,0 @@ -From 6afffaf09b33fdec905dcb6405c32289dcae923f Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Wed, 3 Jul 2019 18:10:27 -0700 -Subject: [PATCH] Remove forward declarations of vfscanf and vsscanf - -These will be declared in stdio.h, possibly with different parameter -qualifiers, like `restrict`. ---- - src/input.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/input.c b/src/input.c -index 35324f1f..6ae75bb8 100644 ---- a/src/input.c -+++ b/src/input.c -@@ -135,7 +135,6 @@ static int snd_input_stdio_close(snd_input_t *input ATTRIBUTE_UNUSED) - static int snd_input_stdio_scan(snd_input_t *input, const char *format, va_list args) - { - snd_input_stdio_t *stdio = input->private_data; -- extern int vfscanf(FILE *, const char *, va_list); - return vfscanf(stdio->fp, format, args); - } - -@@ -239,7 +238,6 @@ static int snd_input_buffer_close(snd_input_t *input) - static int snd_input_buffer_scan(snd_input_t *input, const char *format, va_list args) - { - snd_input_buffer_t *buffer = input->private_data; -- extern int vsscanf(const char *, const char *, va_list); - /* FIXME: how can I obtain consumed chars count? */ - assert(0); - return vsscanf((char *)buffer->ptr, format, args); --- -2.22.0 -diff --git a/pkg/alsa-lib/patch/0012-Use-switch-statements-instead-of-labels-as-values.patch b/pkg/alsa-lib/patch/0010-Use-switch-statements-instead-of-labels-as-values.patchdiff --git a/pkg/alsa-lib/ver b/pkg/alsa-lib/ver@@ -1 +1 @@ -1.1.9 r3 +1.1.9 r4