Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/
Date: Wed, 25 Dec 2019 16:02:07
Message-Id: 1577289705.e1ff865a50246c32c1772795066971345fc579ae.asturm@gentoo
1 commit: e1ff865a50246c32c1772795066971345fc579ae
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 25 15:51:30 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 25 16:01:45 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ff865a
7
8 dev-qt/qtgui: Raise minimum dependency for USE=tslib
9
10 Closes: https://bugs.gentoo.org/703336
11 Package-Manager: Portage-2.3.83, Repoman-2.3.20
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 dev-qt/qtgui/qtgui-5.14.0-r1.ebuild | 186 ++++++++++++++++++++++++++++++++++++
15 1 file changed, 186 insertions(+)
16
17 diff --git a/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild
18 new file mode 100644
19 index 00000000000..592b885552c
20 --- /dev/null
21 +++ b/dev-qt/qtgui/qtgui-5.14.0-r1.ebuild
22 @@ -0,0 +1,186 @@
23 +# Copyright 1999-2019 Gentoo Authors
24 +# Distributed under the terms of the GNU General Public License v2
25 +
26 +EAPI=7
27 +QT5_MODULE="qtbase"
28 +inherit qt5-build
29 +
30 +DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
31 +
32 +if [[ ${QT5_BUILD_TYPE} == release ]]; then
33 + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
34 +fi
35 +
36 +# TODO: linuxfb
37 +
38 +IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
39 + jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
40 +REQUIRED_USE="
41 + || ( eglfs xcb )
42 + accessibility? ( dbus xcb )
43 + eglfs? ( egl )
44 + ibus? ( dbus )
45 + libinput? ( udev )
46 + xcb? ( gles2? ( egl ) )
47 +"
48 +
49 +COMMON_DEPEND="
50 + dev-libs/glib:2
51 + ~dev-qt/qtcore-${PV}
52 + dev-util/gtk-update-icon-cache
53 + media-libs/fontconfig
54 + >=media-libs/freetype-2.6.1:2
55 + >=media-libs/harfbuzz-1.6.0:=
56 + sys-libs/zlib:=
57 + virtual/opengl
58 + dbus? ( ~dev-qt/qtdbus-${PV} )
59 + egl? ( media-libs/mesa[egl] )
60 + eglfs? (
61 + media-libs/mesa[gbm]
62 + x11-libs/libdrm
63 + )
64 + evdev? ( sys-libs/mtdev )
65 + gles2? ( media-libs/mesa[gles2] )
66 + jpeg? ( virtual/jpeg:0 )
67 + libinput? (
68 + dev-libs/libinput:=
69 + >=x11-libs/libxkbcommon-0.5.0
70 + )
71 + png? ( media-libs/libpng:0= )
72 + tslib? ( >=x11-libs/tslib-1.21 )
73 + tuio? ( ~dev-qt/qtnetwork-${PV} )
74 + udev? ( virtual/libudev:= )
75 + vnc? ( ~dev-qt/qtnetwork-${PV} )
76 + xcb? (
77 + x11-libs/libICE
78 + x11-libs/libSM
79 + x11-libs/libX11
80 + >=x11-libs/libxcb-1.12:=[xkb]
81 + >=x11-libs/libxkbcommon-0.5.0[X]
82 + x11-libs/xcb-util-image
83 + x11-libs/xcb-util-keysyms
84 + x11-libs/xcb-util-renderutil
85 + x11-libs/xcb-util-wm
86 + )
87 +"
88 +DEPEND="${COMMON_DEPEND}
89 + evdev? ( sys-kernel/linux-headers )
90 + udev? ( sys-kernel/linux-headers )
91 +"
92 +# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
93 +RDEPEND="${COMMON_DEPEND}
94 + !<dev-qt/qtimageformats-5.14.0:5
95 + !<dev-qt/qtsvg-5.14.0:5
96 + !<dev-qt/qtvirtualkeyboard-5.14.0:5
97 + !<dev-qt/qtwayland-5.14.0:5
98 +"
99 +PDEPEND="
100 + ibus? ( app-i18n/ibus )
101 + wayland? ( ~dev-qt/qtwayland-${PV} )
102 +"
103 +
104 +QT5_TARGET_SUBDIRS=(
105 + src/tools/qvkgen
106 + src/gui
107 + src/openglextensions
108 + src/platformheaders
109 + src/platformsupport
110 + src/plugins/generic
111 + src/plugins/imageformats
112 + src/plugins/platforms
113 + src/plugins/platforminputcontexts
114 +)
115 +
116 +QT5_GENTOO_CONFIG=(
117 + accessibility:accessibility-atspi-bridge
118 + egl:egl:
119 + eglfs:eglfs:
120 + eglfs:eglfs_egldevice:
121 + eglfs:eglfs_gbm:
122 + evdev:evdev:
123 + evdev:mtdev:
124 + :fontconfig:
125 + :system-freetype:FREETYPE
126 + !:no-freetype:
127 + !gif:no-gif:
128 + gles2::OPENGL_ES
129 + gles2:opengles2:OPENGL_ES_2
130 + !:no-gui:
131 + :system-harfbuzz:
132 + !:no-harfbuzz:
133 + jpeg:system-jpeg:IMAGEFORMAT_JPEG
134 + !jpeg:no-jpeg:
135 + libinput
136 + libinput:xkbcommon:
137 + :opengl
138 + png:png:
139 + png:system-png:IMAGEFORMAT_PNG
140 + !png:no-png:
141 + tslib:tslib:
142 + udev:libudev:
143 + xcb:xcb:
144 + xcb:xcb-glx:
145 + xcb:xcb-plugin:
146 + xcb:xcb-render:
147 + xcb:xcb-sm:
148 + xcb:xcb-xlib:
149 + xcb:xcb-xinput:
150 +)
151 +
152 +QT5_GENTOO_PRIVATE_CONFIG=(
153 + :gui
154 +)
155 +
156 +PATCHES=(
157 + "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
158 + "${FILESDIR}/${PN}-5.13.2-no-xcb-no-xkbcommon.patch" # bug 699110
159 +)
160 +
161 +src_prepare() {
162 + # don't add -O3 to CXXFLAGS, bug 549140
163 + sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
164 +
165 + # egl_x11 is activated when both egl and xcb are enabled
166 + use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
167 +
168 + qt_use_disable_config dbus dbus \
169 + src/platformsupport/themes/genericunix/genericunix.pri
170 +
171 + qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
172 +
173 + qt_use_disable_mod ibus dbus \
174 + src/plugins/platforminputcontexts/platforminputcontexts.pro
175 +
176 + use vnc || sed -i -e '/SUBDIRS += vnc/d' \
177 + src/plugins/platforms/platforms.pro || die
178 +
179 + qt5-build_src_prepare
180 +}
181 +
182 +src_configure() {
183 + local myconf=(
184 + $(usex dbus -dbus-linked '')
185 + $(qt_use egl)
186 + $(qt_use eglfs)
187 + $(usex eglfs '-gbm -kms' '')
188 + $(qt_use evdev)
189 + $(qt_use evdev mtdev)
190 + -fontconfig
191 + -system-freetype
192 + $(usex gif '' -no-gif)
193 + -gui
194 + -system-harfbuzz
195 + $(qt_use jpeg libjpeg system)
196 + $(qt_use libinput)
197 + -opengl $(usex gles2 es2 desktop)
198 + $(qt_use png libpng system)
199 + $(qt_use tslib)
200 + $(qt_use udev libudev)
201 + $(qt_use xcb xcb system)
202 + $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
203 + )
204 + if use libinput || use xcb; then
205 + myconf+=( -xkbcommon )
206 + fi
207 + qt5-build_src_configure
208 +}