diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch new file mode 100644 index 0000000000..2df5e61d21 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 29 Jun 2013 11:20:51 +0200 | ||
4 | Subject: [PATCH 2/4] pipe_loader_sw: include xlib_sw_winsys.h only when | ||
5 | HAVE_PIPE_LOADER_XLIB | ||
6 | |||
7 | * HAVE_WINSYS_XLIB was removed in | ||
8 | commit b3f1f665b0fef178ae193e6b111f14c9a5ad3b25 | ||
9 | Author: Matt Turner <mattst88@gmail.com> | ||
10 | Date: Sun Jan 20 15:32:08 2013 -0800 | ||
11 | build: Get rid of GALLIUM_WINSYS_DIRS | ||
12 | |||
13 | * HAVE_PIPE_LOADER_XLIB is set correctly: | ||
14 | if test "x$NEED_WINSYS_XLIB" = xyes; then | ||
15 | GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" | ||
16 | GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la" | ||
17 | fi | ||
18 | |||
19 | * fixes build of pipe_loader_sw without libx11 headers available | ||
20 | |||
21 | Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357 | ||
22 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
23 | --- | ||
24 | src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 4 +++- | ||
25 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
26 | |||
27 | diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | ||
28 | index c2b78c6..0da3f4d 100644 | ||
29 | --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | ||
30 | +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | ||
31 | @@ -31,7 +31,9 @@ | ||
32 | #include "util/u_dl.h" | ||
33 | #include "sw/null/null_sw_winsys.h" | ||
34 | #include "target-helpers/inline_sw_helper.h" | ||
35 | +#ifdef HAVE_PIPE_LOADER_XLIB | ||
36 | #include "state_tracker/xlib_sw_winsys.h" | ||
37 | +#endif | ||
38 | |||
39 | struct pipe_loader_sw_device { | ||
40 | struct pipe_loader_device base; | ||
41 | @@ -44,7 +46,7 @@ struct pipe_loader_sw_device { | ||
42 | static struct pipe_loader_ops pipe_loader_sw_ops; | ||
43 | |||
44 | static struct sw_winsys *(*backends[])() = { | ||
45 | -#ifdef HAVE_WINSYS_XLIB | ||
46 | +#ifdef HAVE_PIPE_LOADER_XLIB | ||
47 | x11_sw_create, | ||
48 | #endif | ||
49 | null_sw_create | ||
50 | -- | ||
51 | 1.8.2.1 | ||
52 | |||