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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/
Date: Fri, 16 Oct 2015 17:53:50 +0000 (UTC)	[thread overview]
Message-ID: <1445018021.5819750fc983386edd11d90680082626675dc948.kensington@gentoo> (raw)

commit:     5819750fc983386edd11d90680082626675dc948
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 17:52:53 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 17:53:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=5819750f

dev-qt/qtquick1: introduce gles2 USE flag

opengl/gles2 selection in libqmlshadersplugin.so happens automagically based
on how qtgui is built.

Package-Manager: portage-2.2.20.1

 dev-qt/qtquick1/metadata.xml             | 1 +
 dev-qt/qtquick1/qtquick1-5.5.0.ebuild    | 7 +++++--
 dev-qt/qtquick1/qtquick1-5.5.1.ebuild    | 7 +++++--
 dev-qt/qtquick1/qtquick1-5.5.9999.ebuild | 7 +++++--
 dev-qt/qtquick1/qtquick1-5.6.9999.ebuild | 7 +++++--
 dev-qt/qtquick1/qtquick1-5.9999.ebuild   | 7 +++++--
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index ff6648b..c4dea83 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>qt</herd>
 	<use>
 		<flag name="designer">Build plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="webkit">Build the WebView import for QtQuick1 (requires QtWebKit)</flag>
 		<flag name="xml">Build the XmlListModel import for QtQuick1 (requires QtXmlPatterns)</flag>
 	</use>

diff --git a/dev-qt/qtquick1/qtquick1-5.5.0.ebuild b/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
 		~dev-qt/designer-${PV}
 		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	opengl? (
+		>=dev-qt/qtgui-${PV}:5[gles2=]
+		>=dev-qt/qtopengl-${PV}:5
+	)
 	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "

diff --git a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild b/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
 		~dev-qt/designer-${PV}
 		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	opengl? (
+		>=dev-qt/qtgui-${PV}:5[gles2=]
+		>=dev-qt/qtopengl-${PV}:5
+	)
 	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "

diff --git a/dev-qt/qtquick1/qtquick1-5.5.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.5.9999.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
 		~dev-qt/designer-${PV}
 		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	opengl? (
+		>=dev-qt/qtgui-${PV}:5[gles2=]
+		>=dev-qt/qtopengl-${PV}:5
+	)
 	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "

diff --git a/dev-qt/qtquick1/qtquick1-5.6.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.6.9999.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.6.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.6.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
 		~dev-qt/designer-${PV}
 		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	opengl? (
+		>=dev-qt/qtgui-${PV}:5[gles2=]
+		>=dev-qt/qtopengl-${PV}:5
+	)
 	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "

diff --git a/dev-qt/qtquick1/qtquick1-5.9999.ebuild b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
index e2c3c3c..527e552 100644
--- a/dev-qt/qtquick1/qtquick1-5.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="designer opengl webkit xml"
+IUSE="designer gles2 opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
@@ -25,7 +25,10 @@ DEPEND="
 		~dev-qt/designer-${PV}
 		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	opengl? (
+		>=dev-qt/qtgui-${PV}:5[gles2=]
+		>=dev-qt/qtopengl-${PV}:5
+	)
 	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "

next             reply	other threads:[~2015-10-16 17:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-16 17:53 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-06-16 12:34 [gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/ Davide Pesavento
2016-04-12  1:12 Davide Pesavento
2016-04-10 17:00 Davide Pesavento
2016-02-10 15:20 Davide Pesavento
2016-02-10 13:26 Michael Palimaka
2016-01-06 13:58 Michael Palimaka
2015-07-13  1:35 Davide Pesavento
2015-03-17 17:14 Davide Pesavento
2015-03-17 14:48 Michael Palimaka
2015-03-16 16:03 Michael Palimaka
2014-06-27 17:42 Michael Palimaka

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ff6648b dfblob:c4dea83 dfblob:e2c3c3c dfblob:527e552
dfblob:e2c3c3c dfblob:527e552 dfblob:e2c3c3c dfblob:527e552
dfblob:e2c3c3c dfblob:527e552 dfblob:e2c3c3c dfblob:527e552 )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: dev-qt/qtquick1/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445018021.5819750fc983386edd11d90680082626675dc948.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox