summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-02 16:48:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-06 14:18:52 (GMT)
commitabfa907b4c4e682be63b82a14d5f0855d137e3c5 (patch)
tree671b87858b366b08b97a9700766070325638370e
parent8b4015a52b3b28578a4454a7f3fac72022a7fd2f (diff)
downloadpoky-abfa907b4c4e682be63b82a14d5f0855d137e3c5.tar.gz
mesa: enable the Graphic Buffer Manager library
(From OE-Core rev: be882417cf432fe79a843cea4439503f286206cf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc5
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri.inc6
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 6582bcf..ff9f882 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=7a3373c039b6b925c427755a4f779c1d" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
14 14
15INC_PR = "r17" 15INC_PR = "r18"
16PE = "2" 16PE = "2"
17 17
18 18
@@ -45,15 +45,18 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
45 libosmesa libosmesa-dev \ 45 libosmesa libosmesa-dev \
46 libgl libgl-dev \ 46 libgl libgl-dev \
47 libglapi libglapi-dev \ 47 libglapi libglapi-dev \
48 libgbm libgbm-dev \
48 " 49 "
49 50
50FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" 51FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
52FILES_libgbm = "${libdir}/libgbm.so.*"
51FILES_libgl = "${libdir}/libGL.so.*" 53FILES_libgl = "${libdir}/libGL.so.*"
52FILES_libglapi = "${libdir}/libglapi.so.*" 54FILES_libglapi = "${libdir}/libglapi.so.*"
53FILES_libglu = "${libdir}/libGLU.so.*" 55FILES_libglu = "${libdir}/libGLU.so.*"
54FILES_libosmesa = "${libdir}/libOSMesa.so.*" 56FILES_libosmesa = "${libdir}/libOSMesa.so.*"
55 57
56FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" 58FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
59FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
57FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" 60FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
58FILES_libglapi-dev = "${libdir}/libglapi.*" 61FILES_libglapi-dev = "${libdir}/libglapi.*"
59FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc" 62FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 6bf2503..f8f1fff 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -1,5 +1,5 @@
1PROTO_DEPS += "dri2proto" 1PROTO_DEPS += "dri2proto"
2LIB_DEPS += "libdrm expat" 2LIB_DEPS += "libdrm expat udev"
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"
@@ -8,7 +8,9 @@ DRIDRIVERS = "swrast"
8DRIDRIVERS_append_x86 = ",i915,i965" 8DRIDRIVERS_append_x86 = ",i915,i965"
9DRIDRIVERS_append_x86-64 = ",i915,i965" 9DRIDRIVERS_append_x86-64 = ",i915,i965"
10 10
11EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}" 11EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
12EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
13EXTRA_OECONF += "--disable-egl --enable-gbm"
12 14
13python populate_packages_prepend() { 15python populate_packages_prepend() {
14 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") 16 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")