From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45379)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1YW0js-0000lm-N0
	for qemu-devel@nongnu.org; Thu, 12 Mar 2015 06:53:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1YW0jm-0000Xz-Ik
	for qemu-devel@nongnu.org; Thu, 12 Mar 2015 06:53:16 -0400
Received: from mx1.redhat.com ([209.132.183.28]:57777)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1YW0fD-00075X-LG
	for qemu-devel@nongnu.org; Thu, 12 Mar 2015 06:48:27 -0400
Message-ID: <1426157302.1722.17.camel@nilsson.home.kraxel.org>
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 12 Mar 2015 11:48:22 +0100
In-Reply-To: <CAFEAcA-O+1xBh_HVCBPQSrVPv+KW0D1-AEfE78x7dhSss_ZmDw@mail.gmail.com>
References: <1426149496-6043-1-git-send-email-kraxel@redhat.com>
	<CAFEAcA-O+1xBh_HVCBPQSrVPv+KW0D1-AEfE78x7dhSss_ZmDw@mail.gmail.com>
Content-Type: multipart/mixed; boundary="=-2wc3iZaIvkNunX7fNjDC"
Mime-Version: 1.0
Subject: Re: [Qemu-devel] [PULL v2 0/5] sdl patch queue.
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>


--=-2wc3iZaIvkNunX7fNjDC
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

  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?

cheers,
  Gerd


--=-2wc3iZaIvkNunX7fNjDC
Content-Disposition: attachment; filename="0001-opengl-require-glx.patch"
Content-Type: text/x-patch; name="0001-opengl-require-glx.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit

>>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


--=-2wc3iZaIvkNunX7fNjDC--