From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/
Date: Fri, 22 Feb 2013 08:40:15 +0000 (UTC) [thread overview]
Message-ID: <1361522290.d09a3acfdc7aed6dbfdc51019ecf574569618e25.pesa@gentoo> (raw)
commit: d09a3acfdc7aed6dbfdc51019ecf574569618e25
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Feb 22 08:38:10 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 08:38:10 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d09a3acf
[x11-libs/qt-gui:5] Merge egl and gles2 USE flags.
Fixes bug 450492.
Package-Manager: portage-2.2.0_alpha163
---
x11-libs/qt-gui/qt-gui-5.0.9999.ebuild | 26 +++++++++++---------------
x11-libs/qt-gui/qt-gui-5.9999.ebuild | 26 +++++++++++---------------
2 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
index fe5e056..045a91c 100644
--- a/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.0.9999.ebuild
@@ -16,12 +16,11 @@ fi
# TODO: directfb, linuxfb, ibus
-IUSE="accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="accessibility eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
REQUIRED_USE="
- egl? ( gles2 )
- eglfs? ( egl evdev )
+ eglfs? ( evdev gles2 )
gles2? ( opengl )
- kms? ( egl )
+ kms? ( gles2 )
"
RDEPEND="
@@ -29,11 +28,10 @@ RDEPEND="
media-libs/freetype:2
sys-libs/zlib
~x11-libs/qt-core-${PV}[debug=,glib=]
- egl? ( media-libs/mesa[egl] )
gif? ( media-libs/giflib )
gles2? ( || (
- media-libs/mesa[gles2]
- media-libs/mesa[gles]
+ media-libs/mesa[egl,gles2]
+ media-libs/mesa[egl,gles]
) )
glib? ( dev-libs/glib:2 )
jpeg? ( virtual/jpeg )
@@ -72,19 +70,18 @@ QT5_TARGET_SUBDIRS=(
pkg_setup() {
QCONFIG_ADD="
$(use accessibility && echo accessibility-atspi-bridge)
- $(usev egl)
$(usev eglfs)
$(usev evdev)
fontconfig
- $(use gles2 && echo opengles2)
+ $(use gles2 && echo egl opengles2)
$(usev kms)
$(usev opengl)
$(use udev && echo libudev)
$(usev xcb)"
QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
- $(use egl && echo QT_EGL)
$(use eglfs && echo QT_EGLFS)
+ $(use gles2 && echo QT_EGL)
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
qt5-build_pkg_setup
@@ -96,24 +93,23 @@ src_configure() {
dbus="-dbus"
fi
- local opengl="-no-opengl"
+ local gl="-no-egl -no-opengl"
if use gles2; then
- opengl="-opengl es2"
+ gl="-egl -opengl es2"
elif use opengl; then
- opengl="-opengl desktop"
+ gl="-no-egl -opengl desktop"
fi
local myconf=(
${dbus}
- $(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
-fontconfig
$(use gif || echo -no-gif)
+ ${gl}
$(qt_use glib)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
- ${opengl}
$(qt_use png libpng system)
$(use udev || echo -no-libudev)
$(use xcb && echo -xcb -xrender)
diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
index fe5e056..045a91c 100644
--- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild
+++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild
@@ -16,12 +16,11 @@ fi
# TODO: directfb, linuxfb, ibus
-IUSE="accessibility egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
+IUSE="accessibility eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb"
REQUIRED_USE="
- egl? ( gles2 )
- eglfs? ( egl evdev )
+ eglfs? ( evdev gles2 )
gles2? ( opengl )
- kms? ( egl )
+ kms? ( gles2 )
"
RDEPEND="
@@ -29,11 +28,10 @@ RDEPEND="
media-libs/freetype:2
sys-libs/zlib
~x11-libs/qt-core-${PV}[debug=,glib=]
- egl? ( media-libs/mesa[egl] )
gif? ( media-libs/giflib )
gles2? ( || (
- media-libs/mesa[gles2]
- media-libs/mesa[gles]
+ media-libs/mesa[egl,gles2]
+ media-libs/mesa[egl,gles]
) )
glib? ( dev-libs/glib:2 )
jpeg? ( virtual/jpeg )
@@ -72,19 +70,18 @@ QT5_TARGET_SUBDIRS=(
pkg_setup() {
QCONFIG_ADD="
$(use accessibility && echo accessibility-atspi-bridge)
- $(usev egl)
$(usev eglfs)
$(usev evdev)
fontconfig
- $(use gles2 && echo opengles2)
+ $(use gles2 && echo egl opengles2)
$(usev kms)
$(usev opengl)
$(use udev && echo libudev)
$(usev xcb)"
QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY_ATSPI_BRIDGE || echo QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
- $(use egl && echo QT_EGL)
$(use eglfs && echo QT_EGLFS)
+ $(use gles2 && echo QT_EGL)
$(use jpeg && echo QT_IMAGEFORMAT_JPEG)"
qt5-build_pkg_setup
@@ -96,24 +93,23 @@ src_configure() {
dbus="-dbus"
fi
- local opengl="-no-opengl"
+ local gl="-no-egl -no-opengl"
if use gles2; then
- opengl="-opengl es2"
+ gl="-egl -opengl es2"
elif use opengl; then
- opengl="-opengl desktop"
+ gl="-no-egl -opengl desktop"
fi
local myconf=(
${dbus}
- $(qt_use egl)
$(qt_use eglfs)
$(qt_use evdev)
-fontconfig
$(use gif || echo -no-gif)
+ ${gl}
$(qt_use glib)
$(qt_use jpeg libjpeg system)
$(qt_use kms)
- ${opengl}
$(qt_use png libpng system)
$(use udev || echo -no-libudev)
$(use xcb && echo -xcb -xrender)
next reply other threads:[~2013-02-22 8:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-22 8:40 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-02-13 8:38 [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/ Davide Pesavento
2013-01-29 18:04 Michael Palimaka
2013-01-26 11:24 Davide Pesavento
2013-01-25 9:07 Davide Pesavento
2013-01-02 1:15 Davide Pesavento
2012-12-23 3:35 Davide Pesavento
2012-12-10 8:35 Davide Pesavento
2012-11-14 10:28 Davide Pesavento
2012-09-19 23:23 Davide Pesavento
2012-09-03 8:11 Davide Pesavento
2012-08-28 3:06 Davide Pesavento
2012-08-12 9:27 Davide Pesavento
2012-07-23 18:10 Davide Pesavento
2012-07-22 2:20 Davide Pesavento
2012-07-13 11:19 Ben de Groot
2012-07-05 15:58 Davide Pesavento
2012-07-02 17:26 Davide Pesavento
2012-07-02 16:00 Davide Pesavento
2012-06-10 21:29 Davide Pesavento
2012-05-06 15:09 Davide Pesavento
2012-03-17 15:57 Michael Palimaka
2012-03-11 12:59 Markos Chandras
2012-03-03 9:33 Markos Chandras
2012-02-12 9:17 Markos Chandras
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=1361522290.d09a3acfdc7aed6dbfdc51019ecf574569618e25.pesa@gentoo \
--to=pesa@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