From dcb227c89732bf262b177b18c2ad19c9980267b66b6cb817ad8bae74e37e9b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 5 Dec 2024 10:53:47 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main alsa revision 51da9c9c3ff26b0c96c3c4b1fa3c59c3 --- ...rsions.in.in-Update-_tempo_base-name.patch | 42 +++++++++++++ ...-Make-sequencer-dependent-on-rawmidi.patch | 34 +++++++++++ 0003-seq-include-UMP-headers.patch | 61 +++++++++++++++++++ alsa-lib-1.2.12.tar.bz2 | 3 - alsa-lib-1.2.12.tar.bz2.sig | 16 ----- alsa-lib-1.2.13.tar.bz2 | 3 + alsa-lib-1.2.13.tar.bz2.sig | 16 +++++ alsa.changes | 31 ++++++++++ alsa.spec | 16 ++++- 9 files changed, 202 insertions(+), 20 deletions(-) create mode 100644 0001-src-Versions.in.in-Update-_tempo_base-name.patch create mode 100644 0002-configure-Make-sequencer-dependent-on-rawmidi.patch create mode 100644 0003-seq-include-UMP-headers.patch delete mode 100644 alsa-lib-1.2.12.tar.bz2 delete mode 100644 alsa-lib-1.2.12.tar.bz2.sig create mode 100644 alsa-lib-1.2.13.tar.bz2 create mode 100644 alsa-lib-1.2.13.tar.bz2.sig diff --git a/0001-src-Versions.in.in-Update-_tempo_base-name.patch b/0001-src-Versions.in.in-Update-_tempo_base-name.patch new file mode 100644 index 0000000..3b95d67 --- /dev/null +++ b/0001-src-Versions.in.in-Update-_tempo_base-name.patch @@ -0,0 +1,42 @@ +From 76edab4e595bd5f3f4c636cccc8d7976d3c519d6 Mon Sep 17 00:00:00 2001 +From: Nicholas Vinson +Date: Thu, 14 Nov 2024 07:49:53 -0500 +Subject: [PATCH] src/Versions.in.in: Update *_tempo_base name + +Change @SYMBOL_PREFIX@snd_has_tempo_base to +@SYMBOL_PREFIX@snd_has_queue_tempo_base. + +Starting with version 1.2.13, alsa-lib fails to link with ld.lld-19 due +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 +Signed-off-by: Jaroslav Kysela +--- + 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 350ec3d86ad6..7ad6a6333f83 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.43.0 + diff --git a/0002-configure-Make-sequencer-dependent-on-rawmidi.patch b/0002-configure-Make-sequencer-dependent-on-rawmidi.patch new file mode 100644 index 0000000..d996cc5 --- /dev/null +++ b/0002-configure-Make-sequencer-dependent-on-rawmidi.patch @@ -0,0 +1,34 @@ +From 6880219ad4ba55ae8a94a34b7a987b3369f7c96f Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Sun, 24 Nov 2024 09:32:29 +0100 +Subject: [PATCH] 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: Takashi Iwai +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 1cd22a5984d7..69aeb978af0d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -483,6 +483,12 @@ fi + AC_SUBST(PYTHON_LIBS) + AC_SUBST(PYTHON_INCLUDES) + ++if test "$build_rawmidi" != "yes"; then ++ if test "$build_seq" = "yes"; then ++ 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.43.0 + diff --git a/0003-seq-include-UMP-headers.patch b/0003-seq-include-UMP-headers.patch new file mode 100644 index 0000000..197556e --- /dev/null +++ b/0003-seq-include-UMP-headers.patch @@ -0,0 +1,61 @@ +From 07cee0ba05179a56764c35975d5822420d4f31f9 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Sun, 24 Nov 2024 09:33:16 +0100 +Subject: [PATCH] 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 +--- + 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 2eee95a643b4..5082ad0ad82b 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 9ca384ee4a0a..0b59202f6e62 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 1043d237c68f..06c86a5e8ba3 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.43.0 + diff --git a/alsa-lib-1.2.12.tar.bz2 b/alsa-lib-1.2.12.tar.bz2 deleted file mode 100644 index e0cf61d..0000000 --- a/alsa-lib-1.2.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4868cd908627279da5a634f468701625be8cc251d84262c7e5b6a218391ad0d2 -size 1108712 diff --git a/alsa-lib-1.2.12.tar.bz2.sig b/alsa-lib-1.2.12.tar.bz2.sig deleted file mode 100644 index 46ada86..0000000 --- a/alsa-lib-1.2.12.tar.bz2.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmZm7lAACgkQg4BZbabl -nJEJtQ//So1c+bHwtmG/bMSFXnS8+fYf0DyjTydzonQGwCErHLfmOCLKRxlptR5Y -erlDU7JSZIz0N5fI8CN8u/tFwA1asib36krpC8hfLu2euhiyJOHIeyYNXxxJCqhO -gcDUhNKr9PnuBiaELB4yHuo7GulM1AroEVMR+BOD2w9D7vdxsny18VPW0lz0bFNb -5ghrHFIN8Sd/9NwV3rrzk4/1G1ZDd1FkEM5VfVGO+dK43YCkRKQM+HPOVOvWkhfa -23OODknLQtk3WJNE7j0TIg/BcbcaAa0AKx7n5GacsZ/yQRTjq/wT+DuKcfC/Mweg -ST9YircBSx+GGE63VVAuAVRAkUrvu1imJVLKW8ugFu16X07gXMB6kVLyWQjf1aFZ -4Tj6l8JOIHYcEtJmzaVbrvUx+5jJoDoN2m+dKOXbFeSWkshX/Yr0KnTeK1DqF93f -f2PGxeDVQd1W+wMQUXqonJI6HtEUV71rubpvtvCzc41C4C9ZJ951Z1BtVIymLnXj -pv3v92r/TkeC/5W/YeE3rRTvIAjJWGuL9o/plWNJxSvqy7j2rG7SS04iBGY7TVKq -pKXs81Uc0PRBYOH79Xsw1c47yQf2gsRdK3+LuvlGfsQeOENfAl5pJOpYygCSYiU3 -7Dv5qx0CeoQ0dfMcriK2QGYw3quLPXR7Oh9+ZvhRtSNhV55d8kk= -=/HYf ------END PGP SIGNATURE----- diff --git a/alsa-lib-1.2.13.tar.bz2 b/alsa-lib-1.2.13.tar.bz2 new file mode 100644 index 0000000..19a9fc4 --- /dev/null +++ b/alsa-lib-1.2.13.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c4ff37553cbe89618e187e4c779f71a9bb2a8b27b91f87ed40987cc9233d8f6 +size 1116739 diff --git a/alsa-lib-1.2.13.tar.bz2.sig b/alsa-lib-1.2.13.tar.bz2.sig new file mode 100644 index 0000000..a568e6a --- /dev/null +++ b/alsa-lib-1.2.13.tar.bz2.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmczJNIACgkQg4BZbabl +nJFCVA/9EJJOFZFzR35c7YshkqcTffWnnekEymRYb7m8USpzI8wDlmjOEPg16/9n +MQ+JOPG5PU3ClrwDuUTuZaBso+yOjzSvw1jKwRZaHBCPVBzkOguskWM/R0ffMGhE +igObqCQ7h2dhtKDZ+QKGd7NVcrVN6zn9/weM8qOy4NukoJ1m38PLUHo5O3PuFyn9 +mrIuhUn7QEepSdTuYU6atUyiXWloxfIE8X1ZKe6/feqizWPySZLu4KlgpJ9NxRq4 +6XwulrtN44azL1xLrjjR3Q4VRpVw+501U7TxNRvTRfBDvbYCiAh39lIt5kWTCY/K +LwhxgaqYvecTbMxE5BnCDUIQqdZERZgfqE/UQb70VBYgsOw3SLQ4yvnwP0Pwv3/E +w8Byz816r5LxRjh11UZF2A33Btj19gR9nTpcN+9VArFksQP9K7wJ/fG0kd3gUTIw +/jD7kkKyH+xVpklWpPPvVkacuyGQyve2eU8R8wI+dD0tj36iiIv14tsgLljXY2Ic +6eFfL++Zs3uFfb9gEZqbobe0/XN/uVf4X1OHjpWqb4u65IEQvE7Lk9sZer3WaY+v +ZOvNJU+FUB4/Sf2x4jOlQdrVdzGskPxB1CkBIzH1y/h8SyK6o2lnWLF1gKRSpo/m +y8I0cFuiqFO5LxmnTTIHDb+fNnt9l6KAoJ7Ptp10JEDqdToQaE8= +=fk/E +-----END PGP SIGNATURE----- diff --git a/alsa.changes b/alsa.changes index e95c0ed..fdbc826 100644 --- a/alsa.changes +++ b/alsa.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sun Nov 24 08:56:17 UTC 2024 - Takashi Iwai + +- Fix header inclusions for implicit dependnecies (bsc#1233682) + 0002-configure-Make-sequencer-dependent-on-rawmidi.patch + 0003-seq-include-UMP-headers.patch + +------------------------------------------------------------------- +Fri Nov 15 16:42:00 UTC 2024 - Takashi Iwai + +- Fix incorrect versioned symbol for snd_seq_has_queue_tempo_base: + 0001-src-Versions.in.in-Update-_tempo_base-name.patch + +------------------------------------------------------------------- +Tue Nov 12 14:03:45 UTC 2024 - Takashi Iwai + +- Update to alsa-lib 1.2.13: + * static build fixes + * documentation update for control remap API + * PCM dmix fixes + * pcm: implement snd_pcm_hw_params_get_sync() and obsolete snd_pcm_info_get_sync() + * ump: Add a function to provide the packet word length of a UMP type + * seq: Add snd_seq_{get|set}_ump_is_midi1() API functions + * seq: Add API functions to set different tempo base values + * seq: Add API helper functions for creating UMP Endpoint and Blocks + * documentation fixes for UMP and sequencer API + * test: Add an example programs for UMP + For details, see: + https://www.alsa-project.org/wiki/Changes_v1.2.12_v1.2.13#alsa-lib +- Conditionally take libtool + ------------------------------------------------------------------- Thu Jun 13 14:51:29 UTC 2024 - Takashi Iwai diff --git a/alsa.spec b/alsa.spec index ed76b3d..ca89f63 100644 --- a/alsa.spec +++ b/alsa.spec @@ -16,6 +16,9 @@ # +%define build_from_git 0 +%define do_autoreconf 1 + #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates @@ -32,14 +35,18 @@ %endif Name: alsa -Version: 1.2.12 +Version: 1.2.13 Release: 0 Summary: Advanced Linux Sound Architecture License: LGPL-2.1-or-later Group: System/Libraries URL: https://www.alsa-project.org +%if 0%{?build_from_git} +Source: alsa-lib-%{version}.tar.bz2 +%else Source: https://www.alsa-project.org/files/pub/lib/alsa-lib-%{version}.tar.bz2 Source1: https://www.alsa-project.org/files/pub/lib/alsa-lib-%{version}.tar.bz2.sig +%endif Source2: baselibs.conf Source8: 40-alsa.rules Source11: alsasound @@ -56,10 +63,15 @@ Source34: alsa-init.sh # from https://www.alsa-project.org/files/pub/gpg-release-key-v1.txt Source35: alsa.keyring # upstream fixes +Patch1: 0001-src-Versions.in.in-Update-_tempo_base-name.patch +Patch2: 0002-configure-Make-sequencer-dependent-on-rawmidi.patch +Patch3: 0003-seq-include-UMP-headers.patch # rest suse fixes Patch101: alsa-lib-ignore-non-accessible-ALSA_CONFIG_PATH.patch BuildRequires: doxygen +%if 0%{?do_autoreconf} || 0%{?build_from_git} BuildRequires: libtool +%endif BuildRequires: pkgconfig Requires: alsa-ucm-conf Requires: alsa-utils @@ -150,7 +162,9 @@ This package contains the library for ALSA topology support. %define _lto_cflags %{nil} export AUTOMAKE_JOBS="%{?_smp_mflags}" # build alsa-lib +%if 0%{?do_autoreconf} || 0%{?build_from_git} autoreconf -fi +%endif %configure \ --disable-static \ --enable-symbolic-functions \