alsa-lib: Update to 1.2.1

13 files changed, 41 insertions, 323 deletions

diff --git a/pkg/alsa-lib/alsa/version.h b/pkg/alsa-lib/alsa/version.h
index 8eb85575..38900145 100644
--- a/pkg/alsa-lib/alsa/version.h
+++ b/pkg/alsa-lib/alsa/version.h
@@ -3,13 +3,13 @@
  */
 
 #define SND_LIB_MAJOR		1 /**< major number of library version */
-#define SND_LIB_MINOR		1 /**< minor number of library version */
-#define SND_LIB_SUBMINOR	9 /**< subminor number of library version */
+#define SND_LIB_MINOR		2 /**< minor number of library version */
+#define SND_LIB_SUBMINOR	1 /**< subminor number of library version */
 #define SND_LIB_EXTRAVER	1000000 /**< extra version number, used mainly for betas */
 /** library version */
 #define SND_LIB_VERSION		((SND_LIB_MAJOR<<16)|\
 				 (SND_LIB_MINOR<<8)|\
 				  SND_LIB_SUBMINOR)
 /** library version (string) */
-#define SND_LIB_VERSION_STR	"1.1.9"
+#define SND_LIB_VERSION_STR	"1.2.1"
 
diff --git a/pkg/alsa-lib/config.h b/pkg/alsa-lib/config.h
index bf340d4d..3e6b005c 100644
--- a/pkg/alsa-lib/config.h
+++ b/pkg/alsa-lib/config.h
@@ -49,10 +49,10 @@
 #define PACKAGE "alsa-lib"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME "alsa-lib"
-#define PACKAGE_STRING "alsa-lib 1.1.9"
+#define PACKAGE_STRING "alsa-lib 1.2.1"
 #define PACKAGE_TARNAME "alsa-lib"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.1.9"
+#define PACKAGE_VERSION "1.2.1"
 #define SND_MAX_CARDS 32
 #define STDC_HEADERS 1
 #define SUPPORT_ALOAD "1"
@@ -75,7 +75,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "1.1.9"
+#define VERSION "1.2.1"
 #define VERSIONED_SYMBOLS /**/
 /* #undef _MINIX */
 /* #undef _POSIX_1_SOURCE */
