summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2025-11-01 11:04:23 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2025-11-01 11:04:23 +0000
commit4c33fbed22987793eca70a6d0375340ec09ce484 (patch)
tree14235d9b8475f77d7d41ae0d8a9826073b9e83f7
parent10585669956e8e942eb016e120b758816b6a8708 (diff)
parent68cda1dc92a2ae806678a42c2a43b4bc164c4e80 (diff)
downloadkde-4c33fbed22987793eca70a6d0375340ec09ce484.tar.gz
kde-4c33fbed22987793eca70a6d0375340ec09ce484.tar.bz2
kde-4c33fbed22987793eca70a6d0375340ec09ce484.zip
Merge updates from master
-rw-r--r--kde-apps/kdenlive/kdenlive-25.08.49.9999.ebuild2
-rw-r--r--kde-apps/kdenlive/kdenlive-9999.ebuild7
2 files changed, 4 insertions, 5 deletions
diff --git a/kde-apps/kdenlive/kdenlive-25.08.49.9999.ebuild b/kde-apps/kdenlive/kdenlive-25.08.49.9999.ebuild
index f66432abe0a..2a6e9163fb4 100644
--- a/kde-apps/kdenlive/kdenlive-25.08.49.9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-25.08.49.9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/purpose-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
- >=media-libs/mlt-7.28.0[ffmpeg,frei0r,qt6,sdl,xml]
+ >=media-libs/mlt-7.28.0:=[ffmpeg,frei0r,qt6,sdl,xml]
media-video/ffmpeg:=[encode(+),libass,sdl,X]
media-libs/opentimelineio:=
v4l? ( media-libs/libv4l )
diff --git a/kde-apps/kdenlive/kdenlive-9999.ebuild b/kde-apps/kdenlive/kdenlive-9999.ebuild
index a3a95f0da14..9960bdc866b 100644
--- a/kde-apps/kdenlive/kdenlive-9999.ebuild
+++ b/kde-apps/kdenlive/kdenlive-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdenlive.org/en/"
LICENSE="GPL-3"
SLOT="6"
KEYWORDS=""
-IUSE="gles2-only semantic-desktop v4l"
+IUSE="gles2-only semantic-desktop"
RESTRICT="test" # segfaults, bug 684132
@@ -27,6 +27,7 @@ DEPEND="
>=dev-qt/qtmultimedia-${QTMIN}:6
>=dev-qt/qtnetworkauth-${QTMIN}:6
>=dev-qt/qtsvg-${QTMIN}:6
+ >=gui-libs/kddockwidgets-2.2.5:=
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
>=kde-frameworks/kcodecs-${KFMIN}:6
@@ -53,9 +54,8 @@ DEPEND="
>=kde-frameworks/purpose-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-video/ffmpeg:=[encode(+),libass,sdl,X]
- >=media-libs/mlt-7.28.0[ffmpeg,frei0r,qt6,sdl,xml]
+ >=media-libs/mlt-7.28.0:=[ffmpeg,frei0r,qt6,sdl,xml]
media-libs/opentimelineio:=
- v4l? ( media-libs/libv4l )
"
RDEPEND="${DEPEND}
>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
@@ -66,7 +66,6 @@ DEPEND+=" virtual/os-headers"
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package v4l LibV4L2)
# disable fetching of opentimelineio
-DFETCH_OTIO=OFF
)