Skip to content

Commit 512e3bd

Browse files
bajosotobajosoto
authored
Merge pull request #21 from Ultimaker/SEM-668-re-enable-eglfs
Sem-668: Re-enable EGLFS
2 parents e7747c9 + 6d4bb7a commit 512e3bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+33113
-49
lines changed

‎.gitmodules‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,280 +1,280 @@
11
[submodule "qtbase"]
22
path = qtbase
3-
url = http://code.qt.io/qt/qtbase.git
3+
url = https://github.com/qt/qtbase.git
44
branch = 5.12.3
55
status = essential
66
[submodule "qtsvg"]
77
depends = qtbase
88
path = qtsvg
9-
url = http://code.qt.io/qt/qtsvg.git
9+
url = https://github.com/qt/qtsvg.git
1010
branch = 5.12.3
1111
status = addon
1212
[submodule "qtdeclarative"]
1313
depends = qtbase
1414
recommends = qtsvg
1515
path = qtdeclarative
16-
url = http://code.qt.io/qt/qtdeclarative.git
16+
url = https://github.com/qt/qtdeclarative.git
1717
branch = 5.12.3
1818
status = essential
1919
[submodule "qtactiveqt"]
2020
depends = qtbase
2121
path = qtactiveqt
22-
url = http://code.qt.io/qt/qtactiveqt.git
22+
url = https://github.com/qt/qtactiveqt.git
2323
branch = 5.12.3
2424
status = addon
2525
[submodule "qtscript"]
2626
depends = qtbase
2727
recommends = qttools
2828
path = qtscript
29-
url = http://code.qt.io/qt/qtscript.git
29+
url = https://github.com/qt/qtscript.git
3030
branch = 5.12.3
3131
status = deprecated
3232
[submodule "qtmultimedia"]
3333
depends = qtbase
3434
recommends = qtdeclarative
3535
path = qtmultimedia
36-
url = http://code.qt.io/qt/qtmultimedia.git
36+
url = https://github.com/qt/qtmultimedia.git
3737
branch = 5.12.3
3838
status = essential
3939
[submodule "qttools"]
4040
depends = qtbase
4141
recommends = qtdeclarative qtactiveqt
4242
path = qttools
43-
url = http://code.qt.io/qt/qttools.git
43+
url = https://github.com/qt/qttools.git
4444
branch = 5.12.3
4545
status = essential
4646
[submodule "qtxmlpatterns"]
4747
depends = qtbase
4848
recommends = qtdeclarative
4949
path = qtxmlpatterns
50-
url = http://code.qt.io/qt/qtxmlpatterns.git
50+
url = https://github.com/qt/qtxmlpatterns.git
5151
branch = 5.12.3
5252
status = addon
5353
[submodule "qttranslations"]
5454
depends = qttools
5555
path = qttranslations
56-
url = http://code.qt.io/qt/qttranslations.git
56+
url = https://github.com/qt/qttranslations.git
5757
branch = 5.12.3
5858
status = essential
5959
priority = 30
6060
[submodule "qtdoc"]
6161
depends = qtdeclarative qttools
6262
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
6363
path = qtdoc
64-
url = http://code.qt.io/qt/qtdoc.git
64+
url = https://github.com/qt/qtdoc.git
6565
branch = 5.12.3
6666
status = essential
6767
priority = 40
6868
[submodule "qtrepotools"]
6969
path = qtrepotools
70-
url = http://code.qt.io/qt/qtrepotools.git
70+
url = https://github.com/qt/qtrepotools.git
7171
branch = master
7272
status = essential
7373
project = -
7474
[submodule "qtqa"]
7575
depends = qtbase
7676
path = qtqa
77-
url = http://code.qt.io/qt/qtqa.git
77+
url = https://github.com/qt/qtqa.git
7878
branch = master
7979
status = essential
8080
priority = 50
8181
[submodule "qtlocation"]
8282
depends = qtbase
8383
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
8484
path = qtlocation
85-
url = http://code.qt.io/qt/qtlocation.git
85+
url = https://github.com/qt/qtlocation.git
8686
branch = 5.12.3
8787
status = addon
8888
[submodule "qtsensors"]
8989
depends = qtbase
9090
recommends = qtdeclarative
9191
path = qtsensors
92-
url = http://code.qt.io/qt/qtsensors.git
92+
url = https://github.com/qt/qtsensors.git
9393
branch = 5.12.3
9494
status = addon
9595
[submodule "qtsystems"]
9696
depends = qtbase
9797
recommends = qtdeclarative
9898
path = qtsystems
99-
url = http://code.qt.io/qt/qtsystems.git
99+
url = https://github.com/qt/qtsystems.git
100100
branch = dev
101101
status = ignore
102102
[submodule "qtfeedback"]
103103
depends = qtdeclarative
104104
recommends = qtmultimedia
105105
path = qtfeedback
106-
url = http://code.qt.io/qt/qtfeedback.git
106+
url = https://github.com/qt/qtfeedback.git
107107
branch = master
108108
status = ignore
109109
[submodule "qtdocgallery"]
110110
depends = qtdeclarative
111111
path = qtdocgallery
112-
url = http://code.qt.io/qt/qtdocgallery.git
112+
url = https://github.com/qt/qtdocgallery.git
113113
branch = master
114114
status = ignore
115115
[submodule "qtpim"]
116116
depends = qtdeclarative
117117
path = qtpim
118-
url = http://code.qt.io/qt/qtpim.git
118+
url = https://github.com/qt/qtpim.git
119119
branch = dev
120120
status = ignore
121121
[submodule "qtconnectivity"]
122122
depends = qtbase
123123
recommends = qtdeclarative qtandroidextras
124124
path = qtconnectivity
125-
url = http://code.qt.io/qt/qtconnectivity.git
125+
url = https://github.com/qt/qtconnectivity.git
126126
branch = 5.12.3
127127
status = addon
128128
[submodule "qtwayland"]
129129
depends = qtbase
130130
recommends = qtdeclarative
131131
path = qtwayland
132-
url = http://code.qt.io/qt/qtwayland.git
132+
url = https://github.com/qt/qtwayland.git
133133
branch = 5.12.3
134134
status = addon
135135
[submodule "qt3d"]
136136
depends = qtbase
137137
recommends = qtdeclarative qtimageformats qtgamepad
138138
path = qt3d
139-
url = http://code.qt.io/qt/qt3d.git
139+
url = https://github.com/qt/qt3d.git
140140
branch = 5.12.3
141141
status = addon
142142
[submodule "qtimageformats"]
143143
depends = qtbase
144144
path = qtimageformats
145-
url = http://code.qt.io/qt/qtimageformats.git
145+
url = https://github.com/qt/qtimageformats.git
146146
branch = 5.12.3
147147
status = addon
148148
[submodule "qtgraphicaleffects"]
149149
depends = qtdeclarative
150150
path = qtgraphicaleffects
151-
url = http://code.qt.io/qt/qtgraphicaleffects.git
151+
url = https://github.com/qt/qtgraphicaleffects.git
152152
branch = 5.12.3
153153
status = addon
154154
[submodule "qtquickcontrols"]
155155
depends = qtdeclarative
156156
recommends = qtgraphicaleffects
157157
path = qtquickcontrols
158-
url = http://code.qt.io/qt/qtquickcontrols.git
158+
url = https://github.com/qt/qtquickcontrols.git
159159
branch = 5.12.3
160160
status = addon
161161
[submodule "qtserialbus"]
162162
depends = qtserialport
163163
path = qtserialbus
164-
url = http://code.qt.io/qt/qtserialbus.git
164+
url = https://github.com/qt/qtserialbus.git
165165
branch = 5.12.3
166166
status = addon
167167
[submodule "qtserialport"]
168168
depends = qtbase
169169
path = qtserialport
170-
url = http://code.qt.io/qt/qtserialport.git
170+
url = https://github.com/qt/qtserialport.git
171171
branch = 5.12.3
172172
status = addon
173173
[submodule "qtx11extras"]
174174
depends = qtbase
175175
path = qtx11extras
176-
url = http://code.qt.io/qt/qtx11extras.git
176+
url = https://github.com/qt/qtx11extras.git
177177
branch = 5.12.3
178178
status = addon
179179
[submodule "qtmacextras"]
180180
depends = qtbase
181181
path = qtmacextras
182-
url = http://code.qt.io/qt/qtmacextras.git
182+
url = https://github.com/qt/qtmacextras.git
183183
branch = 5.12.3
184184
status = addon
185185
[submodule "qtwinextras"]
186186
depends = qtbase
187187
recommends = qtdeclarative qtmultimedia
188188
path = qtwinextras
189-
url = http://code.qt.io/qt/qtwinextras.git
189+
url = https://github.com/qt/qtwinextras.git
190190
branch = 5.12.3
191191
status = addon
192192
[submodule "qtandroidextras"]
193193
depends = qtbase
194194
path = qtandroidextras
195-
url = http://code.qt.io/qt/qtandroidextras.git
195+
url = https://github.com/qt/qtandroidextras.git
196196
branch = 5.12.3
197197
status = addon
198198
[submodule "qtwebsockets"]
199199
depends = qtbase
200200
recommends = qtdeclarative
201201
path = qtwebsockets
202-
url = http://code.qt.io/qt/qtwebsockets.git
202+
url = https://github.com/qt/qtwebsockets.git
203203
branch = 5.12.3
204204
status = addon
205205
[submodule "qtwebchannel"]
206206
depends = qtbase
207207
recommends = qtdeclarative qtwebsockets
208208
path = qtwebchannel
209-
url = http://code.qt.io/qt/qtwebchannel.git
209+
url = https://github.com/qt/qtwebchannel.git
210210
branch = 5.12.3
211211
status = addon
212212
[submodule "qtwebengine"]
213213
depends = qtdeclarative
214214
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
215215
path = qtwebengine
216-
url = http://code.qt.io/qt/qtwebengine.git
216+
url = https://github.com/qt/qtwebengine.git
217217
branch = 5.12.3
218218
status = addon
219219
priority = 10
220220
[submodule "qtcanvas3d"]
221221
depends = qtdeclarative
222222
path = qtcanvas3d
223-
url = http://code.qt.io/qt/qtcanvas3d.git
223+
url = https://github.com/qt/qtcanvas3d.git
224224
branch = 5.12.3
225225
status = addon
226226
[submodule "qtwebview"]
227227
depends = qtdeclarative
228228
recommends = qtwebengine
229229
path = qtwebview
230-
url = http://code.qt.io/qt/qtwebview.git
230+
url = https://github.com/qt/qtwebview.git
231231
branch = 5.12.3
232232
status = addon
233233
[submodule "qtquickcontrols2"]
234234
depends = qtgraphicaleffects
235235
recommends = qtimageformats
236236
path = qtquickcontrols2
237-
url = http://code.qt.io/qt/qtquickcontrols2.git
237+
url = https://github.com/qt/qtquickcontrols2.git
238238
branch = 5.12.3
239239
status = essential
240240
[submodule "qtpurchasing"]
241241
depends = qtbase
242242
recommends = qtdeclarative qtandroidextras
243243
path = qtpurchasing
244-
url = http://code.qt.io/qt/qtpurchasing.git
244+
url = https://github.com/qt/qtpurchasing.git
245245
branch = 5.12.3
246246
status = addon
247247
[submodule "qtgamepad"]
248248
depends = qtbase
249249
recommends = qtdeclarative
250250
path = qtgamepad
251-
url = http://code.qt.io/qt/qtgamepad.git
251+
url = https://github.com/qt/qtgamepad.git
252252
branch = 5.12.3
253253
status = addon
254254
[submodule "qtscxml"]
255255
depends = qtbase qtdeclarative
256256
path = qtscxml
257-
url = http://code.qt.io/qt/qtscxml.git
257+
url = https://github.com/qt/qtscxml.git
258258
branch = 5.12.3
259259
status = addon
260260
[submodule "qtspeech"]
261261
depends = qtbase
262262
recommends = qtdeclarative qtmultimedia
263263
path = qtspeech
264-
url = http://code.qt.io/qt/qtspeech.git
264+
url = https://github.com/qt/qtspeech.git
265265
branch = 5.12.3
266266
status = addon
267267
[submodule "qtremoteobjects"]
268268
depends = qtbase
269269
recommends = qtdeclarative
270270
path = qtremoteobjects
271-
url = http://code.qt.io/qt/qtremoteobjects.git
271+
url = https://github.com/qt/qtremoteobjects.git
272272
branch = 5.12.3
273273
status = addon
274274
[submodule "qtwebglplugin"]
275275
depends = qtbase qtwebsockets
276276
recommends = qtdeclarative
277277
path = qtwebglplugin
278-
url = http://code.qt.io/qt/qtwebglplugin.git
278+
url = https://github.com/qt/qtwebglplugin.git
279279
branch = 5.12.3
280280
status = addon

