oasis

commit: 928717b9d8aaa14be6c4a1a543b9d418f5d4d1cb
parent 5f8507f279f8da4c85639c6bb2c0dadaa1b89c50
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 20 Feb 2020 15:58:14 -0800

alsa-lib: Update to 1.2.2

Diffstat:
M
pkg/alsa-lib/alsa/version.h
4
++--
M
pkg/alsa-lib/config.h
6
+++---
M
pkg/alsa-lib/patch/0002-Prevent-empty-top-level-declarations.patch
28
++++++++++++++--------------
M
pkg/alsa-lib/ver
2
+-

4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/pkg/alsa-lib/alsa/version.h b/pkg/alsa-lib/alsa/version.h
@@ -4,12 +4,12 @@
 
 #define SND_LIB_MAJOR		1 /**< major 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_SUBMINOR	2 /**< 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.2.1"
+#define SND_LIB_VERSION_STR	"1.2.2"
 
diff --git 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.2.1"
+#define PACKAGE_STRING "alsa-lib 1.2.2"
 #define PACKAGE_TARNAME "alsa-lib"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.2.1"
+#define PACKAGE_VERSION "1.2.2"
 #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.2.1"
+#define VERSION "1.2.2"
 #define VERSIONED_SYMBOLS /**/
 /* #undef _MINIX */
 /* #undef _POSIX_1_SOURCE */
diff --git a/pkg/alsa-lib/patch/0002-Prevent-empty-top-level-declarations.patch b/pkg/alsa-lib/patch/0002-Prevent-empty-top-level-declarations.patch
@@ -1,4 +1,4 @@
-From 7960b0c2489d4e8de398a52bb4d0f7bfc6142eb6 Mon Sep 17 00:00:00 2001
+From c8474cfa6b657af057b861d756741cb003547b69 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 ffdbdd1a..3beeb58c 100644
+index 50d04034..91f66fb7 100644
 --- a/src/conf.c
 +++ b/src/conf.c
-@@ -3868,7 +3868,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
+@@ -3915,7 +3915,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 ffdbdd1a..3beeb58c 100644
  #endif
  
  #ifndef DOC_HIDDEN
-@@ -3936,7 +3936,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
+@@ -3983,7 +3983,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
  	return 0;
  }
  #ifndef DOC_HIDDEN
@@ -253,10 +253,10 @@ index eb8218c1..b6e0753b 100644
  
  #ifndef DOC_HIDDEN
 diff --git a/src/control/control.c b/src/control/control.c
-index 33650155..d136c2f1 100644
+index 27f42135..12f1eff2 100644
 --- a/src/control/control.c
 +++ b/src/control/control.c
-@@ -2370,7 +2370,7 @@ int snd_ctl_elem_info_is_indirect(const snd_ctl_elem_info_t *obj)
+@@ -2374,7 +2374,7 @@ int snd_ctl_elem_info_is_indirect(const snd_ctl_elem_info_t *obj)
  	assert(obj);
  	return 0;
  }
@@ -265,18 +265,18 @@ index 33650155..d136c2f1 100644
  
  /**
   * \brief Get owner of a locked element
-@@ -2523,7 +2523,7 @@ int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj)
- 			break;
- 	return i + 1;
+@@ -2531,7 +2531,7 @@ int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj)
+ 	return -EINVAL;
+ #endif
  }
 -use_default_symbol_version(__snd_ctl_elem_info_get_dimensions, snd_ctl_elem_info_get_dimensions, ALSA_0.9.3);
 +use_default_symbol_version(__snd_ctl_elem_info_get_dimensions, snd_ctl_elem_info_get_dimensions, ALSA_0.9.3)
  
  /**
   * \brief Get specified of dimension width for given element
-@@ -2545,7 +2545,7 @@ int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int
- 		return 0;
- 	return obj->dimen.d[idx];
+@@ -2557,7 +2557,7 @@ int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int
+ 	return -EINVAL;
+ #endif /* deprecated */
  }
 -use_default_symbol_version(__snd_ctl_elem_info_get_dimension, snd_ctl_elem_info_get_dimension, ALSA_0.9.3);
 +use_default_symbol_version(__snd_ctl_elem_info_get_dimension, snd_ctl_elem_info_get_dimension, ALSA_0.9.3)
@@ -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 da7f087b..02d940a2 100644
+index a02b2dc0..6940a1e4 100644
 --- a/src/pcm/pcm_file.c
 +++ b/src/pcm/pcm_file.c
-@@ -1128,5 +1128,5 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
+@@ -1126,5 +1126,5 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
  	return err;
  }
  #ifndef DOC_HIDDEN
diff --git a/pkg/alsa-lib/ver b/pkg/alsa-lib/ver
@@ -1 +1 @@
-1.2.1 r2
+1.2.2 r0