commit: f80953b33d31d16e1a969816c020a6f1c7049bbd Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Apr 2 18:40:14 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Apr 2 18:40:14 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f80953b3
kde-apps/kmix: Deal with upstream sndio mess Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kmix-25.03.90-revert-sndio-automagic.patch | 37 ++++++++++++++++++++++ kde-apps/kmix/kmix-25.03.90.ebuild | 2 ++ kde-apps/kmix/kmix-25.04.49.9999.ebuild | 2 ++ kde-apps/kmix/kmix-9999.ebuild | 2 ++ 4 files changed, 43 insertions(+) diff --git a/kde-apps/kmix/files/kmix-25.03.90-revert-sndio-automagic.patch b/kde-apps/kmix/files/kmix-25.03.90-revert-sndio-automagic.patch new file mode 100644 index 0000000000..fafb7617c9 --- /dev/null +++ b/kde-apps/kmix/files/kmix-25.03.90-revert-sndio-automagic.patch @@ -0,0 +1,37 @@ +From 55b5b20e18f40cfaa7df21bbf7f4ec3cd4ea57ad Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 2 Apr 2025 20:36:25 +0200 +Subject: [PATCH] Disable sndio detection + +Until it is fixed upstream: +https://invent.kde.org/multimedia/kmix/-/merge_requests/32 +https://invent.kde.org/multimedia/kmix/-/merge_requests/32#note_1182527 + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e831f673..114bebae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,6 +91,7 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS + ########### sound backend support ################################################################## + #################################################################################################### + ++if (0) + # sndio, only for that platform + check_include_file("sndio.h" HAVE_SYS_SNDIO_H) + if (HAVE_SYS_SNDIO_H) +@@ -99,6 +100,7 @@ if (HAVE_SYS_SNDIO_H) + add_definitions(-DHAVE_SNDIO_MIXER) + set(SUPPORTED_BACKENDS ${SUPPORTED_BACKENDS} "Sndio") + endif () ++endif () + + # Sun Audio, only for that platform + check_include_file("sys/audioio.h" HAVE_SYS_AUDIOIO_H) +-- +2.49.0 + diff --git a/kde-apps/kmix/kmix-25.03.90.ebuild b/kde-apps/kmix/kmix-25.03.90.ebuild index d717b72293..dcf5d56a43 100644 --- a/kde-apps/kmix/kmix-25.03.90.ebuild +++ b/kde-apps/kmix/kmix-25.03.90.ebuild @@ -46,6 +46,8 @@ PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" # Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29 "${FILESDIR}/${PN}-24.12.2-revert-kcm_pulseaudio-dep.patch" + # Regressed in: https://invent.kde.org/multimedia/kmix/-/merge_requests/32 + "${FILESDIR}/${P}-revert-sndio-automagic.patch" ) src_configure() { diff --git a/kde-apps/kmix/kmix-25.04.49.9999.ebuild b/kde-apps/kmix/kmix-25.04.49.9999.ebuild index fc6db3e919..e9980de848 100644 --- a/kde-apps/kmix/kmix-25.04.49.9999.ebuild +++ b/kde-apps/kmix/kmix-25.04.49.9999.ebuild @@ -46,6 +46,8 @@ PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" # Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29 "${FILESDIR}/${PN}-24.12.2-revert-kcm_pulseaudio-dep.patch" + # Regressed in: https://invent.kde.org/multimedia/kmix/-/merge_requests/32 + "${FILESDIR}/${PN}-25.03.90-revert-sndio-automagic.patch" ) src_configure() { diff --git a/kde-apps/kmix/kmix-9999.ebuild b/kde-apps/kmix/kmix-9999.ebuild index b4c65a926d..dd15f95de0 100644 --- a/kde-apps/kmix/kmix-9999.ebuild +++ b/kde-apps/kmix/kmix-9999.ebuild @@ -46,6 +46,8 @@ PATCHES=( "${FILESDIR}/${PN}-23.04.2-autostart_disable.patch" # Pending: https://invent.kde.org/multimedia/kmix/-/merge_requests/29 "${FILESDIR}/${PN}-24.12.2-revert-kcm_pulseaudio-dep.patch" + # Regressed in: https://invent.kde.org/multimedia/kmix/-/merge_requests/32 + "${FILESDIR}/${PN}-25.03.90-revert-sndio-automagic.patch" ) src_configure() {
