gentoo auto-resync : 16:12:2024 - 02:01:58

3 files changed, 53 insertions, 1 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d27f62a67909..75f2c4600388 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,11 @@
 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-seq-ump-headers.patch 1262 BLAKE2B eb4c76aa3d72d026690881b7a051b8da6b8f8837120889a364a85e16fe76190d57fbd23c52c6f5ab52262805e0ff29d3a22270beae14bcbbd25f4c02f2c72391 SHA512 13c5c009505ff502ac52c0f7745c947c49cf6332e26d667f876ef4afbe6b240ff7f87946d1b5d542260d020e599336d54e37d17d7ad72532581792a85fb41d12
 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 2588 BLAKE2B f63344a40d1d07be7c8ba1b57634d872aad48f5c334e8b3d95e55a512e91264ff1f197a38b54ec011ce096cf9219da1ea713362536f75d06a9e5ccd150246454 SHA512 67caebc57c286cdc5c13e7a77e5edd8fe5c56a8d56d126369fd21873a224df37a75e3b831a2316c1de3efd0d47e35fb76eedd0589c8b804f911084a8ce14c76e
-EBUILD alsa-lib-1.2.13.ebuild 2663 BLAKE2B b62c2967fabfcdfaa89cd6ff789ac6cf0ba9ec4463171638292d4e9d64fefaa6864862ab98ded0c1812852386a1ecfbd866a8f9466feedf210ec81118b7d6321 SHA512 903b799ac0966c29e9e5df249c2867fd8f834b501df7cfbc075512cd0a67043f837d4aa70ddd0eaa6bfbcf576772f9d40b88860831f68a7ceb360bf23f758aa9
+EBUILD alsa-lib-1.2.13-r1.ebuild 2727 BLAKE2B cc2c46ac14e2d89783c33eb29e3c7c5105cf445bf1a9921cb5027dc808c56118a5c9cf0e3b66d7c7098976d4f66f7c912371d5e00071563d31ecd4eda15dd75d SHA512 fde7620308c114b6f529e40f62ed4577003d6d50903ae2ca416ab41e4320ce9b56fe90fe2f1e56927967becd5e233252132bc2ec48215838a3f5954fba14bb50
 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-r1.ebuild
index b6efb887b5db..8b47c423b17e 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.13.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild
@@ -35,6 +35,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
+	"${FILESDIR}/${PN}-1.2.13-seq-ump-headers.patch" # bug #943696
 )
 
 pkg_setup() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch
new file mode 100644
index 000000000000..fd38d8274804
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/943696#c10
+https://github.com/alsa-project/alsa-lib/commit/07cee0ba05179a56764c35975d5822420d4f31f9
+
+From 07cee0ba05179a56764c35975d5822420d4f31f9 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sun, 24 Nov 2024 09:33:16 +0100
+Subject: [PATCH] seq: include UMP headers
+
+Some applications seem including alsa/seqmid.h individually, and this
+got broken with the update of alsa-lib because now we have
+dependencies to UMP stuff.  Include the necessary UMP headers
+internally.  Also, add the inclusion of rawmidi.h in ump.h for similar
+reasons.
+
+Link: https://bugzilla.suse.com/show_bug.cgi?id=1233682
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+--- a/include/seq.h
++++ b/include/seq.h
+@@ -29,6 +29,8 @@
+ #ifndef __ALSA_SEQ_H
+ #define __ALSA_SEQ_H
+ 
++#include "ump.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+--- a/include/seq_event.h
++++ b/include/seq_event.h
+@@ -28,6 +28,8 @@
+ #ifndef __ALSA_SEQ_EVENT_H
+ #define __ALSA_SEQ_EVENT_H
+ 
++#include "ump_msg.h"
++
+ /**
+  *  \defgroup SeqEvents Sequencer Event Definitions
+  *  Sequencer Event Definitions
+--- a/include/ump.h
++++ b/include/ump.h
+@@ -9,6 +9,8 @@
+ #ifndef __ALSA_UMP_H
+ #define __ALSA_UMP_H
+ 
++#include "rawmidi.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+