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

[Davide Pesavento]

commit:     76016f5309edfd7da7f6ecbbb583b55b303ab16c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 27 14:33:58 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 14:33:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76016f53

[dev-qt/qtwidgets:5] Introduce some USE flags to keep consistency with qtgui.

Should fix the crashes reported by Franz Fellner in bug 518262#c2

Package-Manager: portage-2.2.10

---
 dev-qt/qtwidgets/metadata.xml              |  3 +++
 dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild | 22 ++++++++++++++++++++--
 dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild | 22 ++++++++++++++++++++--
 dev-qt/qtwidgets/qtwidgets-5.9999.ebuild   | 22 ++++++++++++++++++++--
 4 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 9d5bff1..10bfda0 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<use>
+		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
 		<doc>http://qt-project.org/doc/</doc>

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
index 35c598d..208edc0 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.1-r1.ebuild
@@ -16,11 +16,14 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2 +opengl +png"
+REQUIRED_USE="
+	gles2? ( opengl )
+"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
 "
 RDEPEND="${DEPEND}"
 
@@ -38,3 +41,18 @@ QT5_TARGET_SUBDIRS=(
 QT5_GENTOO_CONFIG=(
 	!:no-widgets:
 )
+
+src_configure() {
+	local gl="-no-opengl"
+	if use gles2; then
+		gl="-opengl es2"
+	elif use opengl; then
+		gl="-opengl desktop"
+	fi
+
+	local myconf=(
+		${gl}
+		$(qt_use png libpng system)
+	)
+	qt5-build_src_configure
+}

diff --git a/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
index 35c598d..208edc0 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.3.9999.ebuild
@@ -16,11 +16,14 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2 +opengl +png"
+REQUIRED_USE="
+	gles2? ( opengl )
+"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
 "
 RDEPEND="${DEPEND}"
 
@@ -38,3 +41,18 @@ QT5_TARGET_SUBDIRS=(
 QT5_GENTOO_CONFIG=(
 	!:no-widgets:
 )
+
+src_configure() {
+	local gl="-no-opengl"
+	if use gles2; then
+		gl="-opengl es2"
+	elif use opengl; then
+		gl="-opengl desktop"
+	fi
+
+	local myconf=(
+		${gl}
+		$(qt_use png libpng system)
+	)
+	qt5-build_src_configure
+}

diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
index c8844e3..1aa1cf4 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild
@@ -16,11 +16,14 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
+IUSE="gles2 +opengl +png"
+REQUIRED_USE="
+	gles2? ( opengl )
+"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=]
+	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl=,png=]
 "
 RDEPEND="${DEPEND}"
 
@@ -32,3 +35,18 @@ QT5_TARGET_SUBDIRS=(
 QT5_GENTOO_CONFIG=(
 	!:no-widgets:
 )
+
+src_configure() {
+	local gl="-no-opengl"
+	if use gles2; then
+		gl="-opengl es2"
+	elif use opengl; then
+		gl="-opengl desktop"
+	fi
+
+	local myconf=(
+		${gl}
+		$(qt_use png libpng system)
+	)
+	qt5-build_src_configure
+}