Skip to content

Commit

Permalink
alsa-lib: Update to 1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelforney
michaelforney committed Oct 26, 2020
1 parent 051fc29 commit 3356088
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 40 deletions.
4 changes: 2 additions & 2 deletions pkg/alsa-lib/alsa/version.h
View file
Expand Up @@ -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 3 /**< subminor number of library version */
#define SND_LIB_SUBMINOR 4 /**< 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.3.1"
#define SND_LIB_VERSION_STR "1.2.4"

7 changes: 4 additions & 3 deletions pkg/alsa-lib/config.h
View file
Expand Up @@ -45,15 +45,16 @@
# define HAVE___THREAD 1
# define __thread _Thread_local
#endif
/* #undef LOCKLESS_DMIX_DEFAULT */
#define LT_OBJDIR ".libs/"
/* #undef NDEBUG */
#define PACKAGE "alsa-lib"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "alsa-lib"
#define PACKAGE_STRING "alsa-lib 1.2.3.2"
#define PACKAGE_STRING "alsa-lib 1.2.4"
#define PACKAGE_TARNAME "alsa-lib"
#define PACKAGE_URL ""
#define PACKAGE_VERSION "1.2.3.2"
#define PACKAGE_VERSION "1.2.4"
#define SND_MAX_CARDS 32
#define STDC_HEADERS 1
#define SUPPORT_ALOAD "1"
Expand All @@ -76,7 +77,7 @@
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif
#define VERSION "1.2.3.2"
#define VERSION "1.2.4"
#define VERSIONED_SYMBOLS /**/
/* #undef _MINIX */
/* #undef _POSIX_1_SOURCE */
Expand Down
48 changes: 24 additions & 24 deletions pkg/alsa-lib/patch/0002-Prevent-empty-top-level-declarations.patch
View file
@@ -1,4 +1,4 @@
From ea66f2d20c3388de4d569eb2cd982ff4742def1a Mon Sep 17 00:00:00 2001
From 4c27fa943883d1d846e7345aa869eebd9fd09853 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
Expand Down Expand Up @@ -83,10 +83,10 @@ index bba9a9d4..26fde696 100644
#endif

diff --git a/src/conf.c b/src/conf.c
index 8518f90c..a97e2eb7 100644
index 7df2b4e7..011caf89 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3965,7 +3965,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
@@ -3967,7 +3967,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
return err;
}
#ifndef DOC_HIDDEN
Expand All @@ -95,7 +95,7 @@ index 8518f90c..a97e2eb7 100644
#endif

#ifndef DOC_HIDDEN
@@ -4033,7 +4033,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
@@ -4035,7 +4035,7 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
return 0;
}
#ifndef DOC_HIDDEN
Expand Down Expand Up @@ -253,10 +253,10 @@ index eb8218c1..b6e0753b 100644

#ifndef DOC_HIDDEN
diff --git a/src/control/control.c b/src/control/control.c
index 19528ae3..30b36b95 100644
index 08058c06..66ba13e9 100644
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -2374,7 +2374,7 @@ int snd_ctl_elem_info_is_indirect(const snd_ctl_elem_info_t *obj)
@@ -2511,7 +2511,7 @@ int snd_ctl_elem_info_is_indirect(const snd_ctl_elem_info_t *obj)
assert(obj);
return 0;
}
Expand All @@ -265,7 +265,7 @@ index 19528ae3..30b36b95 100644

/**
* \brief Get owner of a locked element
@@ -2531,7 +2531,7 @@ int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj)
@@ -2668,7 +2668,7 @@ int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj)
return -EINVAL;
#endif
}
Expand All @@ -274,7 +274,7 @@ index 19528ae3..30b36b95 100644

/**
* \brief Get specified of dimension width for given element
@@ -2557,7 +2557,7 @@ int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int
@@ -2694,7 +2694,7 @@ int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int
return -EINVAL;
#endif /* deprecated */
}
Expand Down Expand Up @@ -304,10 +304,10 @@ index 40d42643..f59c33f5 100644
-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 1a60e0dd..0d3d4082 100644
index c9517c55..a15b25a7 100644
--- a/src/dlmisc.c
+++ b/src/dlmisc.c
@@ -178,8 +178,8 @@ void *INTERNAL(snd_dlopen_old)(const char *name, int mode)
@@ -172,8 +172,8 @@ EXPORT_SYMBOL void *INTERNAL(snd_dlopen_old)(const char *name, int mode)
}
#endif

