Update to v1.2.14
Resolves: RHEL-80638 Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
This commit is contained in:
Jaroslav Kysela
parent
b77156fc3f
commit
2bb67d5c1f
271
alsa-git.patch
271
alsa-git.patch
@ -1,256 +1,31 @@
|
|||||||
From 76edab4e595bd5f3f4c636cccc8d7976d3c519d6 Mon Sep 17 00:00:00 2001
|
From 07ec2ad34c42dba8656d3f543164f360f481c52e Mon Sep 17 00:00:00 2001
|
||||||
From: Nicholas Vinson <nvinson234@gmail.com>
|
From: Daniel Dadap <ddadap@nvidia.com>
|
||||||
Date: Thu, 14 Nov 2024 07:49:53 -0500
|
Date: Thu, 15 May 2025 08:32:35 -0500
|
||||||
Subject: [PATCH 1/5] src/Versions.in.in: Update *_tempo_base name
|
Subject: [PATCH] conf: aliases: add hda-acpi -> HDA-Intel alias
|
||||||
|
|
||||||
Change @SYMBOL_PREFIX@snd_has_tempo_base to
|
The new snd_hda_acpi driver in Linux exposes the existing Azalia
|
||||||
@SYMBOL_PREFIX@snd_has_queue_tempo_base.
|
interface to non-PCI devices advertised over ACPI. Add an alias
|
||||||
|
to the existing HDA-Intel configuration file so that devices using
|
||||||
Starting with version 1.2.13, alsa-lib fails to link with ld.lld-19 due
|
this driver can be discovered properly.
|
||||||
to "version script assignment of 'ALSA_1.2.13' to symbol
|
|
||||||
'snd_seq_has_tempo_base' failed: symbol not defined".
|
|
||||||
|
|
||||||
Per commit 769d1db1b0a213a39c7e59c0d1d724e7f45b1ac3 the correct name for
|
|
||||||
the symbol is @SYMBOL_PREFIX@snd_has_queue_tempo_base; therefore, update
|
|
||||||
src/Vesions.in.in to match.
|
|
||||||
|
|
||||||
Fixes bug #420
|
|
||||||
Fixes Gentoo bug 943399 (https://bugs.gentoo.org/943399)
|
|
||||||
|
|
||||||
Closes: https://github.com/alsa-project/alsa-lib/pull/421
|
|
||||||
Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
|
|
||||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
||||||
---
|
|
||||||
src/Versions.in.in | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/Versions.in.in b/src/Versions.in.in
|
|
||||||
index 350ec3d8..7ad6a633 100644
|
|
||||||
--- a/src/Versions.in.in
|
|
||||||
+++ b/src/Versions.in.in
|
|
||||||
@@ -212,7 +212,7 @@ ALSA_1.2.13 {
|
|
||||||
@SYMBOL_PREFIX@snd_seq_create_ump_block;
|
|
||||||
@SYMBOL_PREFIX@snd_seq_queue_tempo_get_tempo_base;
|
|
||||||
@SYMBOL_PREFIX@snd_seq_queue_tempo_set_tempo_base;
|
|
||||||
- @SYMBOL_PREFIX@snd_seq_has_tempo_base;
|
|
||||||
+ @SYMBOL_PREFIX@snd_seq_has_queue_tempo_base;
|
|
||||||
@SYMBOL_PREFIX@snd_seq_port_info_get_ump_is_midi1;
|
|
||||||
@SYMBOL_PREFIX@snd_seq_port_info_set_ump_is_midi1;
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
2.47.0
|
|
||||||
|
|
||||||
|
|
||||||
From 6880219ad4ba55ae8a94a34b7a987b3369f7c96f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takashi Iwai <tiwai@suse.de>
|
|
||||||
Date: Sun, 24 Nov 2024 09:32:29 +0100
|
|
||||||
Subject: [PATCH 2/5] configure: Make sequencer dependent on rawmidi
|
|
||||||
|
|
||||||
The sequencer feature requires rawmidi implicitly, and it became more
|
|
||||||
obvious with UMP support. Add the dependency check to configure
|
|
||||||
script.
|
|
||||||
|
|
||||||
|
Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
|
||||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
---
|
---
|
||||||
configure.ac | 6 ++++++
|
src/conf/cards/aliases.conf | 1 +
|
||||||
1 file changed, 6 insertions(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
|
||||||
index 1cd22a59..69aeb978 100644
|
index a54824ae..e2d59aa7 100644
|
||||||
--- a/configure.ac
|
--- a/src/conf/cards/aliases.conf
|
||||||
+++ b/configure.ac
|
+++ b/src/conf/cards/aliases.conf
|
||||||
@@ -483,6 +483,12 @@ fi
|
@@ -57,6 +57,7 @@ CMI8786 cards.CMI8788
|
||||||
AC_SUBST(PYTHON_LIBS)
|
CMI8787 cards.CMI8788
|
||||||
AC_SUBST(PYTHON_INCLUDES)
|
pistachio cards.pistachio-card
|
||||||
|
VC4-HDMI cards.vc4-hdmi
|
||||||
|
+hda-acpi cards.HDA-Intel
|
||||||
|
|
||||||
+if test "$build_rawmidi" != "yes"; then
|
<confdir:ctl/default.conf>
|
||||||
+ if test "$build_seq" = "yes"; then
|
<confdir:pcm/default.conf>
|
||||||
+ AC_ERROR([Cannot enable sequencer without rawmidi])
|
|
||||||
+ fi
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
AM_CONDITIONAL([BUILD_MIXER], [test x$build_mixer = xyes])
|
|
||||||
AM_CONDITIONAL([BUILD_PCM], [test x$build_pcm = xyes])
|
|
||||||
AM_CONDITIONAL([BUILD_RAWMIDI], [test x$build_rawmidi = xyes])
|
|
||||||
--
|
--
|
||||||
2.47.0
|
2.49.0
|
||||||
|
|
||||||
|
|
||||||
From 07cee0ba05179a56764c35975d5822420d4f31f9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Takashi Iwai <tiwai@suse.de>
|
|
||||||
Date: Sun, 24 Nov 2024 09:33:16 +0100
|
|
||||||
Subject: [PATCH 3/5] seq: include UMP headers
|
|
||||||
|
|
||||||
Some applications seem including alsa/seqmid.h individually, and this
|
|
||||||
got broken with the update of alsa-lib because now we have
|
|
||||||
dependencies to UMP stuff. Include the necessary UMP headers
|
|
||||||
internally. Also, add the inclusion of rawmidi.h in ump.h for similar
|
|
||||||
reasons.
|
|
||||||
|
|
||||||
Link: https://bugzilla.suse.com/show_bug.cgi?id=1233682
|
|
||||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
||||||
---
|
|
||||||
include/seq.h | 2 ++
|
|
||||||
include/seq_event.h | 2 ++
|
|
||||||
include/ump.h | 2 ++
|
|
||||||
3 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/include/seq.h b/include/seq.h
|
|
||||||
index 2eee95a6..5082ad0a 100644
|
|
||||||
--- a/include/seq.h
|
|
||||||
+++ b/include/seq.h
|
|
||||||
@@ -29,6 +29,8 @@
|
|
||||||
#ifndef __ALSA_SEQ_H
|
|
||||||
#define __ALSA_SEQ_H
|
|
||||||
|
|
||||||
+#include "ump.h"
|
|
||||||
+
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
diff --git a/include/seq_event.h b/include/seq_event.h
|
|
||||||
index 9ca384ee..0b59202f 100644
|
|
||||||
--- a/include/seq_event.h
|
|
||||||
+++ b/include/seq_event.h
|
|
||||||
@@ -28,6 +28,8 @@
|
|
||||||
#ifndef __ALSA_SEQ_EVENT_H
|
|
||||||
#define __ALSA_SEQ_EVENT_H
|
|
||||||
|
|
||||||
+#include "ump_msg.h"
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* \defgroup SeqEvents Sequencer Event Definitions
|
|
||||||
* Sequencer Event Definitions
|
|
||||||
diff --git a/include/ump.h b/include/ump.h
|
|
||||||
index 1043d237..06c86a5e 100644
|
|
||||||
--- a/include/ump.h
|
|
||||||
+++ b/include/ump.h
|
|
||||||
@@ -9,6 +9,8 @@
|
|
||||||
#ifndef __ALSA_UMP_H
|
|
||||||
#define __ALSA_UMP_H
|
|
||||||
|
|
||||||
+#include "rawmidi.h"
|
|
||||||
+
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
--
|
|
||||||
2.47.0
|
|
||||||
|
|
||||||
|
|
||||||
From 76d2d285c10b1e368b4bf9494cf9270ae46197cb Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jaroslav Kysela <perex@perex.cz>
|
|
||||||
Date: Mon, 25 Nov 2024 15:11:27 +0100
|
|
||||||
Subject: [PATCH 4/5] rawmidi: ump - fix snd_ump_block_info_get_block_id double
|
|
||||||
version
|
|
||||||
|
|
||||||
The changes for 1.2.13 in Versions.in.in file matches also old
|
|
||||||
1.2.10 function snd_ump_block_info_get_block_id:
|
|
||||||
|
|
||||||
1 Removed function:
|
|
||||||
|
|
||||||
[D] 'function void snd_ump_block_info_set_block_id(snd_ump_block_info_t*, unsigned int)' {snd_ump_block_info_set_block_id@@ALSA_1.2.10}
|
|
||||||
|
|
||||||
Add 1.2.10 symbol back, but keep 1.2.13 symbol as default.
|
|
||||||
|
|
||||||
Closes: https://github.com/alsa-project/alsa-lib/issues/422
|
|
||||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
||||||
---
|
|
||||||
src/rawmidi/ump.c | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
|
|
||||||
index d3676afb..b1246c33 100644
|
|
||||||
--- a/src/rawmidi/ump.c
|
|
||||||
+++ b/src/rawmidi/ump.c
|
|
||||||
@@ -750,11 +750,20 @@ int snd_ump_block_info_get_device(const snd_ump_block_info_t *info)
|
|
||||||
* \param info pointer to a snd_ump_block_info_t structure
|
|
||||||
* \return ID number of the given UMP block
|
|
||||||
*/
|
|
||||||
+#ifndef DOXYGEN
|
|
||||||
+EXPORT_SYMBOL unsigned int INTERNAL(snd_ump_block_info_get_block_id)(const snd_ump_block_info_t *info)
|
|
||||||
+#else
|
|
||||||
unsigned int snd_ump_block_info_get_block_id(const snd_ump_block_info_t *info)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
return info->block_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef DOC_HIDDEN
|
|
||||||
+use_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.10);
|
|
||||||
+use_default_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.13);
|
|
||||||
+#endif /* DOC_HIDDEN */
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* \brief get UMP block activeness
|
|
||||||
* \param info pointer to a snd_ump_block_info_t structure
|
|
||||||
--
|
|
||||||
2.47.0
|
|
||||||
|
|
||||||
|
|
||||||
From 352cbc5eb94a271a9c3c0ff5bf1742232a69e0d0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jaroslav Kysela <perex@perex.cz>
|
|
||||||
Date: Mon, 25 Nov 2024 16:17:30 +0100
|
|
||||||
Subject: [PATCH 5/5] rawmidi: ump - fix snd_ump_block_info_set_block_id double
|
|
||||||
version
|
|
||||||
|
|
||||||
Fix mistake snd_ump_block_info_get_block_id / snd_ump_block_info_set_block_id .
|
|
||||||
|
|
||||||
Fixes: 76d2d285 ("rawmidi: ump - fix snd_ump_block_info_get_block_id double version")
|
|
||||||
Link: https://github.com/alsa-project/alsa-lib/issues/422
|
|
||||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
||||||
---
|
|
||||||
src/rawmidi/ump.c | 19 ++++++++++---------
|
|
||||||
1 file changed, 10 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/rawmidi/ump.c b/src/rawmidi/ump.c
|
|
||||||
index b1246c33..6807e877 100644
|
|
||||||
--- a/src/rawmidi/ump.c
|
|
||||||
+++ b/src/rawmidi/ump.c
|
|
||||||
@@ -750,20 +750,11 @@ int snd_ump_block_info_get_device(const snd_ump_block_info_t *info)
|
|
||||||
* \param info pointer to a snd_ump_block_info_t structure
|
|
||||||
* \return ID number of the given UMP block
|
|
||||||
*/
|
|
||||||
-#ifndef DOXYGEN
|
|
||||||
-EXPORT_SYMBOL unsigned int INTERNAL(snd_ump_block_info_get_block_id)(const snd_ump_block_info_t *info)
|
|
||||||
-#else
|
|
||||||
unsigned int snd_ump_block_info_get_block_id(const snd_ump_block_info_t *info)
|
|
||||||
-#endif
|
|
||||||
{
|
|
||||||
return info->block_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifndef DOC_HIDDEN
|
|
||||||
-use_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.10);
|
|
||||||
-use_default_symbol_version(__snd_ump_block_info_get_block_id, snd_ump_block_info_get_block_id, ALSA_1.2.13);
|
|
||||||
-#endif /* DOC_HIDDEN */
|
|
||||||
-
|
|
||||||
/**
|
|
||||||
* \brief get UMP block activeness
|
|
||||||
* \param info pointer to a snd_ump_block_info_t structure
|
|
||||||
@@ -881,12 +872,22 @@ void snd_ump_block_info_set_device(snd_ump_block_info_t *info, unsigned int devi
|
|
||||||
*
|
|
||||||
* This function is mostly used for setting the block ID to query.
|
|
||||||
*/
|
|
||||||
+#ifndef DOXYGEN
|
|
||||||
+EXPORT_SYMBOL void INTERNAL(snd_ump_block_info_set_block_id)(snd_ump_block_info_t *info,
|
|
||||||
+ unsigned int id)
|
|
||||||
+#else
|
|
||||||
void snd_ump_block_info_set_block_id(snd_ump_block_info_t *info,
|
|
||||||
unsigned int id)
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
info->block_id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifndef DOC_HIDDEN
|
|
||||||
+use_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.10);
|
|
||||||
+use_default_symbol_version(__snd_ump_block_info_set_block_id, snd_ump_block_info_set_block_id, ALSA_1.2.13);
|
|
||||||
+#endif /* DOC_HIDDEN */
|
|
||||||
+
|
|
||||||
/**
|
|
||||||
* \brief set activeness to snd_ump_block_info_t structure
|
|
||||||
* \param info pointer to a snd_ump_block_info_t structure
|
|
||||||
--
|
|
||||||
2.47.0
|
|
||||||
|
|
||||||
|
|||||||
@ -2,14 +2,14 @@
|
|||||||
#define prever_dot .rc3
|
#define prever_dot .rc3
|
||||||
#define postver a
|
#define postver a
|
||||||
|
|
||||||
%define version_alsa_lib 1.2.13
|
%define version_alsa_lib 1.2.14
|
||||||
%define version_alsa_ucm 1.2.13
|
%define version_alsa_ucm 1.2.14
|
||||||
%define version_alsa_tplg 1.2.5
|
%define version_alsa_tplg 1.2.5
|
||||||
|
|
||||||
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
||||||
Name: alsa-lib
|
Name: alsa-lib
|
||||||
Version: %{version_alsa_lib}
|
Version: %{version_alsa_lib}
|
||||||
Release: 2%{?prever_dot}%{?dist}
|
Release: 1%{?prever_dot}%{?dist}
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
URL: http://www.alsa-project.org/
|
URL: http://www.alsa-project.org/
|
||||||
|
|
||||||
@ -167,6 +167,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
|
|||||||
%{_datadir}/alsa/topology
|
%{_datadir}/alsa/topology
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jun 26 2025 Jaroslav Kysela <perex@perex.cz> - 1.2.14-1
|
||||||
|
- update to alsa-lib 1.2.14 and alsa-ucm-conf 1.2.14
|
||||||
|
|
||||||
* Mon Dec 16 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.13-2
|
* Mon Dec 16 2024 Jaroslav Kysela <perex@perex.cz> - 1.2.13-2
|
||||||
- update to alsa-lib 1.2.13 and alsa-ucm-conf 1.2.13
|
- update to alsa-lib 1.2.13 and alsa-ucm-conf 1.2.13
|
||||||
|
|
||||||
|
|||||||
2693
alsa-ucm-conf.patch
2693
alsa-ucm-conf.patch
File diff suppressed because it is too large
Load Diff
4
sources
4
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (alsa-lib-1.2.13.tar.bz2) = b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0
|
SHA512 (alsa-lib-1.2.14.tar.bz2) = 2716cc3a2299da4a1a170d734af082d78dc452b253179d0f1a9ec190140734aecf002b6924eec4ff2699ce88ce1ae5c56821c267f36384910984db726d1f9626
|
||||||
SHA512 (alsa-ucm-conf-1.2.13.tar.bz2) = cad867268851ac178f3a5378a00e292184b0e0ec7955f297ae7ed56073d3dddb06c08666b23b1bf6b0065068a9370ee34608bd687763658c79d34b64059b1c85
|
SHA512 (alsa-ucm-conf-1.2.14.tar.bz2) = a224e890919306bdcd606dfb873b089950c9fa89f24c02947692ee8ab1a05c419f2a8dc174440d17c8a9575cab293806630f2cb43d74677f7ef0d956b7883dc5
|
||||||
SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
|
SHA512 (alsa-topology-conf-1.2.5.tar.bz2) = 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user