diff options
Diffstat (limited to 'poky/meta/recipes-graphics/mesa/mesa.inc')
-rw-r--r-- | poky/meta/recipes-graphics/mesa/mesa.inc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 883c24447..9f8ec112c 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ " -SRC_URI[sha256sum] = "af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f" +SRC_URI[sha256sum] = "dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" @@ -218,6 +218,9 @@ do_install_append () { # RPROVIDEs/RCONFLICTs on the generic libgl name. python __anonymous() { pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() + suffix = "" + if "-native" in d.getVar("PN"): + suffix = "-native" for p in (("egl", "libegl", "libegl1"), ("dri", "libgl", "libgl1"), ("gles", "libgles1", "libglesv1-cm1"), @@ -226,19 +229,19 @@ python __anonymous() { if not p[0] in pkgconfig: continue mlprefix = d.getVar("MLPREFIX") - fullp = mlprefix + p[1] + "-mesa" + fullp = mlprefix + p[1] + "-mesa" + suffix mlprefix = d.getVar("MLPREFIX") - pkgs = " ".join(mlprefix + x for x in p[1:]) + pkgs = " ".join(mlprefix + x + suffix for x in p[1:]) d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs) d.appendVar("RCONFLICTS_" + fullp, pkgs) - d.appendVar("RRECOMMENDS_" + fullp, " ${MLPREFIX}mesa-megadriver") + d.appendVar("RRECOMMENDS_" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix) # For -dev, the first element is both the Debian and original name - fullp += "-dev" - pkgs = mlprefix + p[1] + "-dev" + fullp = mlprefix + p[1] + "-mesa-dev" + suffix + pkgs = mlprefix + p[1] + "-dev" + suffix d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs) @@ -272,6 +275,7 @@ python mesa_populate_packages() { PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" +PACKAGES_DYNAMIC_class-native = "^mesa-driver-.*-native" FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" |