diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index f0b47df..42a3eab 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,72 +1,67 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11" +LIC_FILES_CHKSUM:rpi = "file://docs/license.rst;md5=ffe678546d4337b732cfd12262e6af11" PACKAGECONFIG:append:rpi = " gallium gallium-llvm vc4 v3d ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'vulkan broadcom', '', d)}" DRIDRIVERS:class-target:rpi = "" # Remove unused patches -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ +SRC_URI:rpi = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-freedreno-don-t-encode-build-path-into-binaries.patch \ file://0001-dont-build-clover-frontend.patch \ " -SRC_URI[sha256sum] = "9f2b69eb39d2d8717d30a9868fdda3e0c0d3708ba32778bbac8ddb044538ce84" -PV = "25.1.6" +PV:rpi = "25.1.6" -# -Dglvnd is deprecated from true/false to enabled/disabled -PACKAGECONFIG[glvnd] = "-Dglvnd=enabled, -Dglvnd=disabled, libglvnd" +python __anonymous() { + if d.getVar('SOC_FAMILY') == 'rpi' and d.getVar("PN") == d.getVar("BPN"): + d.setVarFlag("SRC_URI", "sha256sum", "9f2b69eb39d2d8717d30a9868fdda3e0c0d3708ba32778bbac8ddb044538ce84") +} # DRI3 note: # DRI3 Build option is removed from meson. -PACKAGECONFIG:remove = "dri3" -unset PACKAGECONFIG[dri3] +PACKAGECONFIG:remove:rpi = "dri3" -unset VULKAN_DRIVERS -VULKAN_DRIVERS_AMD = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',amd', '', d)}" -VULKAN_DRIVERS_ASAHI = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc opencl', ',asahi', '', d)}" -VULKAN_DRIVERS_INTEL = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',intel', '', d)}" -VULKAN_DRIVERS_SWRAST = ",swrast" +VULKAN_DRIVERS_AMD:rpi = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',amd', '', d)}" +VULKAN_DRIVERS_ASAHI:rpi = "${@bb.utils.contains('PACKAGECONFIG', 'asahi libclc opencl', ',asahi', '', d)}" +VULKAN_DRIVERS_INTEL:rpi = "${@bb.utils.contains('PACKAGECONFIG', 'intel libclc', ',intel', '', d)}" +VULKAN_DRIVERS_SWRAST:rpi = ",swrast" # Crashes on x32 VULKAN_DRIVERS_SWRAST:x86-x32 = "" -VULKAN_DRIVERS_LLVM = "${VULKAN_DRIVERS_SWRAST}${VULKAN_DRIVERS_AMD}${VULKAN_DRIVERS_ASAHI}${VULKAN_DRIVERS_INTEL}" +VULKAN_DRIVERS_LLVM:rpi = "${VULKAN_DRIVERS_SWRAST}${VULKAN_DRIVERS_AMD}${VULKAN_DRIVERS_ASAHI}${VULKAN_DRIVERS_INTEL}" -VULKAN_DRIVERS = "" -VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}" -VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${VULKAN_DRIVERS_LLVM}', '', d)}" -VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'imagination', ',imagination-experimental', '', d)}" -VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" -PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers" +EXTRA_OEMESON:remove:rpi = "-Ddri3=disabled" +EXTRA_OEMESON:remove:rpi = "-Dopencl-spirv=false" +# -Dglvnd is deprecated from true/false to enabled/disabled +EXTRA_OEMESON:remove:rpi = "-Dglvnd=false" +EXTRA_OEMESON:append:rpi = " -Dglvnd=disabled" -GALLIUMDRIVERS = "softpipe" +GALLIUMDRIVERS:rpi = "softpipe" -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd,-Dgallium-opencl=disabled," - -DEPENDS += " \ +DEPENDS:append:rpi = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-protocols', '', d)} \ llvm \ python3-pyyaml \ python3-pyyaml-native \ " -RDEPENDS:libgl-mesa += " \ +RDEPENDS:libgl-mesa:rpi += " \ llvm \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-protocols', '', d)} \ " -PACKAGES =+ " \ +PACKAGES:append:rpi = " \ libgallium \ " -FILES:libgbm = "${libdir}/libgbm.so.* ${libdir}/gbm/*_gbm.so" -FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${includedir}/gbm_backend_abi.h" -FILES:libgallium = "${libdir}/libgallium-*.so" +FILES:libgbm:rpi = "${libdir}/libgbm.so.* ${libdir}/gbm/*_gbm.so" +FILES:libgbm-dev:rpi = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${includedir}/gbm_backend_abi.h" +FILES:libgallium:rpi = "${libdir}/libgallium-*.so" -FILES:libgl-mesa += " ${libdir}/libgallium*.so" +FILES:libgl-mesa:append:rpi = " ${libdir}/libgallium*.so" -FILES:libgbm-dev += " ${includedir}/gbm.h" +FILES:libgbm-dev:append:rpi = " ${includedir}/gbm.h" # All DRI drivers are symlinks to libdril_dri.so INSANE_SKIP:${PN}-megadriver += "dev-so" diff --git a/recipes-graphics/wayland/wayland-protocols_1.45.bb b/recipes-graphics/wayland/wayland-protocols_%.bbappend similarity index 64% rename from recipes-graphics/wayland/wayland-protocols_1.45.bb rename to recipes-graphics/wayland/wayland-protocols_%.bbappend index d98ccf9..a2b4021 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.45.bb +++ b/recipes-graphics/wayland/wayland-protocols_%.bbappend @@ -9,17 +9,23 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" -SRC_URI[sha256sum] = "4d2b2a9e3e099d017dc8107bf1c334d27bb87d9e4aff19a0c8d856d17cd41ef0" +PV:rpi = "1.45" + +SRC_URI:rpi = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" + +python __anonymous() { + if d.getVar('SOC_FAMILY') == 'rpi' and d.getVar("PN") == d.getVar("BPN"): + d.setVarFlag("SRC_URI", "sha256sum", "4d2b2a9e3e099d017dc8107bf1c334d27bb87d9e4aff19a0c8d856d17cd41ef0") +} UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" UPSTREAM_CHECK_REGEX = "releases/(?P.+)" -DEPENDS += "wayland-native" +DEPENDS:append:rpi = " wayland-native" inherit meson pkgconfig allarch -EXTRA_OEMESON += "-Dtests=false" +EXTRA_OEMESON:append:rpi = " -Dtests=false" BBCLASSEXTEND = "native nativesdk"