Expand Down Expand Up @@ -348,7 +348,7 @@ 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 06a48f4c..77f0547d 100644
index 24030b31..193996a1 100644
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -1526,7 +1526,7 @@ snd_pcm_sframes_t snd_pcm_forward(snd_pcm_t *pcm, snd_pcm_uframes_t frames)
Expand Down Expand Up @@ -514,32 +514,32 @@ 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 843fa316..ad39c31d 100644
index 5b7472d9..7e21891c 100644
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -1432,5 +1432,5 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
@@ -1417,5 +1417,5 @@ int _snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
return err;
}
#ifndef DOC_HIDDEN
-SND_DLSYM_BUILD_VERSION(_snd_pcm_dmix_open, SND_PCM_DLSYM_VERSION);
+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 6a99452b..efd1c25a 100644
index 8a672572..c32e20a9 100644
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -1049,5 +1049,5 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
@@ -1042,5 +1042,5 @@ int _snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
return err;
}
#ifndef DOC_HIDDEN
-SND_DLSYM_BUILD_VERSION(_snd_pcm_dshare_open, SND_PCM_DLSYM_VERSION);
+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 7904314c..8d7762aa 100644
index c6e8cd27..1c943013 100644
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -898,5 +898,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
Expand All @@ -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 a02b2dc0..6940a1e4 100644
index 7709a554..05fce112 100644
--- a/src/pcm/pcm_file.c
+++ b/src/pcm/pcm_file.c
@@ -1126,5 +1126,5 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
@@ -1140,5 +1140,5 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
return err;
}
#ifndef DOC_HIDDEN
Expand Down Expand Up @@ -602,10 +602,10 @@ index 2028790e..23a3d05b 100644

