commit: 697a0cfde73a693679f5b5e3c9c31451b4c1e8f3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 15 13:27:40 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 15 13:43:17 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697a0cfd
media-sound/amarok: Add IUSE zeroconf Bug: https://bugs.gentoo.org/969175 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...{amarok-3.3.2.ebuild => amarok-3.3.2-r1.ebuild} | 7 ++- .../files/amarok-3.3.2-optional-zeroconf.patch | 54 ++++++++++++++++++++++ media-sound/amarok/metadata.xml | 1 + 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/media-sound/amarok/amarok-3.3.2.ebuild b/media-sound/amarok/amarok-3.3.2-r1.ebuild similarity index 96% rename from media-sound/amarok/amarok-3.3.2.ebuild rename to media-sound/amarok/amarok-3.3.2-r1.ebuild index aadcd2864de4..65071b402b36 100644 --- a/media-sound/amarok/amarok-3.3.2.ebuild +++ b/media-sound/amarok/amarok-3.3.2-r1.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://amarok.kde.org/"; LICENSE="GPL-2" SLOT="0" -IUSE="ipod lastfm mariadb mtp podcast webengine X" +IUSE="ipod lastfm mariadb mtp podcast webengine X zeroconf" # ipod requires gdk enabled and also gtk compiled in libgpod DEPEND=" @@ -40,7 +40,6 @@ DEPEND=" >=kde-frameworks/kcrash-${KFMIN}:6 >=kde-frameworks/kdbusaddons-${KFMIN}:6 >=kde-frameworks/kdeclarative-${KFMIN}:6 - >=kde-frameworks/kdnssd-${KFMIN}:6 >=kde-frameworks/kglobalaccel-${KFMIN}:6 >=kde-frameworks/kguiaddons-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 @@ -75,6 +74,7 @@ DEPEND=" mtp? ( media-libs/libmtp ) podcast? ( >=media-libs/libmygpo-qt-1.1.0_pre20240811 ) webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] ) + zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 ) " RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 @@ -86,6 +86,8 @@ BDEPEND="${PYTHON_DEPS} virtual/pkgconfig " +PATCHES=( "${FILESDIR}/${P}-optional-zeroconf.patch" ) + src_configure() { local mycmakeargs=( -DWITH_EMBEDDED_DB=OFF @@ -100,6 +102,7 @@ src_configure() { $(cmake_use_find_package podcast Mygpo-qt6) $(cmake_use_find_package webengine Qt6WebEngineWidgets) -DWITH_X11=$(usex X) + -DWITH_DAAP=$(usex zeroconf) ) use ipod && mycmakeargs+=( $(cmake_use_find_package ipod GDKPixBuf) ) diff --git a/media-sound/amarok/files/amarok-3.3.2-optional-zeroconf.patch b/media-sound/amarok/files/amarok-3.3.2-optional-zeroconf.patch new file mode 100644 index 000000000000..e3bd10e3d444 --- /dev/null +++ b/media-sound/amarok/files/amarok-3.3.2-optional-zeroconf.patch @@ -0,0 +1,54 @@ +From 63ef6769bdde90da0020d8fa2e8b138e59c8e26e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Fri, 13 Feb 2026 13:04:31 +0100 +Subject: [PATCH] Add WITH_DAAP CMake option to be able to build without + KF6DNSSD (zeroconf) + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 6 +++++- + src/core-impl/collections/CMakeLists.txt | 4 +++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 858244633e..2abf33d83d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,6 @@ find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS + CoreAddons + Crash + DBusAddons +- DNSSD + DocTools + GlobalAccel + GuiAddons +@@ -108,6 +107,11 @@ option(WITH_GPODDER "Enable gpodder.net support" ON) + option(WITH_IPOD "Enable iPod support in Amarok" ON) + option(WITH_LASTFM "Enable last.fm support" ON) + option(WITH_EMBEDDED_DB "Build the embedded database library" ON) ++option(WITH_DAAP "Enable support for Digital Audio Access Protocol collections" ON) ++ ++if(WITH_DAAP) ++ find_package(KF${KF_MAJOR_VERSION}DNSSD ${KF_MIN_VERSION} REQUIRED) ++endif() + + ############### Taglib + set(TAGLIB_MIN_VERSION "1.12") +diff --git a/src/core-impl/collections/CMakeLists.txt b/src/core-impl/collections/CMakeLists.txt +index 5c2674afa0..afe9b3aedb 100644 +--- a/src/core-impl/collections/CMakeLists.txt ++++ b/src/core-impl/collections/CMakeLists.txt +@@ -4,7 +4,9 @@ include_directories( + + set(AMAROK_COLLECTION_SUPPORT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/support) + +-add_subdirectory( daap ) ++if(WITH_DAAP) ++ add_subdirectory( daap ) ++endif() + + if(NOT WIN32) + add_subdirectory( audiocd ) +-- +GitLab + diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml index 27433610de3b..bfe251117634 100644 --- a/media-sound/amarok/metadata.xml +++ b/media-sound/amarok/metadata.xml @@ -15,5 +15,6 @@ <flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag> <flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag> <flag name="webengine">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag> + <flag name="zeroconf">Enable DAAP collections support using <pkg>kde-frameworks/kdnssd</pkg></flag> </use> </pkgmetadata>