‎build.sh‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export CCACHE_DIR="${BUILD_DIR}/ccache"
2929

3030
PYQT_TARGET_PYTHON_VERSION="3.11"
3131

32-
export PKG_CONFIG_PATH=${SYSROOT}/usr/lib/pkgconfig:${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig:${SYSROOT}/usr/local/lib/pkgconfig
32+
export PKG_CONFIG_PATH=${SYSROOT}/usr/lib/pkgconfig:${SYSROOT}/usr/lib/aarch64-linux-gnu/pkgconfig:${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig:${SYSROOT}/usr/local/lib/pkgconfig
3333

3434
# Add the UM_ARCH (if any) to release version keeping a possible -dev on the most right side
3535
if [ -n "${UM_ARCH}" ]; then
@@ -99,12 +99,12 @@ build()
9999
-opensource \
100100
-pkg-config \
101101
-linuxfb \
102-
-no-eglfs \
102+
-eglfs \
103103
-opengl es2 \
104104
-xkbcommon \
105105
-openssl \
106-
-no-gbm \
107-
-no-kms \
106+
-gbm \
107+
-kms \
108108
-no-directfb \
109109
-nomake tests \
110110
-nomake tools \
@@ -152,6 +152,13 @@ build()
152152
make "${MAKEFLAGS}"
153153
make "${MAKEFLAGS}" install
154154

155+
# Sanity check: the eglfs KMS device integration must be present after build.
156+
EGLFS_KMS_PLUGIN="${TARGET_DIR}/qt/plugins/egldeviceintegrations/libqeglfs-kms-integration.so"
157+
if [ ! -f "${EGLFS_KMS_PLUGIN}" ]; then
158+
echo "ERROR: libqeglfs-kms-integration.so not found in build output" >&2
159+
exit 1
160+
fi
161+
155162
echo "Finished building."
156163
}
157164

‎debian/control.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Section: graphics
66
Priority: optional
77
Homepage: https://www.qt.io/
88
Description: Qt is a free and open-source widget toolkit for creating graphical user interfaces.
9-
Depends: libgles2,python3-sip,libxext6,libfontconfig1
9+
Depends: libegl1,libgbm1,libdrm2,libgles2,python3-sip,libxext6,libfontconfig1

‎tools/sysroot_multistrap.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ bootstrap=Debian DebianStable
1212
omitrequired=true
1313

1414
[DebianStable]
15-
packages=libgles-dev
15+
packages=libgles-dev
1616
packages=perl pkg-config debconf libxkbcommon-dev
1717
packages=python3-dev python3-sip-dev libssl-dev
18+
packages=libdrm-dev libgbm-dev libegl1-mesa-dev libgles2-mesa-dev
1819
source=http://ftp.debian.org/debian
1920
suite=bookworm
2021
components=main non-free
2122
omitdebsrc=true
22-

0 commit comments

Comments
 (0)