Attachment 138896 Details for Bug 106116 – only build GL surface tests if GLX is enabled

[patch] only build GL surface tests if GLX is enabled

only-build-GL-surface-tests-if-GLX-is-enabled.patch (text/plain), 1.14 KB, created by Michael Olbrich on 2018-04-18 07:16:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Olbrich

Created: 2018-04-18 07:16:15 UTC

Size: 1.14 KB

patch

obsolete

>From 8d2e3f150fc317d177b4febdae588c9b10bb2c52 Mon Sep 17 00:00:00 2001
>From: Michael Olbrich <m.olbrich@pengutronix.de>
>Date: Sun, 15 Apr 2018 13:08:23 +0200
>Subject: [PATCH] only build GL surface tests if GLX is enabled
>
>All GL surface tests use GLX. So with --enable-png (to enable tests in
>general) and --enable-gl (for CAIRO_HAS_GL_SURFACE) building fails with:
>[...]
>gl-surface-source.c:33:5: error: unknown type name 'Display'
>gl-surface-source.c:34:5: error: unknown type name 'GLXContext'
>[...]
>And similar errors for the other tests.
>
>Fix this by making sure the GL surface tests are only built is GLX is
>enabled.
>
>Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106116
>---
> test/Makefile.am | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index e3c42ea88032..a50ba376e904 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -17,8 +17,10 @@ endif
> endif
> 
> if CAIRO_HAS_GL_SURFACE
>+if CAIRO_HAS_GLX_FUNCTIONS
> test_sources += $(gl_surface_test_sources)
> endif
>+endif
> 
> if CAIRO_HAS_EGL_FUNCTIONS
> test_sources += $(egl_surface_test_sources)
>-- 
>2.17.0

Actions: View | Splinter Review

Attachments on bug 106116: 138896

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.