commit:     7f9ada54cb358916796ea3108ef72d371542134f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 10:53:35 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 10:53:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f9ada54

kde-plasma/kwin: introduce gstreamer USE flag by popular request.

Package-Manager: portage-2.2.20.1

 kde-plasma/kwin/files/kwin-gstreamer-optional.patch | 15 +++++++++++++++
 kde-plasma/kwin/kwin-5.4.49.9999.ebuild             | 10 ++++++++--
 kde-plasma/kwin/kwin-9999.ebuild                    | 10 ++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/kwin/files/kwin-gstreamer-optional.patch 
b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
new file mode 100644
index 0000000..d9ace47
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
@@ -0,0 +1,15 @@
+Disable the effect video button if gstreamer is missing.
+
+diff --git a/kcmkwin/kwincompositing/qml/Effect.qml 
b/kcmkwin/kwincompositing/qml/Effect.qml
+index fcd5e8a..2331da2 100644
+--- a/kcmkwin/kwincompositing/qml/Effect.qml
++++ b/kcmkwin/kwincompositing/qml/Effect.qml
+@@ -144,7 +144,7 @@ Rectangle {
+ 
+         Button {
+             id: videoButton
+-            visible: model.VideoRole.toString() !== ""
++            visible: false
+             iconName: "video"
+             onClicked: videoItem.showHide()
+         }

diff --git a/kde-plasma/kwin/kwin-5.4.49.9999.ebuild 
b/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
index 02c64a7..aad35e3 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 wayland"
+IUSE="gles2 gstreamer wayland"
 
 COMMON_DEPEND="
        $(add_frameworks_dep kactivities)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
        dev-qt/qtdbus:5
        dev-qt/qtdeclarative:5
        dev-qt/qtgui:5[gles2=,opengl(+)]
-       dev-qt/qtmultimedia:5[gstreamer,qml]
        dev-qt/qtscript:5
        dev-qt/qtwidgets:5
        dev-qt/qtx11extras:5
@@ -64,6 +63,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
+       gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
        !kde-base/kwin
        !kde-base/systemsettings
 "
@@ -75,6 +75,12 @@ DEPEND="${COMMON_DEPEND}
        test? ( x11-libs/xcb-util-wm )
 "
 
+src_prepare() {
+       kde5_src_prepare
+
+       use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_find_package wayland)

diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 6b00476..29049e5 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"
+IUSE="gles2 gstreamer"
 
 COMMON_DEPEND="
        $(add_frameworks_dep kactivities)
@@ -44,7 +44,6 @@ COMMON_DEPEND="
        dev-qt/qtdbus:5
        dev-qt/qtdeclarative:5
        dev-qt/qtgui:5[gles2=,opengl(+)]
-       dev-qt/qtmultimedia:5[gstreamer,qml]
        dev-qt/qtscript:5
        dev-qt/qtwayland:5
        dev-qt/qtwidgets:5
@@ -62,6 +61,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
        $(add_plasma_dep kde-cli-tools)
+       gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
        !kde-base/kwin
        !kde-base/systemsettings
 "
@@ -72,3 +72,9 @@ DEPEND="${COMMON_DEPEND}
        x11-proto/xproto
        test? ( x11-libs/xcb-util-wm )
 "
+
+src_prepare() {
+       kde5_src_prepare
+
+       use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}

Reply via email to