summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2025-12-16 22:16:00 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2025-12-16 22:16:00 +0000
commit19677e173af0c98b7d14383eb3829f4f345006c2 (patch)
tree77360c8af5c9f1587e44a4dddd7d0d554d3820bf
parente6d19c0d7ce3a6c4d777b333832c98732b4a1c13 (diff)
parent411aa8d837c1e088c6bee03d30cf14795db761ab (diff)
downloadkde-19677e173af0c98b7d14383eb3829f4f345006c2.tar.gz
kde-19677e173af0c98b7d14383eb3829f4f345006c2.tar.bz2
kde-19677e173af0c98b7d14383eb3829f4f345006c2.zip
Merge updates from master
-rw-r--r--media-gfx/kphotoalbum/kphotoalbum-9999.ebuild10
-rw-r--r--media-gfx/kphotoalbum/metadata.xml5
2 files changed, 5 insertions, 10 deletions
diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
index 253fc12b297..3dd679daa00 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
@@ -19,12 +19,11 @@ fi
LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
SLOT="0"
-IUSE="+map phonon +raw share +vlc"
-
-REQUIRED_USE="|| ( phonon vlc )"
+IUSE="+map +raw share"
DEPEND="
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml]
+ >=dev-qt/qtmultimedia-${QTMIN}:6
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kcolorscheme-${KFMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6
@@ -42,10 +41,8 @@ DEPEND="
media-gfx/exiv2:=
media-libs/libjpeg-turbo:=
map? ( kde-apps/marble:6 )
- phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] )
raw? ( kde-apps/libkdcraw:6 )
share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
- vlc? ( media-video/vlc:= )
"
RDEPEND="${DEPEND}
!${CATEGORY}/${PN}:5
@@ -56,11 +53,10 @@ DOCS=( CHANGELOG.{md,old} README.md )
src_configure() {
local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_LIBVLC=ON
$(cmake_use_find_package map Marble)
- $(cmake_use_find_package phonon Phonon4Qt6)
$(cmake_use_find_package raw KDcrawQt6)
$(cmake_use_find_package share KF6Purpose)
- $(cmake_use_find_package vlc LIBVLC)
)
ecm_src_configure
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 0fd7db4de42..f56e8376c76 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,12 +6,11 @@
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kphotoalbum</bugs-to>
+ <remote-id type="kde-invent">graphics/kphotoalbum</remote-id>
</upstream>
<use>
<flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
- <flag name="phonon">Enable <pkg>media-libs/phonon</pkg> video backend (known to crash on some video formats)</flag>
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
- <flag name="vlc">Enable <pkg>media-video/vlc</pkg> video backend (recommended for X11)</flag>
</use>
</pkgmetadata>