From 1d1d8b3f57f4a953892f876e64597d420eefd8d0 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Thu, 8 Feb 2024 09:44:03 +0100 Subject: 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 Signed-off-by: Richard Purdie --- ...ve-__STRING-macro-outside-PIC-ifdef-block.patch | 52 ---------------------- ...0001-topology-correct-version-script-path.patch | 38 ++++++++++++++++ meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb | 46 ------------------- meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb | 46 +++++++++++++++++++ 4 files changed, 84 insertions(+), 98 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch deleted file mode 100644 index 9a7ba0d847..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-global.h-move-__STRING-macro-outside-PIC-ifdef-block.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001 -From: Michael Opdenacker -Date: Wed, 6 Sep 2023 15:16:44 +0200 -Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block - -From: Jaroslav Kysela - -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 ---- - 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 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch new file mode 100644 index 0000000000..30aeef5817 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch @@ -0,0 +1,38 @@ +From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Tue, 30 Jan 2024 14:24:25 +0100 +Subject: [PATCH] topology: correct version script path + +From: Jan Palus + +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 +Signed-off-by: Jaroslav Kysela +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 + diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb deleted file mode 100644 index 83bc6877d2..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.10.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "ALSA sound library" -DESCRIPTION = "(Occasionally a.k.a. libasound) is a userspace library that \ -provides a level of abstraction over the /dev interfaces provided by the kernel modules." -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" -SECTION = "libs/multimedia" -LICENSE = "LGPL-2.1-only & GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ - file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ - " - -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 \ - " -SRC_URI[sha256sum] = "c86a45a846331b1b0aa6e6be100be2a7aef92efd405cf6bac7eef8174baa920e" - -inherit autotools pkgconfig - -EXTRA_OECONF += " \ - ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-softfloat', '', d)} \ - --disable-python --disable-old-symbols \ -" - -PACKAGES =+ "alsa-server alsa-conf libatopology" - -FILES:alsa-server = "${bindir}/*" -FILES:alsa-conf = "${datadir}/alsa/" -FILES:libatopology = "${libdir}/libatopology.so.*" - -RDEPENDS:${PN}:class-target = "alsa-conf alsa-ucm-conf" -RDEPENDS:libatopology:class-target = "alsa-topology-conf" - -# upgrade path -RPROVIDES:${PN} = "libasound" -RREPLACES:${PN} = "libasound" -RCONFLICTS:${PN} = "libasound" - -RPROVIDES:${PN}-dev = "alsa-dev" -RREPLACES:${PN}-dev = "alsa-dev" -RCONFLICTS:${PN}-dev = "alsa-dev" - -RPROVIDES:alsa-conf = "alsa-conf-base" -RREPLACES:alsa-conf = "alsa-conf-base" -RCONFLICTS:alsa-conf = "alsa-conf-base" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb new file mode 100644 index 0000000000..c212b17aa3 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb @@ -0,0 +1,46 @@ +SUMMARY = "ALSA sound library" +DESCRIPTION = "(Occasionally a.k.a. libasound) is a userspace library that \ +provides a level of abstraction over the /dev interfaces provided by the kernel modules." +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" +SECTION = "libs/multimedia" +LICENSE = "LGPL-2.1-only & GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ + file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ + " + +SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ + file://0001-topology-correct-version-script-path.patch \ + " +SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d" + +inherit autotools pkgconfig + +EXTRA_OECONF += " \ + ${@bb.utils.contains('TARGET_FPU', 'soft', '--with-softfloat', '', d)} \ + --disable-python --disable-old-symbols \ +" + +PACKAGES =+ "alsa-server alsa-conf libatopology" + +FILES:alsa-server = "${bindir}/*" +FILES:alsa-conf = "${datadir}/alsa/" +FILES:libatopology = "${libdir}/libatopology.so.*" + +RDEPENDS:${PN}:class-target = "alsa-conf alsa-ucm-conf" +RDEPENDS:libatopology:class-target = "alsa-topology-conf" + +# upgrade path +RPROVIDES:${PN} = "libasound" +RREPLACES:${PN} = "libasound" +RCONFLICTS:${PN} = "libasound" + +RPROVIDES:${PN}-dev = "alsa-dev" +RREPLACES:${PN}-dev = "alsa-dev" +RCONFLICTS:${PN}-dev = "alsa-dev" + +RPROVIDES:alsa-conf = "alsa-conf-base" +RREPLACES:alsa-conf = "alsa-conf-base" +RCONFLICTS:alsa-conf = "alsa-conf-base" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf