From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F354815802C for ; Sun, 15 Dec 2024 16:38:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA0ADE0AB0; Sun, 15 Dec 2024 16:38:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7432E0AB0 for ; Sun, 15 Dec 2024 16:38:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F243342FAA for ; Sun, 15 Dec 2024 16:38:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4A9EEB9 for ; Sun, 15 Dec 2024 16:38:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1734280157.7cfd0c86dff91f57c0da3af1a5fbe04fa344ee8c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/alsa-lib/alsa-lib-1.2.13-r1.ebuild media-libs/alsa-lib/alsa-lib-1.2.13.ebuild media-libs/alsa-lib/files/alsa-lib-1.2.13-seq-ump-headers.patch X-VCS-Directories: media-libs/alsa-lib/ media-libs/alsa-lib/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7cfd0c86dff91f57c0da3af1a5fbe04fa344ee8c X-VCS-Branch: master Date: Sun, 15 Dec 2024 16:38:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e299978-a78f-494e-8ab1-1f4f1f3a84a4 X-Archives-Hash: 7cd9fb51c9f080faebcd16273bcf9c02 commit: 7cfd0c86dff91f57c0da3af1a5fbe04fa344ee8c Author: Sam James gentoo org> AuthorDate: Sun Dec 15 16:29:17 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 15 16:29:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cfd0c86 media-libs/alsa-lib: restore include in headers Consumers were relying on it and upstream have restored it, so restore the include in a header via a backport. Closes: https://bugs.gentoo.org/943696 Signed-off-by: Sam James gentoo.org> ...lib-1.2.13.ebuild => alsa-lib-1.2.13-r1.ebuild} | 1 + .../files/alsa-lib-1.2.13-seq-ump-headers.patch | 50 ++++++++++++++++++++++ 2 files changed, 51 insertions(+) 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 similarity index 97% rename from media-libs/alsa-lib/alsa-lib-1.2.13.ebuild rename to 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 +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 +--- 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 +