@@ -55,24 +55,6 @@ build_sysroot()
5555
5656 multistrap -f " ${TOOLS_DIR} /sysroot_multistrap.cfg" -d " ${SYSROOT} "
5757
58- # Inject Vivante proprietary headers and libraries when available so that
59- # the Qt configure step can build the eglfs_viv backend.
60- VIVANTE_DIR=" ${TOOLS_DIR} /vivante/${UM_ARCH} "
61- if [ -d " ${VIVANTE_DIR} " ]; then
62- if [ -d " ${VIVANTE_DIR} /lib" ]; then
63- echo " Copying Vivante libraries into sysroot"
64- mkdir -p " ${SYSROOT} /usr/lib"
65- cp -a " ${VIVANTE_DIR} /lib/." " ${SYSROOT} /usr/lib/"
66- mkdir -p " ${SYSROOT} /usr/lib/aarch64-linux-gnu"
67- cp -a " ${VIVANTE_DIR} /lib/." " ${SYSROOT} /usr/lib/aarch64-linux-gnu/"
68- fi
69- if [ -d " ${VIVANTE_DIR} /include" ]; then
70- echo " Copying Vivante headers into sysroot"
71- mkdir -p " ${SYSROOT} /usr/include"
72- cp -a " ${VIVANTE_DIR} /include/." " ${SYSROOT} /usr/include/"
73- fi
74- fi
75-
7658 # Fix up the symlinks in the sysroot, find all links that start with absolute paths
7759 # and replace them with relative paths inside the sysroot.
7860 cd " ${SYSROOT} "
@@ -121,8 +103,8 @@ build()
121103 -opengl es2 \
122104 -xkbcommon \
123105 -openssl \
124- -no- gbm \
125- -no- kms \
106+ -gbm \
107+ -kms \
126108 -no-directfb \
127109 -nomake tests \
128110 -nomake tools \
@@ -170,19 +152,10 @@ build()
170152 make " ${MAKEFLAGS} "
171153 make " ${MAKEFLAGS} " install
172154
173- # Ensure Vivante runtime libraries are packaged with Qt so the target
174- # filesystem gets the complete GPU stack.
175- VIVANTE_DIR=" ${TOOLS_DIR} /vivante/${UM_ARCH} "
176- if [ -d " ${VIVANTE_DIR} /lib" ]; then
177- echo " Copying Vivante libraries into Qt package"
178- mkdir -p " ${TARGET_DIR} /qt/lib"
179- cp -a " ${VIVANTE_DIR} /lib/." " ${TARGET_DIR} /qt/lib/"
180- fi
181-
182- # Sanity check: the eglfs Vivante device integration must be present after build.
183- EGLFS_VIV_PLUGIN=" ${TARGET_DIR} /qt/plugins/egldeviceintegrations/libqeglfs_viv.so"
184- if [ ! -f " ${EGLFS_VIV_PLUGIN} " ]; then
185- echo " ERROR: libqeglfs_viv.so not found in build output" >&2
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
186159 exit 1
187160 fi
188161
0 commit comments