summaryrefslogtreecommitdiffstats
path: root/meta
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:45:57 +0100
commit7477153dd81bcf6c9afed47e73b388c755df30b4 (patch)
tree335e85fb5806d3340a3057c524801f0a0e94eee4 /meta
parent25db6dd7fc3175aa1f2e5acc148674c9f506777e (diff)
downloadpoky-7477153dd81bcf6c9afed47e73b388c755df30b4.tar.gz
mesa: respect x11 DISTRO_FEATURE
Patch originally by Damien Lespiau <damien.lespiau@intel.com>. (From OE-Core rev: d3e60b835c5abcf2345e761027aa520409c19efc) Signed-off-by: Ross Burton <ross.burton@intel.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-8.0.4.inc1
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc15
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri.inc4
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch29
5 files changed, 41 insertions, 10 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
index d9d17bb5fd..9afb35dee6 100644
--- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
@@ -5,6 +5,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
5 file://0002-cross-compile.patch \ 5 file://0002-cross-compile.patch \
6 file://0003-fix-for-x32.patch \ 6 file://0003-fix-for-x32.patch \
7 " 7 "
8SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
8 9
9S = "${WORKDIR}/Mesa-${PV}" 10S = "${WORKDIR}/Mesa-${PV}"
10 11
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 24cc3d08ea..feb152b13d 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,14 +12,10 @@ SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
14 14
15INC_PR = "r1" 15INC_PR = "r2"
16PE = "2" 16PE = "2"
17 17
18 18DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
19PROTO_DEPS = "xf86driproto glproto"
20LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
21
22DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
23 19
24PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2" 20PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
25 21
@@ -31,10 +27,13 @@ inherit autotools pkgconfig pythonnative
31EXTRA_OECONF = "--enable-glu \ 27EXTRA_OECONF = "--enable-glu \
32 --disable-glw \ 28 --disable-glw \
33 --disable-glut \ 29 --disable-glut \
34 --enable-glx-tls \
35 --enable-shared-glapi" 30 --enable-shared-glapi"
36 31
37PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}" 32PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)} \
33 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
34
35X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
36PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
38 37
39# Multiple virtual/gl providers being built breaks staging 38# Multiple virtual/gl providers being built breaks staging
40EXCLUDE_FROM_WORLD = "1" 39EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 32ca4b2146..ef1ca78af8 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -1,5 +1,5 @@
1PROTO_DEPS += "dri2proto" 1DEPENDS += "libdrm expat udev"
2LIB_DEPS += "libdrm expat udev" 2X11_DEPS += "dri2proto"
3 3
4# most of our targets do not have DRI so will use mesa-xlib 4# most of our targets do not have DRI so will use mesa-xlib
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 32b1d964a5..7910eb654d 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -11,6 +11,8 @@ SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
11 file://0002-cross-compile.patch \ 11 file://0002-cross-compile.patch \
12 file://0003-fix-for-x32.patch \ 12 file://0003-fix-for-x32.patch \
13 " 13 "
14SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
15
14S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
15 17
16do_configure_prepend() { 18do_configure_prepend() {
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 @@
1gross hack to prevent from install libgl
2
3This patch is not suitable for upstream. This is only needed for the 8.0.x
4branch, master (8.1.x) has a largely different build system (using automake)
5and does not need it. It is fully expected to drop the patch with the next bump
6to a stable version based on 8.1.x.
7
8Upstream-Status: Inappropriate
9
10---
11 src/mesa/Makefile | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/mesa/Makefile b/src/mesa/Makefile
15index 0e15d61..a0a2cb5 100644
16--- a/src/mesa/Makefile
17+++ b/src/mesa/Makefile
18@@ -166,7 +166,7 @@ install: default $(DRICORE_INSTALL_TARGET)
19 else \
20 $(MAKE) install-osmesa || exit 1 ; \
21 fi ;; \
22- dri) $(MAKE) install-libgl install-dri || exit 1 ;; \
23+ dri) $(MAKE) install-dri || exit 1 ;; \
24 *) $(MAKE) install-libgl || exit 1 ;; \
25 esac ; \
26 done
27--
281.7.10.4
29