/*
diff --git a/src/pcm/pcm_iec958.c b/src/pcm/pcm_iec958.c
index 76d3ca7b..f994876b 100644
index a11a0439..0f7bf296 100644
--- a/src/pcm/pcm_iec958.c
+++ b/src/pcm/pcm_iec958.c
@@ -713,5 +713,5 @@ int _snd_pcm_iec958_open(snd_pcm_t **pcmp, const char *name,
@@ -814,5 +814,5 @@ int _snd_pcm_iec958_open(snd_pcm_t **pcmp, const char *name,
return err;
}
#ifndef DOC_HIDDEN
Expand Down Expand Up @@ -648,10 +648,10 @@ index 33e7fc45..26b4f4e5 100644
+SND_DLSYM_BUILD_VERSION(_snd_pcm_linear_open, SND_PCM_DLSYM_VERSION)
#endif
diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c
index 20b41876..b08a36ff 100644
index 2dcf8e45..c7a75347 100644
--- a/src/pcm/pcm_meter.c
+++ b/src/pcm/pcm_meter.c
@@ -831,7 +831,7 @@ int _snd_pcm_meter_open(snd_pcm_t **pcmp, const char *name,
@@ -833,7 +833,7 @@ int _snd_pcm_meter_open(snd_pcm_t **pcmp, const char *name,
}
return 0;
}
Expand Down Expand Up @@ -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.27.0
2.29.0

18 changes: 9 additions & 9 deletions pkg/alsa-lib/patch/0004-Use-switch-statements-instead-of-labels-as-values.patch
View file
@@ -1,4 +1,4 @@
From 6c5ae6c275df9cb44475d69b140e3e822907824c Mon Sep 17 00:00:00 2001
From e3e74c5ad0ee6fea1aa2205f84613412df676572 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 31 May 2019 17:47:08 -0700
Subject: [PATCH] Use switch statements instead of labels as values
Expand Down Expand Up @@ -121,10 +121,10 @@ index 839783cf..bc1463a7 100644
src += src_step;
dst += dst_step;
diff --git a/src/pcm/pcm_iec958.c b/src/pcm/pcm_iec958.c
index f994876b..c6df5ef1 100644
index 0f7bf296..80145cf5 100644
--- a/src/pcm/pcm_iec958.c
+++ b/src/pcm/pcm_iec958.c
@@ -149,10 +149,6 @@ static void snd_pcm_iec958_decode(snd_pcm_iec958_t *iec,
@@ -150,10 +150,6 @@ static void snd_pcm_iec958_decode(snd_pcm_iec958_t *iec,
snd_pcm_uframes_t src_offset,
unsigned int channels, snd_pcm_uframes_t frames)
{
Expand All @@ -135,7 +135,7 @@ index f994876b..c6df5ef1 100644
unsigned int channel;
for (channel = 0; channel < channels; ++channel) {
const uint32_t *src;
@@ -168,11 +164,7 @@ static void snd_pcm_iec958_decode(snd_pcm_iec958_t *iec,
@@ -169,11 +165,7 @@ static void snd_pcm_iec958_decode(snd_pcm_iec958_t *iec,
frames1 = frames;
while (frames1-- > 0) {
int32_t sample = iec958_to_s32(iec, *src);
Expand All @@ -148,7 +148,7 @@ index f994876b..c6df5ef1 100644
src += src_step;
dst += dst_step;
}
@@ -186,10 +178,6 @@ static void snd_pcm_iec958_encode(snd_pcm_iec958_t *iec,
@@ -187,10 +179,6 @@ static void snd_pcm_iec958_encode(snd_pcm_iec958_t *iec,
snd_pcm_uframes_t src_offset,
unsigned int channels, snd_pcm_uframes_t frames)
{
Expand All @@ -159,9 +159,9 @@ index f994876b..c6df5ef1 100644
unsigned int channel;
int32_t sample = 0;
int counter = iec->counter;
@@ -207,11 +195,7 @@ static void snd_pcm_iec958_encode(snd_pcm_iec958_t *iec,
frames1 = frames;
iec->counter = counter;
@@ -217,11 +205,7 @@ static void snd_pcm_iec958_encode(snd_pcm_iec958_t *iec,
iec->counter = counter;

while (frames1-- > 0) {
- goto *get;
-#define GET32_END after
Expand Down Expand Up @@ -1704,5 +1704,5 @@ index 6392073c..ab9bf42e 100644
#undef as_u8
#undef as_u16
--
2.27.0
2.29.0

2 changes: 1 addition & 1 deletion pkg/alsa-lib/src
Submodule src updated 40 files
+11 −0 README.md
+14 −1 configure.ac
+136 −6 include/control.h
+2 −0 src/conf.c
+3 −0 src/conf/cards/USB-Audio.conf
+418 −160 src/control/control.c
+15 −11 src/control/ctlparse.c
+37 −45 src/dlmisc.c
+7 −7 src/pcm/pcm.c
+13 −3 src/pcm/pcm_direct.c
+1 −0 src/pcm/pcm_direct.h
+22 −37 src/pcm/pcm_dmix.c
+1 −1 src/pcm/pcm_dmix_generic.c
+1 −0 src/pcm/pcm_dmix_i386.c
+1 −0 src/pcm/pcm_dmix_x86_64.c
+3 −10 src/pcm/pcm_dshare.c
+1 −5 src/pcm/pcm_dsnoop.c
+21 −7 src/pcm/pcm_file.c
+109 −8 src/pcm/pcm_iec958.c
+20 −0 src/pcm/pcm_local.h
+4 −0 src/pcm/pcm_meter.c
+6 −2 src/pcm/pcm_plugin.c
+1 −1 src/topology/builder.c
+2 −1 src/topology/channel.c
+33 −36 src/topology/ctl.c
+5 −5 src/topology/dapm.c
+20 −17 src/topology/data.c
+3 −3 src/topology/ops.c
+2 −4 src/topology/parser.c
+31 −24 src/topology/pcm.c
+90 −46 src/topology/save.c
+2 −2 src/topology/text.c
+53 −25 src/topology/tplg_local.h
+43 −6 src/ucm/main.c
+33 −6 src/ucm/parser.c
+1 −1 src/ucm/ucm_cond.c
+7 −2 src/ucm/ucm_include.c
+6 −2 src/ucm/ucm_local.h
+55 −2 src/ucm/ucm_subs.c
+1 −1 src/ucm/utils.c
2 changes: 1 addition & 1 deletion pkg/alsa-lib/ver
View file
@@ -1 +1 @@
1.2.3.2 r0
1.2.4 r0

0 comments on commit 3356088

Please sign in to comment.