Mon Jun 14 19:10:17 UTC 202120210614191017

ap/alsa-utils-1.2.5.1-x86_64-1.txz:  Upgraded.
d/cmake-3.20.4-x86_64-1.txz:  Upgraded.
kde/pulseaudio-qt-1.3-x86_64-1.txz:  Upgraded.
l/alsa-lib-1.2.5.1-x86_64-1.txz:  Upgraded.
n/bluez-5.59-x86_64-1.txz:  Upgraded.
n/postfix-3.6.1-x86_64-1.txz:  Upgraded.

4 files changed, 2 insertions, 199 deletions

diff --git a/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch b/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch
deleted file mode 100644
index 3703f8096..000000000
--- a/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0e4ba2ea8c0402f12a645032a14693eb9b1278e6 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 2 Jun 2021 11:09:43 +0200
-Subject: [PATCH] ucm: add _alibpref to get the private device prefix
-
-It may be useful to get the device prefix for the local configuration.
-
-Link: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/1251
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- include/use-case.h |  1 +
- src/ucm/main.c     | 21 +++++++++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/include/use-case.h b/include/use-case.h
-index ec1a97b0..7890358b 100644
---- a/include/use-case.h
-+++ b/include/use-case.h
-@@ -258,6 +258,7 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,
-  *   - _verb		- return current verb
-  *   - _file		- return configuration file loaded for current card
-  *   - _alibcfg		- return private alsa-lib's configuration for current card
-+ *   - _alibpref	- return private alsa-lib's configuration device prefix for current card
-  *
-  *   - [=]{NAME}[/[{modifier}|{/device}][/{verb}]]
-  *                      - value identifier {NAME}
-diff --git a/src/ucm/main.c b/src/ucm/main.c
-index 361952f6..3c9ea15d 100644
---- a/src/ucm/main.c
-+++ b/src/ucm/main.c
-@@ -2138,6 +2138,25 @@ static int get_alibcfg(snd_use_case_mgr_t *uc_mgr, char **str)
- 	return 0;
- }
- 
-+/**
-+ * \brief Get device prefix for private alsa-lib configuration
-+ * \param uc_mgr Use case manager
-+ * \param str Returned value string
-+ * \return Zero on success (value is filled), otherwise a negative error code
-+ */
-+static int get_alibpref(snd_use_case_mgr_t *uc_mgr, char **str)
-+{
-+	const size_t l = 9;
-+	char *s;
-+
-+	s = malloc(l);
-+	if (s == NULL)
-+		return -ENOMEM;
-+	snprintf(s, l, "_ucm%04X", uc_mgr->ucm_card_number);
-+	*str = s;
-+	return 0;
-+}
-+
- /**
-  * \brief Get current - string
-  * \param uc_mgr Use case manager
-@@ -2193,6 +2212,8 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr,
- 
- 	} else if (strcmp(identifier, "_alibcfg") == 0) {
- 		err = get_alibcfg(uc_mgr, (char **)value);
-+	} else if (strcmp(identifier, "_alibpref") == 0) {
-+		err = get_alibpref(uc_mgr, (char **)value);
- 	} else if (identifier[0] == '_') {
- 		err = -ENOENT;
- 	} else {
diff --git a/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch b/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch
deleted file mode 100644
index 981870ed8..000000000
--- a/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9621d0bff2e60b43e329ffa5059ab19f2914ec14 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 2 Jun 2021 11:21:54 +0200
-Subject: [PATCH] ucm: fix _alibpref string (add '.' delimiter to the end)
-
-Fixes: 0e4ba2ea ("ucm: add _alibpref to get the private device prefix")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/ucm/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ucm/main.c b/src/ucm/main.c
-index 3c9ea15d..c9b37b68 100644
---- a/src/ucm/main.c
-+++ b/src/ucm/main.c
-@@ -2146,13 +2146,13 @@ static int get_alibcfg(snd_use_case_mgr_t *uc_mgr, char **str)
-  */
- static int get_alibpref(snd_use_case_mgr_t *uc_mgr, char **str)
- {
--	const size_t l = 9;
-+	const size_t l = 10;
- 	char *s;
- 
- 	s = malloc(l);
- 	if (s == NULL)
- 		return -ENOMEM;
--	snprintf(s, l, "_ucm%04X", uc_mgr->ucm_card_number);
-+	snprintf(s, l, "_ucm%04X.", uc_mgr->ucm_card_number);
- 	*str = s;
- 	return 0;
- }
diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild
index 559cb6aac..036119333 100755
--- a/source/l/alsa-lib/alsa-lib.SlackBuild
+++ b/source/l/alsa-lib/alsa-lib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2018, 2019, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=alsa-lib
 VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -81,19 +81,12 @@ if [ ! -r src/conf/smixer.conf ]; then
   cp -a $CWD/smixer.conf src/conf
 fi
 
