diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch b/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch new file mode 100644 index 000000000000..09d7fd88627d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/cairo/0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch @@ -0,0 +1,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 + |