diff options
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-common.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-dri.inc | 6 |
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 6582bcf589..ff9f882d41 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -12,7 +12,7 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" -INC_PR = "r17" +INC_PR = "r18" PE = "2" @@ -45,15 +45,18 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \ libosmesa libosmesa-dev \ libgl libgl-dev \ libglapi libglapi-dev \ + libgbm libgbm-dev \ " FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so" +FILES_libgbm = "${libdir}/libgbm.so.*" FILES_libgl = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libglu = "${libdir}/libGLU.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" +FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" FILES_libglapi-dev = "${libdir}/libglapi.*" FILES_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 6bf2503296..f8f1fff4cc 100644 --- a/meta/recipes-graphics/mesa/mesa-dri.inc +++ b/meta/recipes-graphics/mesa/mesa-dri.inc @@ -1,5 +1,5 @@ PROTO_DEPS += "dri2proto" -LIB_DEPS += "libdrm expat" +LIB_DEPS += "libdrm expat udev" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" @@ -8,7 +8,9 @@ DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",i915,i965" DRIDRIVERS_append_x86-64 = ",i915,i965" -EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}" +EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" +EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" +EXTRA_OECONF += "--disable-egl --enable-gbm" python populate_packages_prepend() { dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") |