From patchwork Thu Aug 2 16:49:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V3,11/11] mesa: enable EGL, with DRM and X11 platforms Date: Thu, 02 Aug 2012 16:49:05 -0000 From: Ross Burton X-Patchwork-Id: 33705 Message-Id: <5de29e150a720ccb8749362cfe5fb56f234fb385.1343926021.git.ross.burton@intel.com> To: openembedded-core@lists.openembedded.org Patch originally by Damien Lespiau . Signed-off-by: Ross Burton --- meta/recipes-graphics/mesa/mesa-common.inc | 7 ++++--- meta/recipes-graphics/mesa/mesa-dri.inc | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index 77107ab..b0d7a9e 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -17,7 +17,7 @@ PE = "2" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2" +PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl" # for mesa-dri and mesa-xlib FILESEXTRAPATHS_append := "${THISDIR}/mesa:" @@ -29,7 +29,8 @@ EXTRA_OECONF = "--enable-glu \ --disable-glut \ --enable-shared-glapi" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'egl', 'egl', '', d)}" X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" @@ -59,7 +60,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libglu = "${libdir}/libGLU.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" -FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL" +FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" 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.*" diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc index ab4487f..35d17a4 100644 --- a/meta/recipes-graphics/mesa/mesa-dri.inc +++ b/meta/recipes-graphics/mesa/mesa-dri.inc @@ -8,10 +8,15 @@ DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",i915,i965" DRIDRIVERS_append_x86-64 = ",i915,i965" +EGL_PLATFORMS = "drm" +EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}" + EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}" EXTRA_OECONF += "--enable-gles1 --enable-gles2" -EXTRA_OECONF += "--disable-egl --enable-gbm" +EXTRA_OECONF += "--enable-gbm" + +PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}", "--disable-egl" python populate_packages_prepend() { dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")