-# Fix regressions in 1.2.5:
-zcat $CWD/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-zcat $CWD/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-
 # Untar the configuration files. We'll install them later.
 ( mkdir ucm-and-topology-configs
   cd ucm-and-topology-configs
   for file in $CWD/alsa-*conf*tar.lz ; do
     tar xvf $file
-    #mv $(basename $file .tar.lz)/* .
     mv $(basename $file | cut -f 1-3 -d -)-*/* .
-    #rmdir $(basename $file .tar.lz)
     rmdir $(basename $file | cut -f 1-3 -d -)-*
     mv README.md README-$(echo $(basename $file) | cut -f 1-3 -d -)
   done
diff --git a/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch b/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch
deleted file mode 100644
index 88ce8f502..000000000
--- a/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From ddfc32abf5697de1618b9e7ffdf57a0f97013090 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 2 Jun 2021 08:49:32 +0200
-Subject: [PATCH] conf: fix load_for_all_cards()
-
-The 63f7745b commit is loading the driver specific configuration
-multiple times which ends with the array merges (see the bug).
-
-Introduce the loaded compound which traces the already loaded
-driver configurations and skip the multiple load requests.
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/143
-Fixes: 63f7745b ("conf: extend load_for_all_cards hook (id/value table)")
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/conf.c | 33 ++++++++++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/src/conf.c b/src/conf.c
-index f6c80031..d863dec6 100644
---- a/src/conf.c
-+++ b/src/conf.c
-@@ -4325,18 +4325,23 @@ static int _snd_config_hook_table(snd_config_t *root, snd_config_t *config, snd_
- int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config, snd_config_t **dst, snd_config_t *private_data ATTRIBUTE_UNUSED)
- {
- 	int card = -1, err;
-+	snd_config_t *loaded;	// trace loaded cards
- 	
-+	err = snd_config_top(&loaded);
-+	if (err < 0)
-+		return err;
- 	do {
- 		err = snd_card_next(&card);
- 		if (err < 0)
--			return err;
-+			goto __fin_err;
- 		if (card >= 0) {
--			snd_config_t *n, *private_data = NULL;
-+			snd_config_t *n, *m, *private_data = NULL;
- 			const char *driver;
- 			char *fdriver = NULL;
-+			bool load;
- 			err = snd_determine_driver(card, &fdriver);
- 			if (err < 0)
--				return err;
-+				goto __fin_err;
- 			if (snd_config_search(root, fdriver, &n) >= 0) {
- 				if (snd_config_get_string(n, &driver) < 0) {
- 					if (snd_config_get_type(n) == SND_CONFIG_TYPE_COMPOUND) {
-@@ -4357,6 +4362,19 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
- 				driver = fdriver;
- 			}
- 		      __std:
-+			load = true;
-+			err = snd_config_imake_integer(&m, driver, 1);
-+			if (err < 0)
-+				goto __err;
-+			err = snd_config_add(loaded, m);
-+			if (err < 0) {
-+				if (err == -EEXIST) {
-+					snd_config_delete(m);
-+					load = false;
-+				} else {
-+					goto __err;
-+				}
-+			}
- 			private_data = _snd_config_hook_private_data(card, driver);
- 			if (!private_data) {
- 				err = -ENOMEM;
-@@ -4365,17 +4383,22 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
- 			err = _snd_config_hook_table(root, config, private_data);
- 			if (err < 0)
- 				goto __err;
--			err = snd_config_hook_load(root, config, &n, private_data);
-+			if (load)
-+				err = snd_config_hook_load(root, config, &n, private_data);
- 		      __err:
- 			if (private_data)
- 				snd_config_delete(private_data);
- 			free(fdriver);
- 			if (err < 0)
--				return err;
-+				goto __fin_err;
- 		}
- 	} while (card >= 0);
-+	snd_config_delete(loaded);
- 	*dst = NULL;
- 	return 0;
-+__fin_err:
-+	snd_config_delete(loaded);
-+	return err;
- }
- #ifndef DOC_HIDDEN
- SND_DLSYM_BUILD_VERSION(snd_config_hook_load_for_all_cards, SND_CONFIG_DLSYM_VERSION_HOOK);