diff --git a/pkg/alsa-lib/patch/0002-Use-__func__-instead-of-__FUNCTION__.patch b/pkg/alsa-lib/patch/0002-Use-__func__-instead-of-__FUNCTION__.patch
deleted file mode 100644
index ff04d0de..00000000
--- a/pkg/alsa-lib/patch/0002-Use-__func__-instead-of-__FUNCTION__.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 9ae6cc2bfcbac45b193c76e735033114e98c3689 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Thu, 9 May 2019 13:02:45 -0700
-Subject: [PATCH] Use __func__ instead of __FUNCTION__
-
-They are equivalent, but __func__ is in C99. __FUNCTION__ exists only
-for backwards compatibility with old gcc versions.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- aserver/aserver.c   | 4 ++--
- include/error.h     | 8 ++++----
- include/local.h     | 4 ++--
- src/pcm/pcm_share.c | 4 ++--
- 4 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/aserver/aserver.c b/aserver/aserver.c
-index 066414d8..3c5ed9a4 100644
---- a/aserver/aserver.c
-+++ b/aserver/aserver.c
-@@ -39,13 +39,13 @@ char *command;
- 
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
- #define ERROR(...) do {\
--	fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __FUNCTION__); \
-+	fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __func__); \
- 	fprintf(stderr, __VA_ARGS__); \
- 	putc('\n', stderr); \
- } while (0)
- #else
- #define ERROR(args...) do {\
--	fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __FUNCTION__); \
-+	fprintf(stderr, "%s %s:%i:(%s) ", command, __FILE__, __LINE__, __func__); \
- 	fprintf(stderr, ##args); \
- 	putc('\n', stderr); \
- } while (0)
-diff --git a/include/error.h b/include/error.h
-index 9a996aba..7239db85 100644
---- a/include/error.h
-+++ b/include/error.h
-@@ -61,11 +61,11 @@ extern snd_lib_error_handler_t snd_lib_error;
- extern int snd_lib_error_set_handler(snd_lib_error_handler_t handler);
- 
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 95)
--#define SNDERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, __VA_ARGS__) /**< Shows a sound error message. */
--#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, __VA_ARGS__) /**< Shows a system error message (related to \c errno). */
-+#define SNDERR(...) snd_lib_error(__FILE__, __LINE__, __func__, 0, __VA_ARGS__) /**< Shows a sound error message. */
-+#define SYSERR(...) snd_lib_error(__FILE__, __LINE__, __func__, errno, __VA_ARGS__) /**< Shows a system error message (related to \c errno). */
- #else
--#define SNDERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, 0, ##args) /**< Shows a sound error message. */
--#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __FUNCTION__, errno, ##args) /**< Shows a system error message (related to \c errno). */
-+#define SNDERR(args...) snd_lib_error(__FILE__, __LINE__, __func__, 0, ##args) /**< Shows a sound error message. */
-+#define SYSERR(args...) snd_lib_error(__FILE__, __LINE__, __func__, errno, ##args) /**< Shows a system error message (related to \c errno). */
- #endif
- 
- /** \} */
-diff --git a/include/local.h b/include/local.h
-index 5edad317..ce142d04 100644
---- a/include/local.h
-+++ b/include/local.h
-@@ -244,8 +244,8 @@ size_t snd_strlcpy(char *dst, const char *src, size_t size);
- #ifndef NDEBUG
- #define CHECK_SANITY(x) x
- extern snd_lib_error_handler_t snd_err_msg;
--#define SNDMSG(args...) snd_err_msg(__FILE__, __LINE__, __FUNCTION__, 0, ##args)
--#define SYSMSG(args...) snd_err_msg(__FILE__, __LINE__, __FUNCTION__, errno, ##args)
-+#define SNDMSG(args...) snd_err_msg(__FILE__, __LINE__, __func__, 0, ##args)
-+#define SYSMSG(args...) snd_err_msg(__FILE__, __LINE__, __func__, errno, ##args)
- #else
- #define CHECK_SANITY(x) 0 /* not evaluated */
- #define SNDMSG(args...) /* nop */
-diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c
-index 5a540c4f..bff9507d 100644
---- a/src/pcm/pcm_share.c
-+++ b/src/pcm/pcm_share.c
-@@ -54,11 +54,11 @@ char *snd_pcm_share_slaves_mutex_holder;
- do { \
- 	int err = pthread_mutex_trylock(mutex); \
- 	if (err < 0) { \
--		fprintf(stderr, "lock " #mutex " is busy (%s): waiting in " __FUNCTION__ "\n", *(mutex##_holder)); \
-+		fprintf(stderr, "lock " #mutex " is busy (%s): waiting in " __func__ "\n", *(mutex##_holder)); \
- 		pthread_mutex_lock(mutex); \
- 		fprintf(stderr, "... got\n"); \
- 	} \
--	*(mutex##_holder) = __FUNCTION__; \
-+	*(mutex##_holder) = __func__; \
- } while (0)
- 
- #define Pthread_mutex_unlock(mutex) \
--- 
-2.20.1
-
diff --git a/pkg/alsa-lib/patch/0007-Use-define-for-constants-that-can-t-be-represented-a.patch b/pkg/alsa-lib/patch/0002-Use-define-for-constants-that-can-t-be-represented-a.patch
index b1ed85fb..b1ed85fb 100644
--- a/pkg/alsa-lib/patch/0007-Use-define-for-constants-that-can-t-be-represented-a.patch
+++ b/pkg/alsa-lib/patch/0002-Use-define-for-constants-that-can-t-be-represented-a.patch
diff --git a/pkg/alsa-lib/patch/0003-List-cases-in-range-explicitly.patch b/pkg/alsa-lib/patch/0003-List-cases-in-range-explicitly.patch
deleted file mode 100644
index 80de338e..00000000
--- a/pkg/alsa-lib/patch/0003-List-cases-in-range-explicitly.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 43baecc2cc7e48aebd65170400b471b96ff9f99d Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 31 May 2019 01:12:51 -0700
-Subject: [PATCH] List cases in range explicitly
-
-Case ranges are a GNU extension, and provide only a slight readability
-improvement.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- src/conf.c | 22 ++++++++++++----------
- 1 file changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/src/conf.c b/src/conf.c
-index cda5518e..3892b576 100644
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -888,7 +888,8 @@ static int get_quotedchar(input_t *input)
- 		return '\r';
- 	case 'f':
- 		return '\f';
--	case '0' ... '7':
-+	case '0': case '1': case '2': case '3':
-+	case '4': case '5': case '6': case '7':
- 	{
- 		int num = c - '0';
- 		int i = 1;
-@@ -1479,7 +1480,8 @@ static void string_print(char *str, int id, snd_output_t *out)
- 	}
- 	if (!id) {
- 		switch (*p) {
--		case '0' ... '9':
-+		case '0': case '1': case '2': case '3': case '4':
-+		case '5': case '6': case '7': case '8': case '9':
- 		case '-':
- 			goto quoted;
- 		}
-@@ -1488,8 +1490,6 @@ static void string_print(char *str, int id, snd_output_t *out)
- 	switch (*p) {
- 	case 0:
- 		goto nonquoted;
--	case 1 ... 31:
--	case 127 ... 255:
- 	case ' ':
- 	case '=':
- 	case ';':
-@@ -1501,6 +1501,8 @@ static void string_print(char *str, int id, snd_output_t *out)
- 	case '"':
- 		goto quoted;
- 	default:
-+		if (*p <= 31 || *p >= 127)
-+			goto quoted;
- 		p++;
- 		goto loop;
- 	}
-@@ -1542,12 +1544,11 @@ static void string_print(char *str, int id, snd_output_t *out)
- 			snd_output_putc(out, '\\');
- 			snd_output_putc(out, c);
- 			break;
--		case 32 ... '\'' - 1:
--		case '\'' + 1 ... 126:
--			snd_output_putc(out, c);
--			break;
- 		default:
--			snd_output_printf(out, "\\%04o", c);
-+			if (c >= 32 && c <= 126 && c != '\'')
-+				snd_output_putc(out, c);
-+			else
-+				snd_output_printf(out, "\\%04o", c);
- 			break;
- 		}
- 		p++;
-@@ -4683,7 +4684,8 @@ static int parse_char(const char **ptr)
- 	case 'f':
- 		c = '\f';
- 		break;
--	case '0' ... '7':
-+	case '0': case '1': case '2': case '3':
-+	case '4': case '5': case '6': case '7':
- 	{
- 		int num = c - '0';
- 		int i = 1;
--- 
-2.20.1
-
diff --git a/pkg/alsa-lib/patch/0008-Prevent-empty-top-level-declarations.patch b/pkg/alsa-lib/patch/0003-Prevent-empty-top-level-declarations.patch
index 856cbea3..83407f5b 100644
--- a/pkg/alsa-lib/patch/0008-Prevent-empty-top-level-declarations.patch
+++ b/pkg/alsa-lib/patch/0003-Prevent-empty-top-level-declarations.patch
@@ -1,4 +1,4 @@
-From 5f171536a3844f1b4c42dc5f34e104e5d23d56ed Mon Sep 17 00:00:00 2001
+From 9f5659f63cc20ee045c7f1ff9c4422a2277ecebe Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Wed, 3 Jul 2019 18:15:11 -0700
 Subject: [PATCH] Prevent empty top-level declarations
@@ -83,10 +83,10 @@ index bba9a9d4..26fde696 100644
  #endif
  
 diff --git a/src/conf.c b/src/conf.c
-index 3892b576..3032b071 100644
+index 558114ad..d6b8097e 100644
 --- a/src/conf.c
 +++ b/src/conf.c
-@@ -3791,7 +3791,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
+@@ -3786,7 +3786,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
  	return err;
  }
  #ifndef DOC_HIDDEN
@@ -95,7 +95,7 @@ index 3892b576..3032b071 100644
  #endif
  
  #ifndef DOC_HIDDEN
-@@ -3859,7 +3859,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
+@@ -3854,7 +3854,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
  	return 0;
  }
  #ifndef DOC_HIDDEN
@@ -294,17 +294,17 @@ index b54d65f2..cd04fdd5 100644
 -SND_DLSYM_BUILD_VERSION(_snd_ctl_hw_open, SND_CONTROL_DLSYM_VERSION);
 +SND_DLSYM_BUILD_VERSION(_snd_ctl_hw_open, SND_CONTROL_DLSYM_VERSION)
 diff --git a/src/control/control_shm.c b/src/control/control_shm.c
-index d7b41398..cdc5d3a6 100644
+index 40d42643..f59c33f5 100644
 --- a/src/control/control_shm.c
 +++ b/src/control/control_shm.c
-@@ -628,4 +628,4 @@ int _snd_ctl_shm_open(snd_ctl_t **handlep, char *name, snd_config_t *root, snd_c
+@@ -618,4 +618,4 @@ int _snd_ctl_shm_open(snd_ctl_t **handlep, char *name, snd_config_t *root, snd_c
  	snd_config_delete(sconfig);
  	return err;
  }
 -SND_DLSYM_BUILD_VERSION(_snd_ctl_shm_open, SND_CONTROL_DLSYM_VERSION);
 +SND_DLSYM_BUILD_VERSION(_snd_ctl_shm_open, SND_CONTROL_DLSYM_VERSION)
 diff --git a/src/dlmisc.c b/src/dlmisc.c
-index 012e61bc..ce2f8352 100644
+index 8c8f3ff7..74ac16be 100644
 --- a/src/dlmisc.c
 +++ b/src/dlmisc.c
 @@ -116,8 +116,8 @@ void *INTERNAL(snd_dlopen_old)(const char *name, int mode)
@@ -348,11 +348,11 @@ index d909a11d..890d2a34 100644
 -link_warning(snd_names_list_free, "Warning: snd_names_list_free is deprecated, use snd_device_name_free_hint");
 +link_warning(snd_names_list_free, "Warning: snd_names_list_free is deprecated, use snd_device_name_free_hint")
 diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index c58f5933..e3cf4a10 100644
+index 1064044c..557e51fb 100644
 --- a/src/pcm/pcm.c
 +++ b/src/pcm/pcm.c
-@@ -1443,7 +1443,7 @@ snd_pcm_sframes_t snd_pcm_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
- 	snd_pcm_unlock(pcm);
+@@ -1508,7 +1508,7 @@ snd_pcm_sframes_t snd_pcm_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
+ 	snd_pcm_unlock(pcm->fast_op_arg);
  	return result;
  }
 -use_default_symbol_version(__snd_pcm_forward, snd_pcm_forward, ALSA_0.9.0rc8);
@@ -360,7 +360,7 @@ index c58f5933..e3cf4a10 100644
  
  /**
   * \brief Write interleaved frames to a PCM
-@@ -2104,7 +2104,7 @@ const char *snd_pcm_start_mode_name(snd_pcm_start_t mode)
+@@ -2177,7 +2177,7 @@ const char *snd_pcm_start_mode_name(snd_pcm_start_t mode)
  }
  
  #ifndef DOC_HIDDEN
@@ -369,7 +369,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  /**
-@@ -2120,7 +2120,7 @@ const char *snd_pcm_xrun_mode_name(snd_pcm_xrun_t mode)
+@@ -2193,7 +2193,7 @@ const char *snd_pcm_xrun_mode_name(snd_pcm_xrun_t mode)
  }
  
  #ifndef DOC_HIDDEN
@@ -378,7 +378,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  /**
-@@ -2174,7 +2174,7 @@ const char *snd_pcm_type_name(snd_pcm_type_t type)
+@@ -2247,7 +2247,7 @@ const char *snd_pcm_type_name(snd_pcm_type_t type)
  		return NULL;
  	return snd_pcm_type_names[type];
  }
@@ -387,7 +387,7 @@ index c58f5933..e3cf4a10 100644
  
  /**
   * \brief Dump current hardware setup for PCM
-@@ -6192,7 +6192,7 @@ int snd_pcm_sw_params_set_start_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params
+@@ -6270,7 +6270,7 @@ int snd_pcm_sw_params_set_start_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params
  }
  
  #ifndef DOC_HIDDEN
@@ -396,7 +396,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  /**
-@@ -6208,7 +6208,7 @@ snd_pcm_start_t snd_pcm_sw_params_get_start_mode(const snd_pcm_sw_params_t *para
+@@ -6286,7 +6286,7 @@ snd_pcm_start_t snd_pcm_sw_params_get_start_mode(const snd_pcm_sw_params_t *para
  }
  
  #ifndef DOC_HIDDEN
@@ -405,7 +405,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  /**
-@@ -6240,7 +6240,7 @@ int snd_pcm_sw_params_set_xrun_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
+@@ -6318,7 +6318,7 @@ int snd_pcm_sw_params_set_xrun_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params,
  }
  
  #ifndef DOC_HIDDEN
@@ -414,7 +414,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  /**
-@@ -6256,7 +6256,7 @@ snd_pcm_xrun_t snd_pcm_sw_params_get_xrun_mode(const snd_pcm_sw_params_t *params
+@@ -6334,7 +6334,7 @@ snd_pcm_xrun_t snd_pcm_sw_params_get_xrun_mode(const snd_pcm_sw_params_t *params
  }
  
  #ifndef DOC_HIDDEN
@@ -423,7 +423,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  /**
-@@ -6749,7 +6749,7 @@ void snd_pcm_status_get_trigger_htstamp(const snd_pcm_status_t *obj, snd_htimest
+@@ -6827,7 +6827,7 @@ void snd_pcm_status_get_trigger_htstamp(const snd_pcm_status_t *obj, snd_htimest
  	assert(obj && ptr);
  	*ptr = obj->trigger_tstamp;
  }
@@ -432,7 +432,7 @@ index c58f5933..e3cf4a10 100644
  
  /** 
   * \brief Get "now" timestamp from a PCM status container
-@@ -6777,7 +6777,7 @@ void snd_pcm_status_get_htstamp(const snd_pcm_status_t *obj, snd_htimestamp_t *p
+@@ -6855,7 +6855,7 @@ void snd_pcm_status_get_htstamp(const snd_pcm_status_t *obj, snd_htimestamp_t *p
  	assert(obj && ptr);
  	*ptr = obj->tstamp;
  }
@@ -441,7 +441,7 @@ index c58f5933..e3cf4a10 100644
  
  /** 
   * \brief Get "now" hi-res audio timestamp from a PCM status container
-@@ -7451,8 +7451,8 @@ snd_pcm_uframes_t _snd_pcm_boundary(snd_pcm_t *pcm)
+@@ -7538,8 +7538,8 @@ snd_pcm_uframes_t _snd_pcm_boundary(snd_pcm_t *pcm)
  }
  
  #ifndef DOC_HIDDEN
@@ -452,7 +452,7 @@ index c58f5933..e3cf4a10 100644
  #endif
  
  static const char *const names[SND_PCM_HW_PARAM_LAST_INTERVAL + 1] = {
-@@ -7717,13 +7717,13 @@ void snd_pcm_unlink_appl_ptr(snd_pcm_t *pcm, snd_pcm_t *slave)
+@@ -7804,13 +7804,13 @@ void snd_pcm_unlink_appl_ptr(snd_pcm_t *pcm, snd_pcm_t *slave)
  #ifdef USE_VERSIONED_SYMBOLS
  
  #define OBSOLETE1(name, what, new) \
@@ -514,10 +514,10 @@ index 4c099acd..f7769f22 100644
 +SND_DLSYM_BUILD_VERSION(_snd_pcm_copy_open, SND_PCM_DLSYM_VERSION)
  #endif
 diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
-index c5592cdb..a8a9617a 100644
+index d533f40c..b29e295d 100644
 --- a/src/pcm/pcm_dmix.c
 +++ b/src/pcm/pcm_dmix.c
-@@ -1447,5 +1447,5 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
+@@ -1428,5 +1428,5 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
  	return err;
  }
  #ifndef DOC_HIDDEN
@@ -525,10 +525,10 @@ index c5592cdb..a8a9617a 100644
 +SND_DLSYM_BUILD_VERSION(_snd_pcm_dmix_open, SND_PCM_DLSYM_VERSION)
  #endif
 diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
-index f135b5df..fa9cd1ba 100644
+index 59448cfb..3f804c02 100644
 --- a/src/pcm/pcm_dshare.c
 +++ b/src/pcm/pcm_dshare.c
-@@ -1007,5 +1007,5 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
+@@ -1045,5 +1045,5 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
  	return err;
  }
  #ifndef DOC_HIDDEN
@@ -536,10 +536,10 @@ index f135b5df..fa9cd1ba 100644
 +SND_DLSYM_BUILD_VERSION(_snd_pcm_dshare_open, SND_PCM_DLSYM_VERSION)
  #endif
 diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
-index d08b6241..19ae06e0 100644
+index 24f472c7..a8720bfd 100644
 --- a/src/pcm/pcm_dsnoop.c
 +++ b/src/pcm/pcm_dsnoop.c
-@@ -866,5 +866,5 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
+@@ -894,5 +894,5 @@ int _snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
  	return err;
  }
  #ifndef DOC_HIDDEN
@@ -558,10 +558,10 @@ index 869577b6..11dcb37e 100644
 +SND_DLSYM_BUILD_VERSION(_snd_pcm_empty_open, SND_PCM_DLSYM_VERSION)
  #endif
 diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c
-index 3a19cef9..0f470cdc 100644
+index da7f087b..02d940a2 100644
 --- a/src/pcm/pcm_file.c
 +++ b/src/pcm/pcm_file.c
-@@ -996,5 +996,5 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
+@@ -1128,5 +1128,5 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
  	return err;
  }
  #ifndef DOC_HIDDEN
@@ -589,10 +589,10 @@ index 4416d363..ed88dd29 100644
 +SND_DLSYM_BUILD_VERSION(_snd_pcm_hook_ctl_elems_install, SND_PCM_DLSYM_VERSION)
  #endif
 diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
-index 4f104e5e..0f433617 100644
+index 2028790e..23a3d05b 100644
 --- a/src/pcm/pcm_hw.c
 +++ b/src/pcm/pcm_hw.c
-@@ -1943,7 +1943,7 @@ fail:
+@@ -1946,7 +1946,7 @@ fail:
  }
  
  #ifndef DOC_HIDDEN
@@ -771,10 +771,10 @@ index f08208f8..3ea835b8 100644
 +SND_DLSYM_BUILD_VERSION(_snd_pcm_softvol_open, SND_PCM_DLSYM_VERSION)
  #endif
 diff --git a/src/rawmidi/rawmidi_hw.c b/src/rawmidi/rawmidi_hw.c
-index 7cc8c0d1..00236657 100644
+index eaa8a76d..8c85d03f 100644
 --- a/src/rawmidi/rawmidi_hw.c
 +++ b/src/rawmidi/rawmidi_hw.c
-@@ -358,4 +358,4 @@ int _snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp,
+@@ -360,4 +360,4 @@ int _snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp,
  		return -EINVAL;
  	return snd_rawmidi_hw_open(inputp, outputp, name, card, device, subdevice, mode);
  }
@@ -900,5 +900,5 @@ index dad228c8..7fc7cf4d 100644
 -SND_DLSYM_BUILD_VERSION(_snd_timer_query_hw_open, SND_TIMER_QUERY_DLSYM_VERSION);
 +SND_DLSYM_BUILD_VERSION(_snd_timer_query_hw_open, SND_TIMER_QUERY_DLSYM_VERSION)
 -- 
-2.22.0
+2.24.0
 
diff --git a/pkg/alsa-lib/patch/0004-Don-t-return-in-a-void-function.patch b/pkg/alsa-lib/patch/0004-Don-t-return-in-a-void-function.patch
deleted file mode 100644
index 51bb56bd..00000000
--- a/pkg/alsa-lib/patch/0004-Don-t-return-in-a-void-function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0188839f21a474e7a7ffcf9bddac7d6a0dd140e8 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 31 May 2019 01:15:05 -0700
-Subject: [PATCH] Don't return in a void function
-
-A return statement with an expression in a function returning void is
-a constraint violation.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- src/pcm/pcm_hw.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c
-index 91370a88..4f104e5e 100644
---- a/src/pcm/pcm_hw.c
-+++ b/src/pcm/pcm_hw.c
-@@ -1171,7 +1171,7 @@ static void __fill_chmap_ctl_id(snd_ctl_elem_id_t *id, int dev, int subdev,
- static void fill_chmap_ctl_id(snd_pcm_t *pcm, snd_ctl_elem_id_t *id)
- {
- 	snd_pcm_hw_t *hw = pcm->private_data;
--	return __fill_chmap_ctl_id(id, hw->device, hw->subdevice, pcm->stream);
-+	__fill_chmap_ctl_id(id, hw->device, hw->subdevice, pcm->stream);
- }
- 
- static int is_chmap_type(int type)
--- 
-2.20.1
-
diff --git a/pkg/alsa-lib/patch/0009-Don-t-use-inline-asm-on-non-GNU-compilers.patch b/pkg/alsa-lib/patch/0004-Don-t-use-inline-asm-on-non-GNU-compilers.patch
index abd575b5..abd575b5 100644
--- a/pkg/alsa-lib/patch/0009-Don-t-use-inline-asm-on-non-GNU-compilers.patch
+++ b/pkg/alsa-lib/patch/0004-Don-t-use-inline-asm-on-non-GNU-compilers.patch
diff --git a/pkg/alsa-lib/patch/0005-Remove-unused-empty-struct.patch b/pkg/alsa-lib/patch/0005-Remove-unused-empty-struct.patch
deleted file mode 100644
index a9b63578..00000000
--- a/pkg/alsa-lib/patch/0005-Remove-unused-empty-struct.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b2c26e9b2ef3899b640fa5a70124b0a0ce42f011 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 31 May 2019 17:48:37 -0700
-Subject: [PATCH] Remove unused empty struct
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- src/pcm/pcm_direct.h | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
-index da5e280e..6e66b47d 100644
---- a/src/pcm/pcm_direct.h
-+++ b/src/pcm/pcm_direct.h
-@@ -181,8 +181,6 @@ struct snd_pcm_direct {
- 			mix_areas_24_t *remix_areas_24;
- 			mix_areas_u8_t *remix_areas_u8;
- 		} dmix;
--		struct {
--		} dsnoop;
- 		struct {
- 			unsigned long long chn_mask;
- 		} dshare;
--- 
-2.20.1
-
diff --git a/pkg/alsa-lib/patch/0010-Use-switch-statements-instead-of-labels-as-values.patch b/pkg/alsa-lib/patch/0005-Use-switch-statements-instead-of-labels-as-values.patch
index 46258b0b..46258b0b 100644
--- a/pkg/alsa-lib/patch/0010-Use-switch-statements-instead-of-labels-as-values.patch
+++ b/pkg/alsa-lib/patch/0005-Use-switch-statements-instead-of-labels-as-values.patch
diff --git a/pkg/alsa-lib/patch/0006-Avoid-pointer-arithmetic-on-void.patch b/pkg/alsa-lib/patch/0006-Avoid-pointer-arithmetic-on-void.patch
deleted file mode 100644
index 223ff347..00000000
--- a/pkg/alsa-lib/patch/0006-Avoid-pointer-arithmetic-on-void.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e2b979b53e605b91b8e7612e4aae8e023402c86d Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 4 Jun 2019 18:59:28 -0700
-Subject: [PATCH] Avoid pointer arithmetic on `void *`
-
-The pointer operand to the binary `+` operator must be to a complete
-object type.
-
-Signed-off-by: Michael Forney <mforney@mforney.org>
----
- src/pcm/pcm_rate.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
-index 5dc8a927..fdcaa8de 100644
---- a/src/pcm/pcm_rate.c
-+++ b/src/pcm/pcm_rate.c
-@@ -300,10 +300,10 @@ static int snd_pcm_rate_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params)
- 	rate->sareas = rate->pareas + channels;
- 	rate->sareas[0].addr = (char *)rate->pareas[0].addr + ((cwidth * channels * cinfo->period_size) / 8);
- 	for (chn = 0; chn < channels; chn++) {
--		rate->pareas[chn].addr = rate->pareas[0].addr + (cwidth * chn * cinfo->period_size) / 8;
-+		rate->pareas[chn].addr = (char *)rate->pareas[0].addr + (cwidth * chn * cinfo->period_size) / 8;
- 		rate->pareas[chn].first = 0;
- 		rate->pareas[chn].step = cwidth;
--		rate->sareas[chn].addr = rate->sareas[0].addr + (swidth * chn * sinfo->period_size) / 8;
-+		rate->sareas[chn].addr = (char *)rate->sareas[0].addr + (swidth * chn * sinfo->period_size) / 8;
- 		rate->sareas[chn].first = 0;
- 		rate->sareas[chn].step = swidth;
- 	}
-@@ -513,14 +513,14 @@ static void do_convert(const snd_pcm_channel_area_t *dst_areas,
- 		const int16_t *src;
- 		int16_t *dst;
- 		if (! rate->src_buf)
--			src = src_areas->addr + src_offset * 2 * channels;
-+			src = (int16_t *)src_areas->addr + src_offset * channels;
- 		else {
- 			convert_to_s16(rate, rate->src_buf, src_areas, src_offset,
- 				       src_frames, channels);
- 			src = rate->src_buf;
- 		}
- 		if (! rate->dst_buf)
--			dst = dst_areas->addr + dst_offset * 2 * channels;
-+			dst = (int16_t *)dst_areas->addr + dst_offset * channels;
- 		else
- 			dst = rate->dst_buf;
- 		rate->ops.convert_s16(rate->obj, dst, dst_frames, src, src_frames);
--- 
-2.20.1
-
diff --git a/pkg/alsa-lib/src b/pkg/alsa-lib/src
-Subproject 9122992a91334cd188203deba54cc077a91cd47
+Subproject a76928dabe199d964b2420dba5bed261139e69e
diff --git a/pkg/alsa-lib/ver b/pkg/alsa-lib/ver
index d2223130..97fe035b 100644
--- a/pkg/alsa-lib/ver
+++ b/pkg/alsa-lib/ver
@@ -1 +1 @@
-1.1.9 r4
+1.2.1 r0