about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch
blob: 09d7fd88627d6f706270177993207330b7194630 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
From 84593a7e01b9afa74ec0bddd9515b666d476efba Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 22 Apr 2019 11:29:48 +0000
Subject: [PATCH 3/5] test: only build GL tests when Xlib is enabled

The GL tests all depend on Xlib functions, so they should only be
enabled when Xlib is enabled, because otherwise the required functions
might not be present.
---
 test/Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index e3c42ea88..9f77622bc 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,10 +16,6 @@ test_sources += $(ft_font_test_sources)
 endif
 endif
 
-if CAIRO_HAS_GL_SURFACE
-test_sources += $(gl_surface_test_sources)
-endif
-
 if CAIRO_HAS_EGL_FUNCTIONS
 test_sources += $(egl_surface_test_sources)
 endif
@@ -51,6 +47,10 @@ endif
 
 if CAIRO_HAS_XLIB_SURFACE
 test_sources += $(xlib_surface_test_sources)
+
+if CAIRO_HAS_GL_SURFACE
+test_sources += $(gl_surface_test_sources)
+endif
 endif
 
 if CAIRO_HAS_XLIB_XRENDER_SURFACE
-- 
2.19.2