diff mbox series

[01/22] alsa-lib: upgrade 1.2.11 -> 1.2.12

Message ID 1718936206-8080-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/22] alsa-lib: upgrade 1.2.11 -> 1.2.12 | expand

Commit Message

Mingyu Wang (Fujitsu) June 21, 2024, 2:16 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...topology-correct-version-script-path.patch | 38 -------------------
 ...{alsa-lib_1.2.11.bb => alsa-lib_1.2.12.bb} |  6 +--
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-topology-correct-version-script-path.patch
 rename meta/recipes-multimedia/alsa/{alsa-lib_1.2.11.bb => alsa-lib_1.2.12.bb} (89%)
diff mbox series

Patch

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 @@ 
-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
-
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.2.12.bb
similarity index 89%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.2.11.bb
rename to 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 \
                     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"
+SRC_URI = "https://www.alsa-project.org/files/pub/lib/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "4868cd908627279da5a634f468701625be8cc251d84262c7e5b6a218391ad0d2"
 
 inherit autotools pkgconfig