gentoo auto-resync : 24:11:2024 - 03:02:54

3 files changed, 41 insertions, 1 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 37ac0faa2638..bbba121df743 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,9 +1,10 @@
 AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90
 AUX alsa-lib-1.2.11-topology-correct-version-script-path.patch 1167 BLAKE2B 0540456e96eb47279d952b888d7c7ada54b7850e0a2a091b98bafc7969e97cdd829ecf7572a03eaa8b5da3d8e548b3c787eda66502673954bd583809b98a5f3d SHA512 a8ed806a9a98a0c351a76f043bb8344746f5258c13d8d08be547556e0f9c1c65472398d9d6cdeb87c22fb1340b8cc23c10bb1aee42063544c31f4afbcf8fa84e
+AUX alsa-lib-1.2.13-update-symbol-name.patch 1574 BLAKE2B d685102ff60f4ed1bcdca4cf943110aa9abd3d4a421668804b60a38409fd83f1213661355d77a39a0bd8fe55f02e5750fb77fcdd284f0cf7709082d292797833 SHA512 d283736ae62eb055d0a5c7200b555193b6a57300887483310756f94ddca16b6a11f22fdf91998d3673a2c470279b677d4002c682d503dc1e3984cf22a3920379
 DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d
 DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0db8cccf58e997b9d619aac5c74288b69220589efdcd3917eb1d781ef71be5fcd16d997c59c069fe20788d1a479068 SHA512 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d
 DIST alsa-lib-1.2.13.tar.bz2 1116739 BLAKE2B 1723ca5f191525e050f05423fb9ccf4501e4f20490d01b0c068493bbce279d3a067e8d0e5f52f9c76c2eaecb4c2b3fc42690193b88c313461fce2aec390175b3 SHA512 b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0
 EBUILD alsa-lib-1.2.11.ebuild 2659 BLAKE2B 53310377ed59b845962bc6e77e69ef010a58c006f47692a755c44bf7fd3e539cef531fa692b43254a26a54071b77e55c7722b54dab9d73a71fff9ddd9bc39b55 SHA512 120e70af3e0cd5bdd66c40e18cc88caf9453cca6bdf9dabfc989dc1b9175ec6726983616548a87873a3bc2569e06592aba40810261195e4653fa7d9985a6ab5e
 EBUILD alsa-lib-1.2.12.ebuild 2589 BLAKE2B b3ad782b31515af4e21fc59b805bc95a1033844af33d94475fc889a23a199442cf03361fff7273fd4fc6875d37a8ebba554d5c9d1f70dbeddda6bb086831c55d SHA512 a17bf77c10a814a1d8150cc14a3c0d1a9341e80132fde5a3bd736be302d5ad650c84ab7ce57380171f9eab79d6278dc3423be623699894dd7a0e12fc2e62706c
-EBUILD alsa-lib-1.2.13.ebuild 2596 BLAKE2B 4846bcbcfdcb74afea02c74ac915db796b1851985479b9c467bc24a89628e40946fa156b2c845bbef82bdf075d2840b8ebb5d2f4b407810c0817953df29565ac SHA512 1b99b8693701ca0e8dba6f9ad983dfb19703dd1d6db61705432f4f7ef5666c034abb93cf4c2a341ec5aefaadb0b981cd6b98b45d2895e565fb027c191c285cf1
+EBUILD alsa-lib-1.2.13.ebuild 2663 BLAKE2B b62c2967fabfcdfaa89cd6ff789ac6cf0ba9ec4463171638292d4e9d64fefaa6864862ab98ded0c1812852386a1ecfbd866a8f9466feedf210ec81118b7d6321 SHA512 903b799ac0966c29e9e5df249c2867fd8f834b501df7cfbc075512cd0a67043f837d4aa70ddd0eaa6bfbcf576772f9d40b88860831f68a7ceb360bf23f758aa9
 MISC metadata.xml 508 BLAKE2B 5d7cb196ffea7d75c228f28cfbc88b7c3ca7e18b4f8f790dd51718bce508679fb61073f0df0a192028c57bf3c8f99e3838c7c061dc408ae915b84213fd14b383 SHA512 4b682f9fa77d3287e0e56e39c6aa97b06129f85cc1dd898efac0682dd33f6b22ca20e08dcb95423ac953eafde7d2850db9c5a363156eaefa2c1752dd72011a4c
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.13.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.13.ebuild
index 68a5a702382e..b6efb887b5db 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.13.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.13.ebuild
@@ -34,6 +34,7 @@ BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+	"${FILESDIR}/${PN}-1.2.13-update-symbol-name.patch" # bug #943399
 )
 
 pkg_setup() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-update-symbol-name.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-update-symbol-name.patch
new file mode 100644
index 000000000000..637c06bef0b3
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.13-update-symbol-name.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/943399
+https://github.com/alsa-project/alsa-lib/issues/420
+https://github.com/alsa-project/alsa-lib/pull/421
+https://github.com/alsa-project/alsa-lib/commit/76edab4e595bd5f3f4c636cccc8d7976d3c519d6
+
+From 76edab4e595bd5f3f4c636cccc8d7976d3c519d6 Mon Sep 17 00:00:00 2001
+From: Nicholas Vinson <nvinson234@gmail.com>
+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 <nvinson234@gmail.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- 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