mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 00:32:13 +02:00
alsa-lib: upgrade 1.2.10 -> 1.2.11
- Upstream release update See https://www.alsa-project.org/wiki/Detailed_changes_v1.2.10_v1.2.11 - Remove merged patch - Add new patch merged after the release (From OE-Core rev: 5260a5e2316bb8d20cfb20e345f7aefe936a0da5) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6f2c3b7744
commit
1d1d8b3f57
@@ -1,52 +0,0 @@
|
||||
From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
|
||||
From: Michael Opdenacker <michael.opdenacker@bootlin.com>
|
||||
Date: Wed, 6 Sep 2023 15:16:44 +0200
|
||||
Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
|
||||
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
|
||||
It solves the musl libc compilation issue.
|
||||
|
||||
control.c: In function 'snd_ctl_open_conf':
|
||||
../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio]
|
||||
98 | #define SND_DLSYM_VERSION(version) __STRING(version)
|
||||
| ^~~~~~~~
|
||||
|
||||
Fixes: https://github.com/alsa-project/alsa-lib/issues/350
|
||||
Upstream-Status: Backport [https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c]
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
---
|
||||
include/global.h | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/global.h b/include/global.h
|
||||
index dfe9bc2b..3ecaeee8 100644
|
||||
--- a/include/global.h
|
||||
+++ b/include/global.h
|
||||
@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
|
||||
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
||||
#endif
|
||||
|
||||
+#ifndef __STRING
|
||||
+/** \brief Return 'x' argument as string */
|
||||
+#define __STRING(x) #x
|
||||
+#endif
|
||||
+
|
||||
#ifdef PIC /* dynamic build */
|
||||
|
||||
/** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
|
||||
@@ -71,11 +76,6 @@ struct snd_dlsym_link {
|
||||
|
||||
extern struct snd_dlsym_link *snd_dlsym_start;
|
||||
|
||||
-#ifndef __STRING
|
||||
-/** \brief Return 'x' argument as string */
|
||||
-#define __STRING(x) #x
|
||||
-#endif
|
||||
-
|
||||
/** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
|
||||
#define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
|
||||
/**
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Opdenacker <michael.opdenacker@bootlin.com>
|
||||
Date: Tue, 30 Jan 2024 14:24:25 +0100
|
||||
Subject: [PATCH] topology: correct version script path
|
||||
|
||||
From: Jan Palus <jpalus@fastmail.com>
|
||||
|
||||
contrary to libasound, version script for libatopology is a regular
|
||||
source file. while it's often the case that $(builddir) and $(srcdir)
|
||||
point to the same directory, they don't always have to. therefore path
|
||||
needs to point explicitly to $(srcdir) for Versions script in topology
|
||||
|
||||
Closes: https://github.com/alsa-project/alsa-lib/pull/383
|
||||
Fixes: GH-382
|
||||
Fixes: dc7da761f3a2 ("topology: separate Versions linker script")
|
||||
Signed-off-by: Jan Palus <jpalus@fastmail.com>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
Upstream-Status: Backport [https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2a736a0d2543f206fd2653aaae8a08a4c42eb917]
|
||||
---
|
||||
src/topology/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
|
||||
index 04299588..e0b78373 100644
|
||||
--- a/src/topology/Makefile.am
|
||||
+++ b/src/topology/Makefile.am
|
||||
@@ -2,7 +2,7 @@ EXTRA_DIST = Versions
|
||||
COMPATNUM=@LIBTOOL_VERSION_INFO@
|
||||
|
||||
if VERSIONED_SYMBOLS
|
||||
-VSYMS = -Wl,--version-script=Versions
|
||||
+VSYMS = -Wl,--version-script=$(srcdir)/Versions
|
||||
else
|
||||
VSYMS =
|
||||
endif
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \
|
||||
"
|
||||
|
||||
SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \
|
||||
file://0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch \
|
||||
file://0001-topology-correct-version-script-path.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e"
|
||||
SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user