summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-07-01 21:36:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:34:25 +0100
commit52892d6f8a2f37bf6b809bcbf3ad6442e152f3fb (patch)
tree115c6ae4b6288ba44ac002485949802e8958caf6 /meta
parente4103bcf2e0e66dc41e8a8a1d62f591233e54921 (diff)
downloadpoky-52892d6f8a2f37bf6b809bcbf3ad6442e152f3fb.tar.gz
mesa: fix pipe_loader_sw build without libx11
* this is needed to fix pipe_loader_sw build without libx11, but building with HAVE_PIPE_LOADER_XLIB enabled still doesn't work (nobody is using this and it was removed in newer SRCREV). See https://bugs.freedesktop.org/show_bug.cgi?id=66357 for details. (From OE-Core rev: 0cc7f4ebad7f4390ac340854b57111d5084bd956) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch52
-rw-r--r--meta/recipes-graphics/mesa/mesa_9.1.3.bb1
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb1
3 files changed, 54 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 @@
1From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 29 Jun 2013 11:20:51 +0200
4Subject: [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
21Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357
22Signed-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
27diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
28index 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--
511.8.2.1
52
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.3.bb b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
index ec95c10e14..bbeacd388e 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.3.bb
@@ -5,6 +5,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
5 file://fix-glsl-cross.patch \ 5 file://fix-glsl-cross.patch \
6 file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \ 6 file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
7 file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \ 7 file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
8 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
8 " 9 "
9 10
10SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada" 11SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 5e252affa1..09a9531227 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -12,6 +12,7 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
12 file://fix-glsl-cross.patch \ 12 file://fix-glsl-cross.patch \
13 file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \ 13 file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
14 file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \ 14 file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
15 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
15 " 16 "
16 17
17S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"