commit:     5a6d1ab3cdd2dd00a9175ed695c929b56f02811d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 16:35:47 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 18:21:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6d1ab3

dev-qt/qtgui: Re-add qt-5.12-gcc-avx2.patch

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtgui/qtgui-5.12.3-r1.ebuild | 176 ++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)

diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild 
b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
new file mode 100644
index 00000000000..fa203bb4482
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+       jpeg +libinput +png tslib tuio +udev vnc +xcb"
+REQUIRED_USE="
+       || ( eglfs xcb )
+       accessibility? ( dbus xcb )
+       eglfs? ( egl )
+       ibus? ( dbus )
+       libinput? ( udev )
+       xcb? ( gles2? ( egl ) )
+"
+
+RDEPEND="
+       dev-libs/glib:2
+       ~dev-qt/qtcore-${PV}
+       media-libs/fontconfig
+       >=media-libs/freetype-2.6.1:2
+       >=media-libs/harfbuzz-1.6.0:=
+       sys-libs/zlib:=
+       virtual/opengl
+       dbus? ( ~dev-qt/qtdbus-${PV} )
+       egl? ( media-libs/mesa[egl] )
+       eglfs? (
+               media-libs/mesa[gbm]
+               x11-libs/libdrm
+       )
+       evdev? ( sys-libs/mtdev )
+       gles2? ( media-libs/mesa[gles2] )
+       jpeg? ( virtual/jpeg:0 )
+       libinput? (
+               dev-libs/libinput:=
+               >=x11-libs/libxkbcommon-0.5.0
+       )
+       png? ( media-libs/libpng:0= )
+       tslib? ( x11-libs/tslib )
+       tuio? ( ~dev-qt/qtnetwork-${PV} )
+       udev? ( virtual/libudev:= )
+       vnc? ( ~dev-qt/qtnetwork-${PV} )
+       xcb? (
+               x11-libs/libICE
+               x11-libs/libSM
+               x11-libs/libX11
+               >=x11-libs/libxcb-1.12:=[xkb]
+               >=x11-libs/libxkbcommon-0.5.0[X]
+               x11-libs/xcb-util-image
+               x11-libs/xcb-util-keysyms
+               x11-libs/xcb-util-renderutil
+               x11-libs/xcb-util-wm
+       )
+"
+DEPEND="${RDEPEND}
+       evdev? ( sys-kernel/linux-headers )
+       udev? ( sys-kernel/linux-headers )
+"
+PDEPEND="
+       ibus? ( app-i18n/ibus )
+"
+
+QT5_TARGET_SUBDIRS=(
+       src/tools/qvkgen
+       src/gui
+       src/openglextensions
+       src/platformheaders
+       src/platformsupport
+       src/plugins/generic
+       src/plugins/imageformats
+       src/plugins/platforms
+       src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+       accessibility:accessibility-atspi-bridge
+       egl:egl:
+       eglfs:eglfs:
+       eglfs:eglfs_egldevice:
+       eglfs:eglfs_gbm:
+       evdev:evdev:
+       evdev:mtdev:
+       :fontconfig:
+       :system-freetype:FREETYPE
+       !:no-freetype:
+       !gif:no-gif:
+       gles2::OPENGL_ES
+       gles2:opengles2:OPENGL_ES_2
+       !:no-gui:
+       :system-harfbuzz:
+       !:no-harfbuzz:
+       jpeg:system-jpeg:IMAGEFORMAT_JPEG
+       !jpeg:no-jpeg:
+       libinput
+       libinput:xkbcommon:
+       :opengl
+       png:png:
+       png:system-png:IMAGEFORMAT_PNG
+       !png:no-png:
+       tslib:tslib:
+       udev:libudev:
+       xcb:xcb:
+       xcb:xcb-glx:
+       xcb:xcb-plugin:
+       xcb:xcb-render:
+       xcb:xcb-sm:
+       xcb:xcb-xlib:
+       xcb:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+       :gui
+)
+
+PATCHES=(
+       "${FILESDIR}/qt-5.12-gcc-avx2.patch" # 672946
+)
+
+src_prepare() {
+       # don't add -O3 to CXXFLAGS, bug 549140
+       sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+       # egl_x11 is activated when both egl and xcb are enabled
+       use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || 
QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+       qt_use_disable_config dbus dbus \
+               src/platformsupport/themes/genericunix/genericunix.pri
+
+       qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+       qt_use_disable_mod ibus dbus \
+               src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+       use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+               src/plugins/platforms/platforms.pro || die
+
+       qt5-build_src_prepare
+}
+
+src_configure() {
+       local myconf=(
+               $(usex dbus -dbus-linked '')
+               $(qt_use egl)
+               $(qt_use eglfs)
+               $(usex eglfs '-gbm -kms' '')
+               $(qt_use evdev)
+               $(qt_use evdev mtdev)
+               -fontconfig
+               -system-freetype
+               $(usex gif '' -no-gif)
+               -gui
+               -system-harfbuzz
+               $(qt_use jpeg libjpeg system)
+               $(qt_use libinput)
+               -opengl $(usex gles2 es2 desktop)
+               $(qt_use png libpng system)
+               $(qt_use tslib)
+               $(qt_use udev libudev)
+               $(qt_use xcb xcb system)
+               $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
+       )
+       if use libinput || use xcb; then
+               myconf+=( -xkbcommon )
+       fi
+       qt5-build_src_configure
+}

Reply via email to