Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtopengl/
Date: Fri, 03 Oct 2014 00:41:42
Message-Id: 1412296868.8cb8b0a9b0b8962590fa4f6ed2c0fbb00e0c4cc0.pesa@gentoo
1 commit: 8cb8b0a9b0b8962590fa4f6ed2c0fbb00e0c4cc0
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 3 00:41:08 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 3 00:41:08 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8cb8b0a9
7
8 [dev-qt/qtopengl:5] Introduce USE=gles2 to fix bug #522838.
9
10 Package-Manager: portage-2.2.14_rc1
11
12 ---
13 dev-qt/qtopengl/metadata.xml | 1 +
14 dev-qt/qtopengl/qtopengl-5.3.9999.ebuild | 8 ++++----
15 dev-qt/qtopengl/qtopengl-5.4.0_alpha.ebuild | 8 ++++----
16 dev-qt/qtopengl/qtopengl-5.4.9999.ebuild | 8 ++++----
17 dev-qt/qtopengl/qtopengl-5.9999.ebuild | 8 ++++----
18 5 files changed, 17 insertions(+), 16 deletions(-)
19
20 diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
21 index 36aa10d..b278220 100644
22 --- a/dev-qt/qtopengl/metadata.xml
23 +++ b/dev-qt/qtopengl/metadata.xml
24 @@ -7,6 +7,7 @@
25 contexts on the desktop</flag>
26 <flag name="exceptions">Add support for exceptions - like catching them
27 inside the event loop (recommended by Nokia)</flag>
28 + <flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
29 <flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
30 </use>
31 <upstream>
32
33 diff --git a/dev-qt/qtopengl/qtopengl-5.3.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.3.9999.ebuild
34 index 37b266c..21c2ec5 100644
35 --- a/dev-qt/qtopengl/qtopengl-5.3.9999.ebuild
36 +++ b/dev-qt/qtopengl/qtopengl-5.3.9999.ebuild
37 @@ -17,12 +17,12 @@ else
38 KEYWORDS="~amd64 ~x86"
39 fi
40
41 -IUSE=""
42 +IUSE="gles2"
43
44 DEPEND="
45 ~dev-qt/qtcore-${PV}[debug=]
46 - ~dev-qt/qtgui-${PV}[debug=,opengl]
47 - ~dev-qt/qtwidgets-${PV}[debug=]
48 + ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
49 + ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
50 virtual/opengl
51 "
52 RDEPEND="${DEPEND}"
53 @@ -33,7 +33,7 @@ QT5_TARGET_SUBDIRS=(
54
55 src_configure() {
56 local myconf=(
57 - -opengl
58 + -opengl $(usex gles2 es2 desktop)
59 )
60 qt5-build_src_configure
61 }
62
63 diff --git a/dev-qt/qtopengl/qtopengl-5.4.0_alpha.ebuild b/dev-qt/qtopengl/qtopengl-5.4.0_alpha.ebuild
64 index 1cbf05e..8fe5549 100644
65 --- a/dev-qt/qtopengl/qtopengl-5.4.0_alpha.ebuild
66 +++ b/dev-qt/qtopengl/qtopengl-5.4.0_alpha.ebuild
67 @@ -17,12 +17,12 @@ else
68 KEYWORDS="~amd64 ~x86"
69 fi
70
71 -IUSE=""
72 +IUSE="gles2"
73
74 DEPEND="
75 ~dev-qt/qtcore-${PV}[debug=]
76 - ~dev-qt/qtgui-${PV}[debug=,opengl]
77 - ~dev-qt/qtwidgets-${PV}[debug=]
78 + ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
79 + ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
80 virtual/opengl
81 "
82 RDEPEND="${DEPEND}"
83 @@ -33,7 +33,7 @@ QT5_TARGET_SUBDIRS=(
84
85 src_configure() {
86 local myconf=(
87 - -opengl
88 + -opengl $(usex gles2 es2 desktop)
89 )
90 qt5-build_src_configure
91 }
92
93 diff --git a/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild
94 index 1cbf05e..8fe5549 100644
95 --- a/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild
96 +++ b/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild
97 @@ -17,12 +17,12 @@ else
98 KEYWORDS="~amd64 ~x86"
99 fi
100
101 -IUSE=""
102 +IUSE="gles2"
103
104 DEPEND="
105 ~dev-qt/qtcore-${PV}[debug=]
106 - ~dev-qt/qtgui-${PV}[debug=,opengl]
107 - ~dev-qt/qtwidgets-${PV}[debug=]
108 + ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
109 + ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
110 virtual/opengl
111 "
112 RDEPEND="${DEPEND}"
113 @@ -33,7 +33,7 @@ QT5_TARGET_SUBDIRS=(
114
115 src_configure() {
116 local myconf=(
117 - -opengl
118 + -opengl $(usex gles2 es2 desktop)
119 )
120 qt5-build_src_configure
121 }
122
123 diff --git a/dev-qt/qtopengl/qtopengl-5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.9999.ebuild
124 index 1cbf05e..8fe5549 100644
125 --- a/dev-qt/qtopengl/qtopengl-5.9999.ebuild
126 +++ b/dev-qt/qtopengl/qtopengl-5.9999.ebuild
127 @@ -17,12 +17,12 @@ else
128 KEYWORDS="~amd64 ~x86"
129 fi
130
131 -IUSE=""
132 +IUSE="gles2"
133
134 DEPEND="
135 ~dev-qt/qtcore-${PV}[debug=]
136 - ~dev-qt/qtgui-${PV}[debug=,opengl]
137 - ~dev-qt/qtwidgets-${PV}[debug=]
138 + ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
139 + ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
140 virtual/opengl
141 "
142 RDEPEND="${DEPEND}"
143 @@ -33,7 +33,7 @@ QT5_TARGET_SUBDIRS=(
144
145 src_configure() {
146 local myconf=(
147 - -opengl
148 + -opengl $(usex gles2 es2 desktop)
149 )
150 qt5-build_src_configure
151 }