summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch42
-rw-r--r--meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch48
-rw-r--r--meta/recipes-graphics/mesa/mesa_9.1.6.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb2
4 files changed, 94 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch b/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
new file mode 100644
index 0000000000..8c5984fd55
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 9e31e15ebb0adbf3cc0394c30cbc1ccd2b35a27f Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Fri, 28 Jun 2013 11:44:58 +0100
7Subject: [PATCH] build: fix out-of-tree builds in gallium/auxiliary
8
9The rules were writing files to e.g. util/u_indices_gen.py, but in an
10out-of-tree build this directory doesn't exist in the build directory. So,
11create the directories just in case.
12
13Signed-off-by: Ross Burton <ross.burton@intel.com>
14---
15 src/gallium/auxiliary/Makefile.am | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
19index f14279b..0c3e7ba 100644
20--- a/src/gallium/auxiliary/Makefile.am
21+++ b/src/gallium/auxiliary/Makefile.am
22@@ -38,13 +38,17 @@ libgallium_la_SOURCES += \
23 endif
24
25 indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
26+ mkdir --parents indices
27 $(AM_V_GEN) $(PYTHON2) $< > $@
28
29 indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
30+ mkdir --parents indices
31 $(AM_V_GEN) $(PYTHON2) $< > $@
32
33 util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
34+ mkdir --parents util
35 $(AM_V_GEN) $(PYTHON2) $< > $@
36
37 util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
38+ mkdir --parents util
39 $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
40--
411.7.10.4
42
diff --git a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch
new file mode 100644
index 0000000000..88a4fb0636
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch
@@ -0,0 +1,48 @@
1Fix out of tree compilation failure due to
20003-EGL-Mutate-NativeDisplayType-depending-on-config.patch.
3
4Upstream-Status: Inappropriate (upstream has different solution to root problem)
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am
8index 45f7dfa..ed0e777 100644
9--- a/src/egl/drivers/dri2/Makefile.am
10+++ b/src/egl/drivers/dri2/Makefile.am
11@@ -21,6 +21,7 @@
12
13 AM_CFLAGS = \
14 -I$(top_srcdir)/include \
15+ -I$(top_builddir)/include \
16 -I$(top_srcdir)/src/egl/main \
17 -I$(top_srcdir)/src/gbm/main \
18 -I$(top_srcdir)/src/gbm/backends/dri \
19diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am
20index 6bf67ea..7b87047 100644
21--- a/src/egl/drivers/glx/Makefile.am
22+++ b/src/egl/drivers/glx/Makefile.am
23@@ -21,6 +21,7 @@
24
25 AM_CFLAGS = \
26 -I$(top_srcdir)/include \
27+ -I$(top_builddir)/include \
28 -I$(top_srcdir)/src/egl/main \
29 $(X11_CFLAGS) \
30 $(DEFINES)
31diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am
32index ca5257a..13a5734 100644
33--- a/src/egl/main/Makefile.am
34+++ b/src/egl/main/Makefile.am
35@@ -27,6 +27,7 @@ endif
36
37 AM_CFLAGS = \
38 -I$(top_srcdir)/include \
39+ -I$(top_builddir)/include \
40 -I$(top_srcdir)/src/gbm/main \
41 $(DEFINES) \
42 $(EGL_CFLAGS) \
43@@ -135,4 +136,4 @@ egl_HEADERS = \
44 $(top_srcdir)/include/EGL/eglext.h \
45 $(top_srcdir)/include/EGL/egl.h \
46 $(top_srcdir)/include/EGL/eglmesaext.h \
47- $(top_srcdir)/include/EGL/eglplatform.h
48+ $(top_builddir)/include/EGL/eglplatform.h
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
index d47822f630..b55fa02a7e 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.1.6.bb
@@ -6,6 +6,8 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
6 file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \ 6 file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
7 file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \ 7 file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
8 file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \ 8 file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
9 file://0005-fix-out-of-tree-builds-gallium.patch \
10 file://0006-fix-out-of-tree-egl.patch \
9 " 11 "
10 12
11SRC_URI[md5sum] = "443a2a352667294b53d56cb1a74114e9" 13SRC_URI[md5sum] = "443a2a352667294b53d56cb1a74114e9"
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 52d3d815ff..e3e515098d 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -13,6 +13,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
13 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ 13 file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
14 file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \ 14 file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
15 file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \ 15 file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
16 file://0005-fix-out-of-tree-builds-gallium.patch \
17 file://0006-fix-out-of-tree-egl.patch \
16 " 18 "
17 19
18S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"