summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2013-04-16 01:39:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-16 12:06:50 +0100
commit4a1620fcbf49707b66c869b82749439d794385c3 (patch)
tree150c8b3a839e37ad999d378925f24a206d8d28ad
parentec67f99a0852843a63493ac46ed37b032669c1e7 (diff)
downloadpoky-4a1620fcbf49707b66c869b82749439d794385c3.tar.gz
mesa: don't fail if x11 isn't available
Patches backported from mesa Git and from mesa-dev mailing list. (From OE-Core rev: f704bb42062f2ac15edaad36497a8d2815b8b8b2) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-9.0.2.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa/dont-fail-if-libX11-isnt-installed.patch36
-rw-r--r--meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch32
-rw-r--r--meta/recipes-graphics/mesa/mesa_9.0.2.bb2
4 files changed, 71 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-9.0.2.inc b/meta/recipes-graphics/mesa/mesa-9.0.2.inc
index bed432c924..b88bc42e05 100644
--- a/meta/recipes-graphics/mesa/mesa-9.0.2.inc
+++ b/meta/recipes-graphics/mesa/mesa-9.0.2.inc
@@ -1,6 +1,8 @@
1SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ 1SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
2 file://0002-cross-compile.patch \ 2 file://0002-cross-compile.patch \
3 file://cross-glsl.patch \ 3 file://cross-glsl.patch \
4 file://dont-fail-if-libX11-isnt-installed.patch \
5 file://fix-egl-compilation-without-x11-headers.patch \
4 " 6 "
5 7
6SRC_URI[md5sum] = "dc45d1192203e418163e0017640e1cfc" 8SRC_URI[md5sum] = "dc45d1192203e418163e0017640e1cfc"
diff --git a/meta/recipes-graphics/mesa/mesa/dont-fail-if-libX11-isnt-installed.patch b/meta/recipes-graphics/mesa/mesa/dont-fail-if-libX11-isnt-installed.patch
new file mode 100644
index 0000000000..80735a65e9
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/dont-fail-if-libX11-isnt-installed.patch
@@ -0,0 +1,36 @@
1Upstream-Status: Backport
2
3From d6b06474f69129eb41ecd85d6b3bb0eb7b9dccb3 Mon Sep 17 00:00:00 2001
4From: Daniel Stone <daniel@fooishbar.org>
5Date: Tue, 9 Oct 2012 14:27:06 +1100
6Subject: [PATCH] build: Don't fail if libX11 isn't installed
7
8configure.ac would previously refuse to complete if libX11 wasn't
9installed, even if we'd disabled GLX and weren't building an X11 EGL
10platform. Make the check simply set the no_x variable that's used (but
11never set) immediately below for what looks like this very case.
12
13Signed-off-by: Daniel Stone <daniel@fooishbar.org>
14Reviewed-by: Matt Turner <mattst88@gmail.com>
15Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
16(cherry picked from commit 4004620d34a580c8fdb965d9b640e97453fc8b28)
17---
18 configure.ac | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/configure.ac b/configure.ac
22index eb273b9..b384b44 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -836,7 +836,7 @@ if test "x$enable_dri" = xyes; then
26 fi
27
28 dnl Find out if X is available.
29-PKG_CHECK_MODULES([X11], [x11])
30+PKG_CHECK_MODULES([X11], [x11], [no_x=no], [no_x=yes])
31
32 dnl Try to tell the user that the --x-* options are only used when
33 dnl pkg-config is not available. This must be right after AC_PATH_XTRA.
34--
351.7.10.4
36
diff --git a/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch b/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
new file mode 100644
index 0000000000..6436b592b4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/fix-egl-compilation-without-x11-headers.patch
@@ -0,0 +1,32 @@
1Upstream-Status: Submitted
2
3Picked from mesa-dev mailing list: http://marc.info/?l=mesa3d-dev&m=133053004130468
4
5From: Benjamin Franzke <benjaminfranzke@googlemail.com>
6Date: Wed, 29 Feb 2012 15:36:23 +0100
7Subject: [PATCH] configure: Fix egl compilation without x11 headers
8
9We dont want eglplatform.h to typedef egl native types
10to x11 types, when x11 headers are not available.
11---
12 configure.ac | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/configure.ac b/configure.ac
16index b384b44..8eb8459 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -1262,6 +1262,10 @@ if test "x$enable_egl" = xyes; then
20
21 AC_CHECK_FUNC(mincore, [DEFINES="$DEFINES -DHAVE_MINCORE"])
22
23+ if test "$have_x" != yes; then
24+ DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS"
25+ fi
26+
27 if test "$enable_static" != yes; then
28 # build egl_glx when libGL is built
29 if test "x$enable_glx" = xyes; then
30--
311.7.10.4
32
diff --git a/meta/recipes-graphics/mesa/mesa_9.0.2.bb b/meta/recipes-graphics/mesa/mesa_9.0.2.bb
index 1a1bf24e10..6671f994b0 100644
--- a/meta/recipes-graphics/mesa/mesa_9.0.2.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.0.2.bb
@@ -1,4 +1,4 @@
1require mesa-common.inc 1require mesa-common.inc
2require mesa-${PV}.inc 2require mesa-${PV}.inc
3require mesa.inc 3require mesa.inc
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"