| Message ID | 1426157302.1722.17.camel@nilsson.home.kraxel.org |
|---|---|
| State | New |
| Headers | show |
On 12 March 2015 at 10:48, Gerd Hoffmann <kraxel@redhat.com> wrote: > Hi, > >> Still fails to build on OSX: >> >> manooth$ make -C build/all >> CC lm32-softmmu/hw/lm32/milkymist.o >> In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30: >> /Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error: >> 'X11/Xlib.h' file not found >> #include <X11/Xlib.h> >> ^ >> 1 error generated. > > Does the attached patch fix it? That patch doesn't apply, because it does: - opengl_pkgs="egl gl glesv2" + opengl_pkgs="glx egl gl glesv2" but the configure as of your pull req has just: opengl_pkgs="gl" -- PMM
On Do, 2015-03-12 at 11:16 +0000, Peter Maydell wrote: > On 12 March 2015 at 10:48, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Hi, > > > >> Still fails to build on OSX: > >> > >> manooth$ make -C build/all > >> CC lm32-softmmu/hw/lm32/milkymist.o > >> In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30: > >> /Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error: > >> 'X11/Xlib.h' file not found > >> #include <X11/Xlib.h> > >> ^ > >> 1 error generated. > > > > Does the attached patch fix it? > > That patch doesn't apply, because it does: > > - opengl_pkgs="egl gl glesv2" > + opengl_pkgs="glx egl gl glesv2" > > but the configure as of your pull req has just: > opengl_pkgs="gl" Oh, right, there is some wip opengl stuff in the sdl branch. Fixed it in patch #3, created a new tag: pull-sdl-20150312-2 Does that build for you? cheers, Gerd
From fffbae0bcc7480d3b3dd145c93cb3c36860ebcf6 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann <kraxel@redhat.com> Date: Thu, 12 Mar 2015 11:44:11 +0100 Subject: [PATCH] opengl: require glx hw/display/milkymist-tmu2.c uses glx. That will be replaced with egl in the future, with qemu getting more opengl support. But we are not there yet, so put it back into configure to fix build failures on machines without glx (i.e. macos, possibly windows too). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index bd55786..ed49990 100755 --- a/configure +++ b/configure @@ -3120,7 +3120,7 @@ libs_softmmu="$libs_softmmu $fdt_libs" ########################################## # opengl probe (for sdl2, milkymist-tmu2) if test "$opengl" != "no" ; then - opengl_pkgs="egl gl glesv2" + opengl_pkgs="glx egl gl glesv2" if $pkg_config $opengl_pkgs x11; then opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags" opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs" -- 1.8.3.1