From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DD1D7138CDB for ; Wed, 10 Jun 2015 18:05:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF68FE089C; Wed, 10 Jun 2015 18:05:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C70EE089C for ; Wed, 10 Jun 2015 18:05:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F0CC3408A0 for ; Wed, 10 Jun 2015 18:05:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 92E16A0C for ; Wed, 10 Jun 2015 18:05:18 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1433959372.5d02af58a0482e6967f56e78b6ec4e9d5eff00f7.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtmultimedia/, dev-qt/qtprintsupport/, ... X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qt3d/qt3d-5.9999.ebuild dev-qt/qtdeclarative/metadata.xml dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild dev-qt/qtdiag/qtdiag-5.4.9999.ebuild dev-qt/qtdiag/qtdiag-5.5.9999.ebuild dev-qt/qtdiag/qtdiag-5.9999.ebuild dev-qt/qtgui/metadata.xml dev-qt/qtgui/qtgui-5.4.9999.ebuild dev-qt/qtgui/qtgui-5.5.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild dev-qt/qtopengl/metadata.xml dev-qt/qtopengl/qtopengl-5.4.9999.ebuild dev-qt/qtopengl/qtopengl-5.5.9999.ebuild dev-qt/qtopengl/qtopengl-5.9999.ebuild dev-qt/qtprintsupport/metadata.xml dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild dev-qt/qtwayland/qtwayland-5.4.9999.ebuild d ev-qt/qtwayland/qtwayland-5.5.9999.ebuild dev-qt/qtwayland/qtwayland-5.9999.ebuild dev-qt/qtwidgets/metadata.xml dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild dev-qt/qtwidgets/qtwidgets-5.9999.ebuild X-VCS-Directories: dev-qt/qtwidgets/ dev-qt/qtprintsupport/ dev-qt/qtgui/ dev-qt/qtdiag/ dev-qt/qtmultimedia/ dev-qt/qtdeclarative/ dev-qt/qtwayland/ dev-qt/qt3d/ dev-qt/qtopengl/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 5d02af58a0482e6967f56e78b6ec4e9d5eff00f7 X-VCS-Branch: master Date: Wed, 10 Jun 2015 18:05:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e9ea6c08-63b5-49bc-86d1-aadbefbc1324 X-Archives-Hash: 2b65ebeceea00f8738e82f1bd64d3fa5 commit: 5d02af58a0482e6967f56e78b6ec4e9d5eff00f7 Author: Davide Pesavento gentoo org> AuthorDate: Wed Jun 10 18:02:52 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jun 10 18:02:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=5d02af58 [dev-qt] Make opengl support mandatory in qtgui:5, adjust reverse deps. This helps to avoid a whole class of nasty bugs similar to #532140. dev-qt/qt3d/qt3d-5.9999.ebuild | 2 +- dev-qt/qtdeclarative/metadata.xml | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild | 4 ++-- dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 4 ++-- dev-qt/qtdiag/qtdiag-5.4.9999.ebuild | 4 ++-- dev-qt/qtdiag/qtdiag-5.5.9999.ebuild | 4 ++-- dev-qt/qtdiag/qtdiag-5.9999.ebuild | 4 ++-- dev-qt/qtgui/metadata.xml | 2 +- dev-qt/qtgui/qtgui-5.4.9999.ebuild | 26 ++++++++-------------- dev-qt/qtgui/qtgui-5.5.9999.ebuild | 26 ++++++++-------------- dev-qt/qtgui/qtgui-5.9999.ebuild | 26 ++++++++-------------- dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild | 4 +--- dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 4 +--- dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 4 +--- dev-qt/qtopengl/metadata.xml | 2 +- dev-qt/qtopengl/qtopengl-5.4.9999.ebuild | 4 ++-- dev-qt/qtopengl/qtopengl-5.5.9999.ebuild | 4 ++-- dev-qt/qtopengl/qtopengl-5.9999.ebuild | 4 ++-- dev-qt/qtprintsupport/metadata.xml | 3 +++ .../qtprintsupport/qtprintsupport-5.4.9999.ebuild | 8 +++---- .../qtprintsupport/qtprintsupport-5.5.9999.ebuild | 8 +++---- dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild | 8 +++---- dev-qt/qtwayland/qtwayland-5.4.9999.ebuild | 2 +- dev-qt/qtwayland/qtwayland-5.5.9999.ebuild | 2 +- dev-qt/qtwayland/qtwayland-5.9999.ebuild | 2 +- dev-qt/qtwidgets/metadata.xml | 2 +- dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild | 17 +++----------- dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild | 17 +++----------- dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 17 +++----------- 30 files changed, 80 insertions(+), 140 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild index 32eadeb..1dc75d1 100644 --- a/dev-qt/qt3d/qt3d-5.9999.ebuild +++ b/dev-qt/qt3d/qt3d-5.9999.ebuild @@ -16,7 +16,7 @@ IUSE="" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=] >=dev-qt/qtnetwork-${PV}:5[debug=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 0327c6d..f96540a 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -5,7 +5,7 @@ Add support for exceptions - like catching them inside the event loop (recommended by upstream) - Use OpenGL ES instead of desktop OpenGL + Use GLES 2.0 or later instead of full OpenGL Build the LocalStorage import for QtQuick (requires QtSql) Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild index 8c3b826..c98c15c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.4.9999.ebuild @@ -16,11 +16,11 @@ IUSE="gles2 localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=,gles2=] >=dev-qt/qtnetwork-${PV}:5[debug=] >=dev-qt/qttest-${PV}:5[debug=] localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] ) - widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) + widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=,gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild index 8c3b826..c98c15c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild @@ -16,11 +16,11 @@ IUSE="gles2 localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=,gles2=] >=dev-qt/qtnetwork-${PV}:5[debug=] >=dev-qt/qttest-${PV}:5[debug=] localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] ) - widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) + widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=,gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild index 8c3b826..c98c15c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild @@ -16,11 +16,11 @@ IUSE="gles2 localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=,gles2=] >=dev-qt/qtnetwork-${PV}:5[debug=] >=dev-qt/qttest-${PV}:5[debug=] localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] ) - widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) + widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=,gles2=] ) xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild index 2931d9f..e46bdf4 100644 --- a/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.4.9999.ebuild @@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="+opengl +ssl" +IUSE="+ssl" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,opengl=] + >=dev-qt/qtgui-${PV}:5[debug=] >=dev-qt/qtnetwork-${PV}:5[debug=,ssl=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild index 2931d9f..e46bdf4 100644 --- a/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.5.9999.ebuild @@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="+opengl +ssl" +IUSE="+ssl" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,opengl=] + >=dev-qt/qtgui-${PV}:5[debug=] >=dev-qt/qtnetwork-${PV}:5[debug=,ssl=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtdiag/qtdiag-5.9999.ebuild b/dev-qt/qtdiag/qtdiag-5.9999.ebuild index 2931d9f..e46bdf4 100644 --- a/dev-qt/qtdiag/qtdiag-5.9999.ebuild +++ b/dev-qt/qtdiag/qtdiag-5.9999.ebuild @@ -12,11 +12,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="+opengl +ssl" +IUSE="+ssl" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] - >=dev-qt/qtgui-${PV}:5[debug=,opengl=] + >=dev-qt/qtgui-${PV}:5[debug=] >=dev-qt/qtnetwork-${PV}:5[debug=,ssl=] " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index 88b6e72..ce6b0b5 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -8,7 +8,7 @@ Enable evdev input support Add support for exceptions - like catching them inside the event loop (recommended by upstream) - Use OpenGL ES 2.0 instead of desktop OpenGL + Use GLES 2.0 or later instead of full OpenGL Enable dev-libs/glib eventloop support Build a Qt style called GTK+ that mimics the active GTK+ theme diff --git a/dev-qt/qtgui/qtgui-5.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.4.9999.ebuild index 3700b08..9db4a88 100644 --- a/dev-qt/qtgui/qtgui-5.4.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.4.9999.ebuild @@ -14,11 +14,10 @@ fi # TODO: directfb, linuxfb, offscreen (auto-depends on X11) -IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb" +IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb" REQUIRED_USE=" - egl? ( evdev opengl ) + egl? ( evdev ) eglfs? ( egl ) - gles2? ( opengl ) kms? ( egl gles2 ) " @@ -28,6 +27,7 @@ RDEPEND=" media-libs/fontconfig media-libs/freetype:2 >=sys-libs/zlib-1.2.5 + virtual/opengl egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( @@ -44,7 +44,6 @@ RDEPEND=" virtual/libudev:= x11-libs/libdrm ) - opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( @@ -72,6 +71,7 @@ PDEPEND=" QT5_TARGET_SUBDIRS=( src/gui + src/openglextensions src/platformheaders src/platformsupport src/plugins/generic @@ -99,7 +99,7 @@ QT5_GENTOO_CONFIG=( jpeg:system-jpeg:IMAGEFORMAT_JPEG !jpeg:no-jpeg: kms:kms: - opengl + :opengl png:png: png:system-png:IMAGEFORMAT_PNG !png:no-png: @@ -115,7 +115,6 @@ QT5_GENTOO_CONFIG=( ) pkg_setup() { - use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) @@ -125,28 +124,21 @@ pkg_setup() { } src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - $(use accessibility && use xcb && echo -dbus-linked) - $(use ibus && echo -dbus-linked) + $(use accessibility && usex xcb -dbus-linked '') + $(usex ibus -dbus-linked '') $(qt_use egl) $(qt_use eglfs) $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(use gif || echo -no-gif) - ${gl} + $(usex gif '' -no-gif) $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use udev libudev) $(qt_use xcb xcb system) diff --git a/dev-qt/qtgui/qtgui-5.5.9999.ebuild b/dev-qt/qtgui/qtgui-5.5.9999.ebuild index 501d785..1d6cd43 100644 --- a/dev-qt/qtgui/qtgui-5.5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.5.9999.ebuild @@ -14,11 +14,10 @@ fi # TODO: directfb, linuxfb, offscreen (auto-depends on X11) -IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb" +IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb" REQUIRED_USE=" - egl? ( evdev opengl ) + egl? ( evdev ) eglfs? ( egl ) - gles2? ( opengl ) kms? ( egl gles2 ) " @@ -28,6 +27,7 @@ RDEPEND=" media-libs/fontconfig >=media-libs/freetype-2.5.5:2 >=sys-libs/zlib-1.2.5 + virtual/opengl egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( @@ -44,7 +44,6 @@ RDEPEND=" virtual/libudev:= x11-libs/libdrm ) - opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( @@ -72,6 +71,7 @@ PDEPEND=" QT5_TARGET_SUBDIRS=( src/gui + src/openglextensions src/platformheaders src/platformsupport src/plugins/generic @@ -99,7 +99,7 @@ QT5_GENTOO_CONFIG=( jpeg:system-jpeg:IMAGEFORMAT_JPEG !jpeg:no-jpeg: kms:kms: - opengl + :opengl png:png: png:system-png:IMAGEFORMAT_PNG !png:no-png: @@ -115,7 +115,6 @@ QT5_GENTOO_CONFIG=( ) pkg_setup() { - use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) @@ -125,28 +124,21 @@ pkg_setup() { } src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - $(use accessibility && use xcb && echo -dbus-linked) - $(use ibus && echo -dbus-linked) + $(use accessibility && usex xcb -dbus-linked '') + $(usex ibus -dbus-linked '') $(qt_use egl) $(qt_use eglfs) $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(use gif || echo -no-gif) - ${gl} + $(usex gif '' -no-gif) $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use udev libudev) $(qt_use xcb xcb system) diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 501d785..1d6cd43 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -14,11 +14,10 @@ fi # TODO: directfb, linuxfb, offscreen (auto-depends on X11) -IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb" +IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb" REQUIRED_USE=" - egl? ( evdev opengl ) + egl? ( evdev ) eglfs? ( egl ) - gles2? ( opengl ) kms? ( egl gles2 ) " @@ -28,6 +27,7 @@ RDEPEND=" media-libs/fontconfig >=media-libs/freetype-2.5.5:2 >=sys-libs/zlib-1.2.5 + virtual/opengl egl? ( media-libs/mesa[egl] ) evdev? ( sys-libs/mtdev ) gtkstyle? ( @@ -44,7 +44,6 @@ RDEPEND=" virtual/libudev:= x11-libs/libdrm ) - opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) udev? ( virtual/libudev:= ) xcb? ( @@ -72,6 +71,7 @@ PDEPEND=" QT5_TARGET_SUBDIRS=( src/gui + src/openglextensions src/platformheaders src/platformsupport src/plugins/generic @@ -99,7 +99,7 @@ QT5_GENTOO_CONFIG=( jpeg:system-jpeg:IMAGEFORMAT_JPEG !jpeg:no-jpeg: kms:kms: - opengl + :opengl png:png: png:system-png:IMAGEFORMAT_PNG !png:no-png: @@ -115,7 +115,6 @@ QT5_GENTOO_CONFIG=( ) pkg_setup() { - use opengl && QT5_TARGET_SUBDIRS+=(src/openglextensions) use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2) use ibus && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus) use xcb && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose) @@ -125,28 +124,21 @@ pkg_setup() { } src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - $(use accessibility && use xcb && echo -dbus-linked) - $(use ibus && echo -dbus-linked) + $(use accessibility && usex xcb -dbus-linked '') + $(usex ibus -dbus-linked '') $(qt_use egl) $(qt_use eglfs) $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(use gif || echo -no-gif) - ${gl} + $(usex gif '' -no-gif) $(qt_use gtkstyle) $(qt_use harfbuzz harfbuzz system) $(qt_use jpeg libjpeg system) $(qt_use kms) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use udev libudev) $(qt_use xcb xcb system) diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild index 09c0f8a..270c9ce 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild @@ -13,7 +13,6 @@ fi IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets" -# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 RDEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] >=dev-qt/qtgui-${PV}:5[debug=] @@ -30,8 +29,7 @@ RDEPEND=" openal? ( media-libs/openal ) ) widgets? ( - >=dev-qt/qtgui-${PV}:5[debug=,opengl=] - >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=] + >=dev-qt/qtwidgets-${PV}:5[debug=] opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) ) " diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild index 09c0f8a..270c9ce 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild @@ -13,7 +13,6 @@ fi IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets" -# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 RDEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] >=dev-qt/qtgui-${PV}:5[debug=] @@ -30,8 +29,7 @@ RDEPEND=" openal? ( media-libs/openal ) ) widgets? ( - >=dev-qt/qtgui-${PV}:5[debug=,opengl=] - >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=] + >=dev-qt/qtwidgets-${PV}:5[debug=] opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) ) " diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild index 09c0f8a..270c9ce 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild @@ -13,7 +13,6 @@ fi IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets" -# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2 RDEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] >=dev-qt/qtgui-${PV}:5[debug=] @@ -30,8 +29,7 @@ RDEPEND=" openal? ( media-libs/openal ) ) widgets? ( - >=dev-qt/qtgui-${PV}:5[debug=,opengl=] - >=dev-qt/qtwidgets-${PV}:5[debug=,opengl=] + >=dev-qt/qtwidgets-${PV}:5[debug=] opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] ) ) " diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml index 8c0140b..34cefc3 100644 --- a/dev-qt/qtopengl/metadata.xml +++ b/dev-qt/qtopengl/metadata.xml @@ -7,7 +7,7 @@ contexts on the desktop Add support for exceptions - like catching them inside the event loop (recommended by upstream) - Use OpenGL ES 2.0 instead of desktop OpenGL + Use GLES 2.0 or later instead of full OpenGL Enable the Qt3Support libraries for Qt4 diff --git a/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild index 39db0e1..a1d46c1 100644 --- a/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.4.9999.ebuild @@ -17,8 +17,8 @@ IUSE="gles2" DEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl] - ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl] + ~dev-qt/qtgui-${PV}[debug=,gles2=] + ~dev-qt/qtwidgets-${PV}[debug=,gles2=] virtual/opengl " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild index 39db0e1..a1d46c1 100644 --- a/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.5.9999.ebuild @@ -17,8 +17,8 @@ IUSE="gles2" DEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl] - ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl] + ~dev-qt/qtgui-${PV}[debug=,gles2=] + ~dev-qt/qtwidgets-${PV}[debug=,gles2=] virtual/opengl " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtopengl/qtopengl-5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.9999.ebuild index 39db0e1..a1d46c1 100644 --- a/dev-qt/qtopengl/qtopengl-5.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.9999.ebuild @@ -17,8 +17,8 @@ IUSE="gles2" DEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,opengl] - ~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl] + ~dev-qt/qtgui-${PV}[debug=,gles2=] + ~dev-qt/qtwidgets-${PV}[debug=,gles2=] virtual/opengl " RDEPEND="${DEPEND}" diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml index afb3b43..8090c86 100644 --- a/dev-qt/qtprintsupport/metadata.xml +++ b/dev-qt/qtprintsupport/metadata.xml @@ -2,6 +2,9 @@ qt + + Use GLES 2.0 or later instead of full OpenGL + https://bugreports.qt.io/ http://doc.qt.io/ diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild index 143e976..12fafab 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.4.9999.ebuild @@ -13,13 +13,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -# keep IUSE defaults in sync with qtgui -IUSE="cups +opengl" +IUSE="cups gles2" RDEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,opengl=] - ~dev-qt/qtwidgets-${PV}[debug=,opengl=] + ~dev-qt/qtgui-${PV}[debug=,gles2=] + ~dev-qt/qtwidgets-${PV}[debug=,gles2=] cups? ( >=net-print/cups-1.4 ) " DEPEND="${RDEPEND} @@ -38,6 +37,7 @@ QT5_GENTOO_CONFIG=( src_configure() { local myconf=( $(qt_use cups) + -opengl $(usex gles2 es2 desktop) ) qt5-build_src_configure } diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild index 143e976..12fafab 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.5.9999.ebuild @@ -13,13 +13,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -# keep IUSE defaults in sync with qtgui -IUSE="cups +opengl" +IUSE="cups gles2" RDEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,opengl=] - ~dev-qt/qtwidgets-${PV}[debug=,opengl=] + ~dev-qt/qtgui-${PV}[debug=,gles2=] + ~dev-qt/qtwidgets-${PV}[debug=,gles2=] cups? ( >=net-print/cups-1.4 ) " DEPEND="${RDEPEND} @@ -38,6 +37,7 @@ QT5_GENTOO_CONFIG=( src_configure() { local myconf=( $(qt_use cups) + -opengl $(usex gles2 es2 desktop) ) qt5-build_src_configure } diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild index 143e976..12fafab 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild @@ -13,13 +13,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -# keep IUSE defaults in sync with qtgui -IUSE="cups +opengl" +IUSE="cups gles2" RDEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,opengl=] - ~dev-qt/qtwidgets-${PV}[debug=,opengl=] + ~dev-qt/qtgui-${PV}[debug=,gles2=] + ~dev-qt/qtwidgets-${PV}[debug=,gles2=] cups? ( >=net-print/cups-1.4 ) " DEPEND="${RDEPEND} @@ -38,6 +37,7 @@ QT5_GENTOO_CONFIG=( src_configure() { local myconf=( $(qt_use cups) + -opengl $(usex gles2 es2 desktop) ) qt5-build_src_configure } diff --git a/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild index b59e121..2673e1d 100644 --- a/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.4.9999.ebuild @@ -16,7 +16,7 @@ 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=,egl=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=,egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) diff --git a/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild index b59e121..2673e1d 100644 --- a/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.5.9999.ebuild @@ -16,7 +16,7 @@ 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=,egl=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=,egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) diff --git a/dev-qt/qtwayland/qtwayland-5.9999.ebuild b/dev-qt/qtwayland/qtwayland-5.9999.ebuild index b59e121..2673e1d 100644 --- a/dev-qt/qtwayland/qtwayland-5.9999.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.9999.ebuild @@ -16,7 +16,7 @@ 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=,egl=,opengl] + >=dev-qt/qtgui-${PV}:5[debug=,egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] ) diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml index 87f5b74..4727795 100644 --- a/dev-qt/qtwidgets/metadata.xml +++ b/dev-qt/qtwidgets/metadata.xml @@ -3,7 +3,7 @@ qt - Use OpenGL ES 2.0 instead of desktop OpenGL + Use GLES 2.0 or later instead of full OpenGL Build a Qt style called GTK+ that mimics the active GTK+ theme diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild index b96b9be..3f85273 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.4.9999.ebuild @@ -13,14 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtkstyle +opengl +png +xcb" -REQUIRED_USE=" - gles2? ( opengl ) -" +IUSE="gles2 gtkstyle +png +xcb" DEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?] + ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,png=,xcb?] " RDEPEND="${DEPEND}" @@ -34,17 +31,9 @@ QT5_GENTOO_CONFIG=( ) src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - # copied from qtgui - ${gl} $(qt_use gtkstyle) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use xcb xcb system) $(qt_use xcb xkbcommon system) diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild index b96b9be..3f85273 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.5.9999.ebuild @@ -13,14 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtkstyle +opengl +png +xcb" -REQUIRED_USE=" - gles2? ( opengl ) -" +IUSE="gles2 gtkstyle +png +xcb" DEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?] + ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,png=,xcb?] " RDEPEND="${DEPEND}" @@ -34,17 +31,9 @@ QT5_GENTOO_CONFIG=( ) src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - # copied from qtgui - ${gl} $(qt_use gtkstyle) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use xcb xcb system) $(qt_use xcb xkbcommon system) diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild index b96b9be..3f85273 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild @@ -13,14 +13,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # keep IUSE defaults in sync with qtgui -IUSE="gles2 gtkstyle +opengl +png +xcb" -REQUIRED_USE=" - gles2? ( opengl ) -" +IUSE="gles2 gtkstyle +png +xcb" DEPEND=" ~dev-qt/qtcore-${PV}[debug=] - ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?] + ~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,png=,xcb?] " RDEPEND="${DEPEND}" @@ -34,17 +31,9 @@ QT5_GENTOO_CONFIG=( ) src_configure() { - local gl="-no-opengl" - if use gles2; then - gl="-opengl es2" - elif use opengl; then - gl="-opengl desktop" - fi - local myconf=( - # copied from qtgui - ${gl} $(qt_use gtkstyle) + -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use xcb xcb system) $(qt_use xcb xkbcommon system)