[Qemu-devel] [PULL for-2.3 0/1] opengl: fix configure test

[Qemu-devel] [PULL for-2.3 0/1] opengl: fix configure test

[Gerd Hoffmann]

  Hi,

Unfortunaly the opengl configure test from last sdl pull request doesn't
work correctly, it "fixes" the opengl build problems by simply never
succeeding.  Here comes the real fix.

Tested on everything I have here (which excludes macos).  /me wonders
whenever that is excuse enough to make redhat order me a macbook ...

please verify on macos and pull on success,
  Gerd

The following changes since commit 17b11a1406fdc43b5022f32a6fbfcb005a353b38:

  Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150316' into staging (2015-03-16 18:27:13 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-gl-20150317-1

for you to fetch changes up to b1546f3210d89662dca3e88e1021a0089f003551:

  opengl: fix configure test (2015-03-17 11:10:48 +0100)

----------------------------------------------------------------
opengl: fix configure test

----------------------------------------------------------------
Gerd Hoffmann (1):
      opengl: fix configure test

 configure | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/1] opengl: fix configure test

[Gerd Hoffmann]

Re-add the glx compile test to configure.  We can't use pkg-config to
probe for glx, and as long as milkymist-tmu2 privately uses glx (due to
opengl infrastructure in qemu not being ready yet) we must continue to
test for glx to avoid build failures.

Reported-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 configure | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index b858756..f74a6fd 100755
--- a/configure
+++ b/configure
@@ -3119,9 +3119,24 @@ libs_softmmu="$libs_softmmu $fdt_libs"
 
 ##########################################
 # opengl probe (for sdl2, milkymist-tmu2)
+
+# GLX probe, used by milkymist-tmu2
+# this is temporary, code will be switched to egl mid-term.
+cat > $TMPC << EOF
+#include <X11/Xlib.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }
+EOF
+if compile_prog "" "-lGL -lX11" ; then
+  have_glx=yes
+else
+  have_glx=no
+fi
+
 if test "$opengl" != "no" ; then
-  opengl_pkgs="gl glx"
-  if $pkg_config $opengl_pkgs x11; then
+  opengl_pkgs="gl"
+  if $pkg_config $opengl_pkgs x11 && test "$have_glx" = "yes"; then
     opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"
     opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"
     opengl=yes
-- 
1.8.3.1

Re: [Qemu-devel] [PULL for-2.3 0/1] opengl: fix configure test

[Peter Maydell]

On 17 March 2015 at 10:19, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Unfortunaly the opengl configure test from last sdl pull request doesn't
> work correctly, it "fixes" the opengl build problems by simply never
> succeeding.  Here comes the real fix.
>
> Tested on everything I have here (which excludes macos).  /me wonders
> whenever that is excuse enough to make redhat order me a macbook ...
>
> please verify on macos and pull on success,
>   Gerd
>
> The following changes since commit 17b11a1406fdc43b5022f32a6fbfcb005a353b38:
>
>   Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150316' into staging (2015-03-16 18:27:13 +0000)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-gl-20150317-1
>
> for you to fetch changes up to b1546f3210d89662dca3e88e1021a0089f003551:
>
>   opengl: fix configure test (2015-03-17 11:10:48 +0100)
>
> ----------------------------------------------------------------
> opengl: fix configure test
>
> ----------------------------------------------------------------

Applied, thanks. (It builds on OSX, at least; I don't have GL/X11
support so configure correctly turns off that config switch.)

-- PMM