aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-30 17:17:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:42:08 +0100
commitd3e60b835c5abcf2345e761027aa520409c19efc (patch)
tree46a247986c2ea4abb09942fc5abeb4a1467fa8f7 /meta/recipes-graphics/mesa/mesa
parent58047dcf547b582211f84c6f24c21cc1aa895f1e (diff)
downloadopenembedded-core-contrib-d3e60b835c5abcf2345e761027aa520409c19efc.tar.gz
mesa: respect x11 DISTRO_FEATURE
Patch originally by Damien Lespiau <damien.lespiau@intel.com>. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
new file mode 100644
index 0000000000..cf9dee25ee
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
@@ -0,0 +1,29 @@
+gross hack to prevent from install libgl
+
+This patch is not suitable for upstream. This is only needed for the 8.0.x
+branch, master (8.1.x) has a largely different build system (using automake)
+and does not need it. It is fully expected to drop the patch with the next bump
+to a stable version based on 8.1.x.
+
+Upstream-Status: Inappropriate
+
+---
+ src/mesa/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mesa/Makefile b/src/mesa/Makefile
+index 0e15d61..a0a2cb5 100644
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -166,7 +166,7 @@ install: default $(DRICORE_INSTALL_TARGET)
+ else \
+ $(MAKE) install-osmesa || exit 1 ; \
+ fi ;; \
+- dri) $(MAKE) install-libgl install-dri || exit 1 ;; \
++ dri) $(MAKE) install-dri || exit 1 ;; \
+ *) $(MAKE) install-libgl || exit 1 ;; \
+ esac ; \
+ done
+--
+1.7.10.4
+