From fbc7092f0ae07538d4363679b1597ba4e556d1a8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Aug 2013 16:32:24 +0100 Subject: mesa: fix and enable out-of-tree builds One patch (submitted upstream) for when Gallium is enabled, and another (inappropriate for upstream) to fix out-of-tree builds with 0003-EGL-Mutate-NativeDisplayType-depending-on-config. Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- meta/conf/distro/include/seperatebuilddir.inc | 2 +- .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 +++++++++++++++++++ .../mesa/mesa/0006-fix-out-of-tree-egl.patch | 48 ++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa_9.1.6.bb | 2 + meta/recipes-graphics/mesa/mesa_git.bb | 2 + 5 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch create mode 100644 meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch (limited to 'meta') diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index fbd5bdb7f3..bd98f8f634 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc @@ -441,7 +441,7 @@ B_pn-mc = "${SEPB}" B_pn-menu-cache = "${SEPB}" B_pn-mesa-demos = "${SEPB}" # src/mapi/mapi/stub.c:51:39: error: 'MAPI_TABLE_NUM_DYNAMIC' undeclared here (not in a function) -#B_pn-mesa-dri = "${SEPB}" +B_pn-mesa = "${SEPB}" B_pn-minicom = "${SEPB}" # Not automake, no external tree support #B_pn-mkelfimage = "${SEPB}" 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 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 9e31e15ebb0adbf3cc0394c30cbc1ccd2b35a27f Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 28 Jun 2013 11:44:58 +0100 +Subject: [PATCH] build: fix out-of-tree builds in gallium/auxiliary + +The rules were writing files to e.g. util/u_indices_gen.py, but in an +out-of-tree build this directory doesn't exist in the build directory. So, +create the directories just in case. + +Signed-off-by: Ross Burton +--- + src/gallium/auxiliary/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am +index f14279b..0c3e7ba 100644 +--- a/src/gallium/auxiliary/Makefile.am ++++ b/src/gallium/auxiliary/Makefile.am +@@ -38,13 +38,17 @@ libgallium_la_SOURCES += \ + endif + + indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py ++ mkdir --parents indices + $(AM_V_GEN) $(PYTHON2) $< > $@ + + indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py ++ mkdir --parents indices + $(AM_V_GEN) $(PYTHON2) $< > $@ + + util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py ++ mkdir --parents util + $(AM_V_GEN) $(PYTHON2) $< > $@ + + 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 ++ mkdir --parents util + $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ +-- +1.7.10.4 + 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 @@ +Fix out of tree compilation failure due to +0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch. + +Upstream-Status: Inappropriate (upstream has different solution to root problem) +Signed-off-by: Ross Burton + +diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am +index 45f7dfa..ed0e777 100644 +--- a/src/egl/drivers/dri2/Makefile.am ++++ b/src/egl/drivers/dri2/Makefile.am +@@ -21,6 +21,7 @@ + + AM_CFLAGS = \ + -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + -I$(top_srcdir)/src/egl/main \ + -I$(top_srcdir)/src/gbm/main \ + -I$(top_srcdir)/src/gbm/backends/dri \ +diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am +index 6bf67ea..7b87047 100644 +--- a/src/egl/drivers/glx/Makefile.am ++++ b/src/egl/drivers/glx/Makefile.am +@@ -21,6 +21,7 @@ + + AM_CFLAGS = \ + -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + -I$(top_srcdir)/src/egl/main \ + $(X11_CFLAGS) \ + $(DEFINES) +diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am +index ca5257a..13a5734 100644 +--- a/src/egl/main/Makefile.am ++++ b/src/egl/main/Makefile.am +@@ -27,6 +27,7 @@ endif + + AM_CFLAGS = \ + -I$(top_srcdir)/include \ ++ -I$(top_builddir)/include \ + -I$(top_srcdir)/src/gbm/main \ + $(DEFINES) \ + $(EGL_CFLAGS) \ +@@ -135,4 +136,4 @@ egl_HEADERS = \ + $(top_srcdir)/include/EGL/eglext.h \ + $(top_srcdir)/include/EGL/egl.h \ + $(top_srcdir)/include/EGL/eglmesaext.h \ +- $(top_srcdir)/include/EGL/eglplatform.h ++ $(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 \ file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \ file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \ file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \ + file://0005-fix-out-of-tree-builds-gallium.patch \ + file://0006-fix-out-of-tree-egl.patch \ " SRC_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 \ file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \ file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \ + file://0005-fix-out-of-tree-builds-gallium.patch \ + file://0006-fix-out-of-tree-egl.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg