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 2536F13800E for ; Sun, 12 Aug 2012 09:27:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A03C4E02FB; Sun, 12 Aug 2012 09:27:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5B63AE02FB for ; Sun, 12 Aug 2012 09:27:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98A881B4019 for ; Sun, 12 Aug 2012 09:27:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 097C3E543A for ; Sun, 12 Aug 2012 09:27:33 +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: <1344763546.e6aae956daebf4a3ea7438469e68de5a2981b2e2.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-libs/qt-gui/ X-VCS-Repository: proj/qt X-VCS-Files: x11-libs/qt-gui/metadata.xml x11-libs/qt-gui/qt-gui-5.9999.ebuild X-VCS-Directories: x11-libs/qt-gui/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: e6aae956daebf4a3ea7438469e68de5a2981b2e2 X-VCS-Branch: master Date: Sun, 12 Aug 2012 09:27:33 +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: d50684d3-2fbe-4ad6-aee1-812e17149973 X-Archives-Hash: 253f5d1a646ed63c61a80cec649abdda commit: e6aae956daebf4a3ea7438469e68de5a2981b2e2 Author: Davide Pesavento gmail com> AuthorDate: Sun Aug 12 09:25:46 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Aug 12 09:25:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e6aae956 [x11-libs/qt-gui:5] Implement several new USE flags, make fontconfig mandatory. This should also fix bug 430290. --- x11-libs/qt-gui/metadata.xml | 7 +++- x11-libs/qt-gui/qt-gui-5.9999.ebuild | 52 ++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml index 98454c7..d86d15d 100644 --- a/x11-libs/qt-gui/metadata.xml +++ b/x11-libs/qt-gui/metadata.xml @@ -5,13 +5,16 @@ Build Qt using the C++11 standard Build Qt using the C++11 standard - Use EGL instead of default GLX to manage OpenGL - contexts on the desktop + Use EGL instead of default GLX to manage OpenGL contexts + Compile EGL Full Screen/Single Surface support + Enable evdev input support Add support for exceptions - like catching them inside the event loop (recommended by Nokia) + Use OpenGL ES 2.0 instead of desktop OpenGL Enable dev-libs/glib eventloop support Build a Qt style called GTK+ that mimics the active GTK+ theme + Enable KMS-based QPA plugin Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. diff --git a/x11-libs/qt-gui/qt-gui-5.9999.ebuild b/x11-libs/qt-gui/qt-gui-5.9999.ebuild index 442804d..3ad5546 100644 --- a/x11-libs/qt-gui/qt-gui-5.9999.ebuild +++ b/x11-libs/qt-gui/qt-gui-5.9999.ebuild @@ -14,19 +14,34 @@ else KEYWORDS="~amd64" fi -# TODO: directfb, eglfs, kms, linuxfb, evdev, ibus +# TODO: directfb, linuxfb, ibus -IUSE="egl +fontconfig gif +glib jpeg opengl +png udev +xcb" +IUSE="egl eglfs evdev gif gles2 +glib jpeg kms opengl +png udev +xcb" +REQUIRED_USE=" + egl? ( gles2 ) + eglfs? ( egl evdev ) + gles2? ( opengl ) + kms? ( egl ) +" RDEPEND=" + media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ~x11-libs/qt-core-${PV}[debug=,glib=] egl? ( media-libs/mesa[egl] ) - fontconfig? ( media-libs/fontconfig ) gif? ( media-libs/giflib ) + gles2? ( || ( + media-libs/mesa[gles2] + media-libs/mesa[gles] + ) ) glib? ( dev-libs/glib:2 ) jpeg? ( virtual/jpeg ) + kms? ( + media-libs/mesa[gbm] + sys-fs/udev + x11-libs/libdrm + ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0 ) udev? ( sys-fs/udev ) @@ -41,6 +56,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} + evdev? ( sys-kernel/linux-headers ) test? ( ~x11-libs/qt-network-${PV}[debug=] ) " @@ -52,26 +68,44 @@ QT5_TARGET_SUBDIRS=( ) pkg_setup() { - QCONFIG_ADD="accessibility - $(usev fontconfig) - $(usev opengl) - $(use udev && echo libudev)" + QCONFIG_ADD=" + accessibility + $(usev egl) + $(usev eglfs) + $(usev evdev) + fontconfig + $(use gles2 && echo opengles2) + $(usev kms) + $(usev opengl) + $(use udev && echo libudev) + $(usev xcb)" QCONFIG_DEFINE="$(use egl && echo QT_EGL) + $(use eglfs && echo QT_EGLFS) $(use jpeg && echo QT_IMAGEFORMAT_JPEG)" qt5-build_pkg_setup } src_configure() { + local opengl="-no-opengl" + if use gles2; then + opengl="-opengl es2" + elif use opengl; then + opengl="-opengl desktop" + fi + local myconf=( -accessibility $(qt_use egl) - $(qt_use fontconfig) + $(qt_use eglfs) + $(qt_use evdev) + -fontconfig $(use gif || echo -no-gif) $(qt_use glib) $(qt_use jpeg libjpeg system) - $(qt_use opengl) + $(qt_use kms) + ${opengl} $(qt_use png libpng system) $(use udev || echo -no-libudev) $(use xcb && echo -xcb -xrender)