Skip to contentSkip to conversation

Enable out-of-tree builds for Mesa

PATCH In review Ross Burton 2 participants 4 messages Aug 6, 2013

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

cover Enable out-of-tree builds for Mesa

Hi,

Attached is a two-patch series to enable out-of-tree build for Mesa.

Ross

The following changes since commit 4cff3defb545643132b7233fcffb3fedc1bf182b:

grep: Add patch for texinfo 5.1 (2013-08-03 10:33:14 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/mesa

for you to fetch changes up to 653b8f2da86101031731b208b84a4ca4f91b5074:

seperatebuilddir: mesa now builds out of tree (2013-08-06 12:16:55 +0100)

----------------------------------------------------------------
Ross Burton (2):
mesa: fix out-of-tree builds when Gallium is enabled
seperatebuilddir: mesa now builds out of tree

 meta/conf/distro/include/seperatebuilddir.inc      |    2 +-
 .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
 meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch

Ross Burton (2):
mesa: fix out-of-tree builds when Gallium is enabled
seperatebuilddir: mesa now builds out of tree

 meta/conf/distro/include/seperatebuilddir.inc      |    2 +-
 .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
 meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 1/2 mesa: fix out-of-tree builds when Gallium is enabled

Signed-off-by Ross Burton <[email protected]>
---
 .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
 meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
 3 files changed, 44 insertions(+)
 create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch new file +42 -0
new file mode 100644
index 0000000..8c5984f
@@ -0,0 +1,42 @@
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <[email protected]>
+
+From 9e31e15ebb0adbf3cc0394c30cbc1ccd2b35a27f Mon Sep 17 00:00:00 2001
+From: Ross Burton <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-graphics/mesa/mesa_9.1.5.bb +1 -0
index 49fa5dd..d4a90c8 100644
@@ -6,6 +6,7 @@ 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 \
            "
 
 SRC_URI[md5sum] = "4ed2af5943141a85a21869053a2fc2eb"
meta/recipes-graphics/mesa/mesa_git.bb +1 -0
index 52d3d81..1707f03 100644
@@ -13,6 +13,7 @@ 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 \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.10.4
author
#2 lore raw

PATCH 2/2 seperatebuilddir: mesa now builds out of tree

In reply to Ross Burton
Signed-off-by Ross Burton <[email protected]>
---
 meta/conf/distro/include/seperatebuilddir.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/seperatebuilddir.inc +1 -1
index 979f44b..eb19e0f 100644
@@ -440,7 +440,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}"
Signature · 1 line
1.7.10.4
#3 lore raw
In reply to Ross Burton
Quoted 23 lines · Ross Burton

Hi,

Attached is a two-patch series to enable out-of-tree build for Mesa.

Ross

The following changes since commit 4cff3defb545643132b7233fcffb3fedc1bf182b:

   grep: Add patch for texinfo 5.1 (2013-08-03 10:33:14 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ross/mesa

for you to fetch changes up to 653b8f2da86101031731b208b84a4ca4f91b5074:

seperatebuilddir: mesa now builds out of tree (2013-08-06 12:16:55 +0100)

----------------------------------------------------------------
Ross Burton (2):
mesa: fix out-of-tree builds when Gallium is enabled
seperatebuilddir: mesa now builds out of tree

Quoted 7 lines
  meta/conf/distro/include/seperatebuilddir.inc      |    2 +-
  .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
  meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
  meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
  4 files changed, 45 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch

This needs to be rebased for the mesa 9.1.6 Update.

Thanks
Sau!

Quoted 11 lines

Ross Burton (2):
mesa: fix out-of-tree builds when Gallium is enabled
seperatebuilddir: mesa now builds out of tree

  meta/conf/distro/include/seperatebuilddir.inc      |    2 +-
  .../mesa/0005-fix-out-of-tree-builds-gallium.patch |   42 ++++++++++++++++++++
  meta/recipes-graphics/mesa/mesa_9.1.5.bb           |    1 +
  meta/recipes-graphics/mesa/mesa_git.bb             |    1 +
  4 files changed, 45 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch