From 0a0d24077f83d8186121de0ef8b11eb82f3f326e Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 15 Apr 2018 13:36:00 +0200 Subject: cairo: version bump 1.14.8 -> 1.14.12 Signed-off-by: Michael Olbrich --- ...-build-GL-surface-tests-if-GLX-is-enabled.patch | 35 ++++++++++++++++++++++ patches/cairo-1.14.12/autogen.sh | 1 + patches/cairo-1.14.12/series | 4 +++ 3 files changed, 40 insertions(+) create mode 100644 patches/cairo-1.14.12/0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch create mode 120000 patches/cairo-1.14.12/autogen.sh create mode 100644 patches/cairo-1.14.12/series (limited to 'patches/cairo-1.14.12') diff --git a/patches/cairo-1.14.12/0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch b/patches/cairo-1.14.12/0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch new file mode 100644 index 000000000..3faa01b0f --- /dev/null +++ b/patches/cairo-1.14.12/0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch @@ -0,0 +1,35 @@ +From: Michael Olbrich +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 +--- + test/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/Makefile.am b/test/Makefile.am +index b2fcd275d3e9..b7e9c12a355d 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) diff --git a/patches/cairo-1.14.12/autogen.sh b/patches/cairo-1.14.12/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/cairo-1.14.12/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/cairo-1.14.12/series b/patches/cairo-1.14.12/series new file mode 100644 index 000000000..f9a05beb6 --- /dev/null +++ b/patches/cairo-1.14.12/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch +# 1e0e02547c4554f11314de6f8d2d431f - git-ptx-patches magic -- cgit v1.2.3