alsa-lib: Remove unneeded patch

cproc now supports enumerators with value > INT_MAX.

5 files changed, 6 insertions, 37 deletions

diff --git a/pkg/alsa-lib/patch/0003-Prevent-empty-top-level-declarations.patch b/pkg/alsa-lib/patch/0002-Prevent-empty-top-level-declarations.patch
index 83407f5b..3162e681 100644
--- a/pkg/alsa-lib/patch/0003-Prevent-empty-top-level-declarations.patch
+++ b/pkg/alsa-lib/patch/0002-Prevent-empty-top-level-declarations.patch
@@ -1,4 +1,4 @@
-From 9f5659f63cc20ee045c7f1ff9c4422a2277ecebe Mon Sep 17 00:00:00 2001
+From 7960b0c2489d4e8de398a52bb4d0f7bfc6142eb6 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 558114ad..d6b8097e 100644
+index ffdbdd1a..3beeb58c 100644
 --- a/src/conf.c
 +++ b/src/conf.c
-@@ -3786,7 +3786,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
+@@ -3868,7 +3868,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 558114ad..d6b8097e 100644
  #endif
  
  #ifndef DOC_HIDDEN
-@@ -3854,7 +3854,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
+@@ -3936,7 +3936,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
  	return 0;
  }
  #ifndef DOC_HIDDEN
@@ -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.24.0
+2.25.0
 
diff --git a/pkg/alsa-lib/patch/0002-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
deleted file mode 100644
index b1ed85fb..00000000
--- a/pkg/alsa-lib/patch/0002-Use-define-for-constants-that-can-t-be-represented-a.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 02d453299c908983ec4333e9a924023e639df19f Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Tue, 2 Jul 2019 16:04:41 -0700
-Subject: [PATCH] Use #define for constants that can't be represented as int
-
----
- include/sound/asound.h | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/include/sound/asound.h b/include/sound/asound.h
-index 4d35c84d..a616f95c 100644
---- a/include/sound/asound.h
-+++ b/include/sound/asound.h
-@@ -312,11 +312,9 @@ typedef int __bitwise snd_pcm_state_t;
- #define	SNDRV_PCM_STATE_DISCONNECTED	((__force snd_pcm_state_t) 8) /* hardware is disconnected */
- #define	SNDRV_PCM_STATE_LAST		SNDRV_PCM_STATE_DISCONNECTED
- 
--enum {
--	SNDRV_PCM_MMAP_OFFSET_DATA = 0x00000000,
--	SNDRV_PCM_MMAP_OFFSET_STATUS = 0x80000000,
--	SNDRV_PCM_MMAP_OFFSET_CONTROL = 0x81000000,
--};
-+#define SNDRV_PCM_MMAP_OFFSET_DATA	0x00000000
-+#define SNDRV_PCM_MMAP_OFFSET_STATUS	0x80000000
-+#define SNDRV_PCM_MMAP_OFFSET_CONTROL	0x81000000
- 
- union snd_pcm_sync_id {
- 	unsigned char id[16];
--- 
-2.22.0
-
diff --git a/pkg/alsa-lib/patch/0004-Don-t-use-inline-asm-on-non-GNU-compilers.patch b/pkg/alsa-lib/patch/0003-Don-t-use-inline-asm-on-non-GNU-compilers.patch
index abd575b5..abd575b5 100644
--- a/pkg/alsa-lib/patch/0004-Don-t-use-inline-asm-on-non-GNU-compilers.patch
+++ b/pkg/alsa-lib/patch/0003-Don-t-use-inline-asm-on-non-GNU-compilers.patch
diff --git a/pkg/alsa-lib/patch/0005-Use-switch-statements-instead-of-labels-as-values.patch b/pkg/alsa-lib/patch/0004-Use-switch-statements-instead-of-labels-as-values.patch
index 46258b0b..46258b0b 100644
--- a/pkg/alsa-lib/patch/0005-Use-switch-statements-instead-of-labels-as-values.patch
+++ b/pkg/alsa-lib/patch/0004-Use-switch-statements-instead-of-labels-as-values.patch
diff --git a/pkg/alsa-lib/ver b/pkg/alsa-lib/ver
index 608f1b9b..be8ecf15 100644
--- a/pkg/alsa-lib/ver
+++ b/pkg/alsa-lib/ver
@@ -1 +1 @@
-1.2.1 r1
+1.2.1 r2