aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2018-11-10 21:51:41 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-11-25 23:18:42 +0100
commit2c73a56a82b51c79422b2ee6404a2be9b9fa31e4 (patch)
treef0dbc1c3275c28057cf330324a6943b5741e1168
parent2d52b161f9e2939a5aa5ab3c021043eeb542bea2 (diff)
downloadbuildroot-2c73a56a82b51c79422b2ee6404a2be9b9fa31e4.tar.gz
buildroot-2c73a56a82b51c79422b2ee6404a2be9b9fa31e4.tar.bz2
qemu: disable opengl
Since version 0.15.0, qemu has an optional dependency to opengl: https://github.com/qemu/qemu/commit/20ff075bb3340c5278a0da38ad1f4d602565aa06 Since version 2.4, libepoxy is also needed to enable opengl: https://github.com/qemu/qemu/commit/dcf30025c3e3d43140a687240433de1920adf8b0 As a result if libepoxy is built before qemu, opengl support will be detected (see config.log): OpenGL support yes OpenGL dmabufs yes This will raise the failures in milkymist-tmu2: hw/display/milkymist-tmu2.c:35:22: fatal error: X11/Xlib.h: No such file or directory or in sdl2: CC /home/peko/autobuild/instance-0/output/targetui/sdl2-2d.o In file included from /home/peko/autobuild/instance-0/output/build/qemu-2.12.1/include/ui/egl-context.h:5:0, from ui/egl-context.c:3: /home/peko/autobuild/instance-0/output/build/qemu-2.12.1/include/ui/egl-helpers.h:45:55: error: unknown type name 'Window'; did you mean 'minor'? or in translate-a64: /accts/mlweber1/scripts/instance-3/output/build/qemu-2.12.1/target/arm/translate-a64.c: In function 'handle_shri_with_rndacc': /accts/mlweber1/scripts/instance-3/output/build/qemu-2.12.1/target/arm/translate-a64.c:7000:28: warning: 'tcg_src_hi' may be used uninitialized in this function [-Wmaybe-uninitialized] tcg_gen_mov_i64(tcg_src, tcg_src_hi); ^ ../ui/gtk-egl.o: In function `gd_egl_init': /accts/mlweber1/scripts/instance-3/output/build/qemu-2.12.1/ui/gtk-egl.c:52: undefined reference to `gdk_x11_window_get_xid' So, for the time being, disable opengl as done in xen since commit 13c6754f3c1d2a14516f641490e9dd6f4c183d7c. Fixes: - http://autobuild.buildroot.org/results/656e45721c72197834462eb2bd8c762e520725a4 - http://autobuild.buildroot.org/results/d4736a930144fc5e25b377bc1c0baf44fbf8718d - http://autobuild.buildroot.org/results/50e0d7d1b4f5c2b827b50bb82d8fbc066bf31118 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit ce735b0c59c636b454056debacddcf77f9fb30fd) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/qemu/qemu.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 5496a5f025..758c22396c 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -129,6 +129,7 @@ define QEMU_CONFIGURE_CMDS
--disable-libxml2 \
--disable-capstone \
--disable-git-update \
+ --disable-opengl \
$(QEMU_OPTS) \
)
endef