From b5290a01a40cf79cb985b52373766c69b22bdc99 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 13 Jun 2013 01:20:00 +0200 Subject: [PATCH] mesa: introduce gallium PACKAGECONFIG (From OE-Core rev: 26276a215d7e09856d5e418edacab63197508050) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index a210415..6207bb6 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -37,7 +37,6 @@ DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm udev" -EXTRA_OECONF += "--disable-gallium --without-gallium-drivers" EXTRA_OECONF += "--enable-gbm" PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" @@ -47,6 +46,9 @@ EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" +GALLIUMDRIVERS = "swrast" +PACKAGECONFIG[gallium] = "--enable-gallium --with-gallium-drivers=${GALLIUMDRIVERS}, --disable-gallium --without-gallium-drivers" + # Multiple virtual/gl providers being built breaks staging EXCLUDE_FROM_WORLD = "1" @@ -63,6 +65,7 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libwayland-egl libwayland-egl-dev \ + libegl-gallium libgbm-gallium \ " do_install_append () { @@ -108,6 +111,9 @@ python populate_packages_prepend() { d.setVar("RPROVIDES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) d.setVar("RCONFLICTS_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa-", "mesa-dri-")) + + pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") + do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') } PACKAGES_DYNAMIC += "^mesa-driver-.*" @@ -123,6 +129,8 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" +FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" +FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" FILES_libdricore-dev = "${libdir}/libdricore*.*" @@ -136,4 +144,4 @@ FILES_libgles3-mesa-dev = "${includedir}/GLES3" FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" -FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" +FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug" -- 2.7.4