commit: cc771837b72e5724c209c1e1b1fd805a1d356862
Author: Pablo Cholaky <waltercool <AT> slash <DOT> cl>
AuthorDate: Tue Oct 20 23:44:33 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 17:40:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc771837
kde-plasma/kwin: Support multimedia USE flag instead gstreamer
kde-plasma/kwin/kwin-5.4.49.9999.ebuild | 12 ++++++++----
kde-plasma/kwin/kwin-9999.ebuild | 12 ++++++++----
kde-plasma/kwin/metadata.xml | 1 +
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
b/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
index ef6e8dd..f7375e3 100644
--- a/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="gles2 gstreamer wayland"
+IUSE="gles2 multimedia wayland"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -63,7 +63,12 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
- gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
+ multimedia? (
+ || (
+ dev-qt/qtmultimedia:5[gstreamer,qml]
+ dev-qt/qtmultimedia:5[gstreamer010,qml] )
+ )
+ )
!kde-base/kwin:4
!kde-base/systemsettings:4
"
@@ -77,8 +82,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
kde5_src_prepare
-
- use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+ use multimedia || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
}
src_configure() {
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 7cc7efd..af57433 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="gles2 gstreamer"
+IUSE="gles2 multimedia"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -61,7 +61,12 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
- gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
+ multimedia? (
+ || (
+ dev-qt/qtmultimedia:5[gstreamer,qml]
+ dev-qt/qtmultimedia:5[gstreamer010,qml]
+ )
+ )
!kde-base/kwin:4
!kde-base/systemsettings:4
"
@@ -75,6 +80,5 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
kde5_src_prepare
-
- use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+ use multimedia || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
}
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 9a1ee92..843ec22 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -4,5 +4,6 @@
<herd>kde</herd>
<use>
<flag name="gles2">Use OpenGL ES 2 instead of full GL</flag>
+ <flag name="multimedia">Enable effect video button in desktop
effects KCM</flag>
</use>
</pkgmetadata>
