diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-06-09 18:59:30 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-06-10 08:59:32 +0200 |
commit | bd0fcc79d4fa32412994f803fa62ecc2232923a2 (patch) | |
tree | 9528e5d95abe16acc96037355e03345d9fb9659a /source/l/alsa-lib | |
parent | 3e486d66d253cd7a7436d1771c2f7403a5e87240 (diff) | |
download | current-bd0fcc79d4fa32412994f803fa62ecc2232923a2.tar.gz current-bd0fcc79d4fa32412994f803fa62ecc2232923a2.tar.xz |
Wed Jun 9 18:59:30 UTC 202120210609185930
a/dialog-1.3_20210530-x86_64-1.txz: Upgraded.
a/grub-2.06-x86_64-1.txz: Upgraded.
a/kernel-firmware-20210609_0f66b74-noarch-1.txz: Upgraded.
d/gcc-10.3.0-x86_64-2.txz: Rebuilt.
Applied upstream patches to address the regressions noted in PR100101 and
PR100102. Thanks to eduardr.
d/gcc-brig-10.3.0-x86_64-2.txz: Rebuilt.
d/gcc-g++-10.3.0-x86_64-2.txz: Rebuilt.
d/gcc-gdc-10.3.0-x86_64-2.txz: Rebuilt.
d/gcc-gfortran-10.3.0-x86_64-2.txz: Rebuilt.
d/gcc-gnat-10.3.0-x86_64-2.txz: Rebuilt.
d/gcc-go-10.3.0-x86_64-2.txz: Rebuilt.
d/gcc-objc-10.3.0-x86_64-2.txz: Rebuilt.
d/meson-0.58.1-x86_64-1.txz: Upgraded.
kde/bluedevil-5.22.0-x86_64-1.txz: Upgraded.
kde/breeze-5.22.0-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.22.0-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.22.0-x86_64-1.txz: Upgraded.
kde/drkonqi-5.22.0-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.22.0-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.22.0-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.22.0-x86_64-1.txz: Upgraded.
kde/kdecoration-5.22.0-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.22.0-x86_64-1.txz: Upgraded.
kde/kgamma5-5.22.0-x86_64-1.txz: Upgraded.
kde/khotkeys-5.22.0-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.22.0-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.22.0-x86_64-1.txz: Upgraded.
kde/krita-4.4.5-x86_64-1.txz: Upgraded.
kde/kscreen-5.22.0-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.22.0-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.22.0-x86_64-1.txz: Upgraded.
kde/ksysguard-5.22.0-x86_64-1.txz: Upgraded.
kde/ksystemstats-5.22.0-x86_64-1.txz: Added.
kde/kwallet-pam-5.22.0-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.22.0-x86_64-1.txz: Upgraded.
kde/kwayland-server-5.22.0-x86_64-1.txz: Upgraded.
kde/kwin-5.22.0-x86_64-1.txz: Upgraded.
kde/kwrited-5.22.0-x86_64-1.txz: Upgraded.
kde/latte-dock-0.9.12-x86_64-1.txz: Upgraded.
kde/layer-shell-qt-5.22.0-x86_64-1.txz: Added.
kde/libkscreen-5.22.0-x86_64-1.txz: Upgraded.
kde/libksysguard-5.22.0-x86_64-1.txz: Upgraded.
kde/milou-5.22.0-x86_64-1.txz: Upgraded.
kde/oxygen-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.22.0-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.22.0-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.22.0-x86_64-1.txz: Upgraded.
kde/powerdevil-5.22.0-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.22.0-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.22.0-x86_64-1.txz: Upgraded.
kde/systemsettings-5.22.0-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.22.0-x86_64-1.txz: Upgraded.
l/alsa-lib-1.2.5-x86_64-3.txz: Rebuilt.
Apply upstream patches to fix device detection. Thanks to USUARIONUEVO.
l/libiodbc-3.52.15-x86_64-1.txz: Upgraded.
n/sshfs-3.7.2-x86_64-1.txz: Upgraded.
n/wpa_supplicant-2.9-x86_64-7.txz: Rebuilt.
Support WPA3 and add some more options from the defconfig included in the
source to Slackware's config file. Thanks to ArTourter.
x/xkeyboard-config-2.33-noarch-1.txz: Upgraded.
x/xterm-368-x86_64-1.txz: Upgraded.
xfce/xfce4-settings-4.16.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/alsa-lib')
4 files changed, 196 insertions, 1 deletions
diff --git a/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch b/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch new file mode 100644 index 000000000..3703f8096 --- /dev/null +++ b/source/l/alsa-lib/0e4ba2ea8c0402f12a645032a14693eb9b1278e6.patch @@ -0,0 +1,65 @@ +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 new file mode 100644 index 000000000..981870ed8 --- /dev/null +++ b/source/l/alsa-lib/9621d0bff2e60b43e329ffa5059ab19f2914ec14.patch @@ -0,0 +1,31 @@ +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 ea572df94..559cb6aac 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -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:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -81,6 +81,11 @@ 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 diff --git a/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch b/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch new file mode 100644 index 000000000..88ce8f502 --- /dev/null +++ b/source/l/alsa-lib/ddfc32abf5697de1618b9e7ffdf57a0f97013090.patch @@ -0,0 +1,94 @@ +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); |