[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     294785ead65c5debc18335e7f5a381dc4264f25f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 23:42:16 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 16 23:42:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=294785ea

[dev-qt/qtwayland] Add egl and xcomposite USE flags.

Package-Manager: portage-2.2.10

---
 dev-qt/qtwayland/metadata.xml              |  1 +
 dev-qt/qtwayland/qtwayland-5.3.9999.ebuild | 17 ++++++++++++++---
 dev-qt/qtwayland/qtwayland-5.9999.ebuild   | 17 ++++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index f5fa5ab..6596561 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
+		<flag name="egl">Use EGL instead of GLX to manage OpenGL contexts</flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
 		<flag name="wayland-compositor">Build Qt compositor for wayland</flag>
 	</use>

diff --git a/dev-qt/qtwayland/qtwayland-5.3.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.3.9999.ebuild
index f61b2a6..fae9358 100644
--- a/dev-qt/qtwayland/qtwayland-5.3.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.3.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION="Wayland plugin for Qt"
+DESCRIPTION="Wayland platform plugin for Qt"
 HOMEPAGE="http://qt-project.org/wiki/QtWayland"
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
@@ -15,13 +15,19 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="qml wayland-compositor"
+IUSE="egl qml wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.3.0
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	media-libs/mesa[egl?]
+	>=x11-libs/libxkbcommon-0.2.0
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -29,5 +35,10 @@ src_configure() {
 	if use wayland-compositor; then
 		echo "CONFIG += wayland-compositor" >> "${QT5_BUILD_DIR}"/.qmake.cache
 	fi
+
+	if ! use xcomposite; then
+		echo "CONFIG += done_config_xcomposite" >> "${QT5_BUILD_DIR}"/.qmake.cache
+	fi
+
 	qt5-build_src_configure
 }

diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
index f61b2a6..fae9358 100644
--- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit qt5-build
 
-DESCRIPTION="Wayland plugin for Qt"
+DESCRIPTION="Wayland platform plugin for Qt"
 HOMEPAGE="http://qt-project.org/wiki/QtWayland"
 
 if [[ ${QT5_BUILD_TYPE} == live ]]; then
@@ -15,13 +15,19 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="qml wayland-compositor"
+IUSE="egl qml wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.3.0
 	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl]
+	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	media-libs/mesa[egl?]
+	>=x11-libs/libxkbcommon-0.2.0
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	xcomposite? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -29,5 +35,10 @@ src_configure() {
 	if use wayland-compositor; then
 		echo "CONFIG += wayland-compositor" >> "${QT5_BUILD_DIR}"/.qmake.cache
 	fi
+
+	if ! use xcomposite; then
+		echo "CONFIG += done_config_xcomposite" >> "${QT5_BUILD_DIR}"/.qmake.cache
+	fi
+
 	qt5-build_src_configure
 }