summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-30 15:40:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:45:56 +0100
commitaef0371ebafe1b0befe1ad96cc45aa46daba32b3 (patch)
tree636a6c52f49a3f95864d9ecae07805219ac8ae45 /meta/recipes-graphics/mesa
parenteb768ce0b9825649737fa64bfabce4ff8fc9da75 (diff)
downloadpoky-aef0371ebafe1b0befe1ad96cc45aa46daba32b3.tar.gz
mesa: enable GLES v1 and v2
Patch originally by Damien Lespiau <damien.lespiau@intel.com>. (From OE-Core rev: d755fff9c9939cebab9c488c7b14de0a57235d3c) 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/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc12
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri.inc2
2 files changed, 12 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index aac3bbef82..24cc3d08ea 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ 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 = "r0" 15INC_PR = "r1"
16PE = "2" 16PE = "2"
17 17
18 18
@@ -21,7 +21,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
21 21
22DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}" 22DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS} ${LIB_DEPS}"
23 23
24PROVIDES = "virtual/libgl" 24PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
25 25
26# for mesa-dri and mesa-xlib 26# for mesa-dri and mesa-xlib
27FILESEXTRAPATHS_append := "${THISDIR}/mesa:" 27FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
@@ -34,6 +34,8 @@ EXTRA_OECONF = "--enable-glu \
34 --enable-glx-tls \ 34 --enable-glx-tls \
35 --enable-shared-glapi" 35 --enable-shared-glapi"
36 36
37PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}"
38
37# Multiple virtual/gl providers being built breaks staging 39# Multiple virtual/gl providers being built breaks staging
38EXCLUDE_FROM_WORLD = "1" 40EXCLUDE_FROM_WORLD = "1"
39 41
@@ -46,10 +48,14 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
46 libgl libgl-dev \ 48 libgl libgl-dev \
47 libglapi libglapi-dev \ 49 libglapi libglapi-dev \
48 libgbm libgbm-dev \ 50 libgbm libgbm-dev \
51 libgles1 libgles1-dev \
52 libgles2 libgles2-dev \
49 " 53 "
50 54
51FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" 55FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
52FILES_libgbm = "${libdir}/libgbm.so.*" 56FILES_libgbm = "${libdir}/libgbm.so.*"
57FILES_libgles1 = "${libdir}/libGLESv1*.so.*"
58FILES_libgles2 = "${libdir}/libGLESv2.so.*"
53FILES_libgl = "${libdir}/libGL.so.*" 59FILES_libgl = "${libdir}/libGL.so.*"
54FILES_libglapi = "${libdir}/libglapi.so.*" 60FILES_libglapi = "${libdir}/libglapi.so.*"
55FILES_libglu = "${libdir}/libGLU.so.*" 61FILES_libglu = "${libdir}/libGLU.so.*"
@@ -59,6 +65,8 @@ FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
59FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" 65FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
60FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 66FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
61FILES_libglapi-dev = "${libdir}/libglapi.*" 67FILES_libglapi-dev = "${libdir}/libglapi.*"
68FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
69FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
62FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc" 70FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
63FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" 71FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
64 72
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index f8f1fff4cc..32ca4b2146 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -12,6 +12,8 @@ EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
12EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" 12EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
13EXTRA_OECONF += "--disable-egl --enable-gbm" 13EXTRA_OECONF += "--disable-egl --enable-gbm"
14 14
15PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
16
15python populate_packages_prepend() { 17python populate_packages_prepend() {
16 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") 18 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
17 19