diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2024-06-21 10:16:25 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-25 11:50:58 +0100 |
| commit | a5e2fd4fe3cad9b8e84993630ee5aab49614d9b9 (patch) | |
| tree | b166d86fe42836ec2619b6fc3ed629210159ce25 /meta/recipes-multimedia | |
| parent | 1080de9926c8f6c1905225e5c360584323db6f0d (diff) | |
| download | poky-a5e2fd4fe3cad9b8e84993630ee5aab49614d9b9.tar.gz | |
alsa-lib: upgrade 1.2.11 -> 1.2.12
0001-topology-correct-version-script-path.patch
removed since it's included in 1.2.12.
Changelog:
- GitHub Actions: Use actions/checkout@v4
- pcm: plug - add automatic conversion for iec958 subframe samples
(From OE-Core rev: 3fc26e927b6a304025aaa1e0bee606bf8c59b125)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.2.12.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb) | 6 |
2 files changed, 2 insertions, 42 deletions
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 deleted file mode 100644 index 30aeef5817..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Michael Opdenacker <michael.opdenacker@bootlin.com> | ||
| 3 | Date: Tue, 30 Jan 2024 14:24:25 +0100 | ||
| 4 | Subject: [PATCH] topology: correct version script path | ||
| 5 | |||
| 6 | From: Jan Palus <jpalus@fastmail.com> | ||
| 7 | |||
| 8 | contrary to libasound, version script for libatopology is a regular | ||
| 9 | source file. while it's often the case that $(builddir) and $(srcdir) | ||
| 10 | point to the same directory, they don't always have to. therefore path | ||
| 11 | needs to point explicitly to $(srcdir) for Versions script in topology | ||
| 12 | |||
| 13 | Closes: https://github.com/alsa-project/alsa-lib/pull/383 | ||
| 14 | Fixes: GH-382 | ||
| 15 | Fixes: dc7da761f3a2 ("topology: separate Versions linker script") | ||
| 16 | Signed-off-by: Jan Palus <jpalus@fastmail.com> | ||
| 17 | Signed-off-by: Jaroslav Kysela <perex@perex.cz> | ||
| 18 | Upstream-Status: Backport [https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff;h=2a736a0d2543f206fd2653aaae8a08a4c42eb917] | ||
| 19 | --- | ||
| 20 | src/topology/Makefile.am | 2 +- | ||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am | ||
| 24 | index 04299588..e0b78373 100644 | ||
| 25 | --- a/src/topology/Makefile.am | ||
| 26 | +++ b/src/topology/Makefile.am | ||
| 27 | @@ -2,7 +2,7 @@ EXTRA_DIST = Versions | ||
| 28 | COMPATNUM=@LIBTOOL_VERSION_INFO@ | ||
| 29 | |||
| 30 | if VERSIONED_SYMBOLS | ||
| 31 | -VSYMS = -Wl,--version-script=Versions | ||
| 32 | +VSYMS = -Wl,--version-script=$(srcdir)/Versions | ||
| 33 | else | ||
| 34 | VSYMS = | ||
| 35 | endif | ||
| 36 | -- | ||
| 37 | 2.34.1 | ||
| 38 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.12.bb index c212b17aa3..d9136052b7 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.2.12.bb | |||
| @@ -9,10 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7 \ | |||
| 9 | file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ | 9 | file://src/socket.c;md5=285675b45e83f571c6a957fe4ab79c93;beginline=9;endline=24 \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2 \ | 12 | SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2" |
| 13 | file://0001-topology-correct-version-script-path.patch \ | 13 | SRC_URI[sha256sum] = "4868cd908627279da5a634f468701625be8cc251d84262c7e5b6a218391ad0d2" |
| 14 | " | ||
| 15 | SRC_URI[sha256sum] = "9f3f2f69b995f9ad37359072fbc69a3a88bfba081fc83e9be30e14662795bb4d" | ||
| 16 | 14 | ||
| 17 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
| 18 | 16 | ||
