From 59d36c9832702989bfcca8a5af29fb2dff01efcc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 2 Aug 2021 11:01:05 -0700 Subject: layer: Convert to new override syntax Signed-off-by: Khem Raj --- recipes-graphics/cairo/cairo_%.bbappend | 4 +- recipes-graphics/drm/libdrm_2.4.102.imx.bb | 32 ++-- recipes-graphics/gtk+/gtk+3_%.bbappend | 4 +- recipes-graphics/images/core-image-weston.bbappend | 2 +- recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.14.bb | 10 +- .../imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb | 10 +- .../imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.4.bb | 8 +- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 168 ++++++++++----------- recipes-graphics/libepoxy/libepoxy_1.5.%.bbappend | 2 +- recipes-graphics/libsdl2/libsdl2_%.bbappend | 4 +- recipes-graphics/mesa/mesa-demos_%.bbappend | 16 +- recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb | 4 +- recipes-graphics/mesa/mesa-gl_%.bbappend | 2 +- recipes-graphics/mesa/mesa_%.bbappend | 22 +-- recipes-graphics/vulkan/vulkan-loader_%.bbappend | 2 +- recipes-graphics/waffle/waffle_%.bbappend | 10 +- .../wayland/wayland-protocols_1.20.imx.bb | 2 +- recipes-graphics/wayland/weston-init.bbappend | 26 ++-- recipes-graphics/wayland/weston_9.0.0.imx.bb | 48 +++--- .../xinput-calibrator/pointercal-xinput_%.bbappend | 2 +- .../xf86-video-imx-vivante_6.4.0.p0.0.bb | 12 +- .../xorg-xserver/xserver-xf86-config_%.bbappend | 2 +- .../xorg-xserver/xserver-xorg_%.bbappend | 14 +- recipes-graphics/xwayland/xwayland_%.bbappend | 6 +- 24 files changed, 206 insertions(+), 206 deletions(-) (limited to 'recipes-graphics') diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend index 5b1562ab..2c73c7f3 100644 --- a/recipes-graphics/cairo/cairo_%.bbappend +++ b/recipes-graphics/cairo/cairo_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_imxgpu3d = " egl glesv2" -PACKAGECONFIG_remove_imxgpu3d = "opengl" +PACKAGECONFIG:append:imxgpu3d = " egl glesv2" +PACKAGECONFIG:remove:imxgpu3d = "opengl" diff --git a/recipes-graphics/drm/libdrm_2.4.102.imx.bb b/recipes-graphics/drm/libdrm_2.4.102.imx.bb index 6935b782..bffef407 100644 --- a/recipes-graphics/drm/libdrm_2.4.102.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.102.imx.bb @@ -42,32 +42,32 @@ PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false" PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native" -ALLOW_EMPTY_${PN}-drivers = "1" +ALLOW_EMPTY:${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \ ${PN}-etnaviv" -RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ +RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ ${PN}-etnaviv" -FILES_${PN}-tests = "${bindir}/*" -FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" -FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" -FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" -FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" -FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES_${PN}-kms = "${libdir}/libkms*.so.*" -FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" -FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" +FILES:${PN}-tests = "${bindir}/*" +FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*" +FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" +FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" +FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" +FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" +FILES:${PN}-kms = "${libdir}/libkms*.so.*" +FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" +FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" +FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" BBCLASSEXTEND = "native nativesdk" -PACKAGES_prepend_imxgpu = "${PN}-vivante " -RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante" -FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*" -PACKAGECONFIG_append_imxgpu = " vivante" +PACKAGES:prepend:imxgpu = "${PN}-vivante " +RRECOMMENDS:${PN}-drivers:append:imxgpu = " ${PN}-vivante" +FILES:${PN}-vivante = "${libdir}/libdrm_vivante.so.*" +PACKAGECONFIG:append:imxgpu = " vivante" PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false" PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/gtk+/gtk+3_%.bbappend b/recipes-graphics/gtk+/gtk+3_%.bbappend index be2bac75..2f108a27 100644 --- a/recipes-graphics/gtk+/gtk+3_%.bbappend +++ b/recipes-graphics/gtk+/gtk+3_%.bbappend @@ -1,5 +1,5 @@ -DEPENDS_append_imxgpu2d = " virtual/egl" +DEPENDS:append:imxgpu2d = " virtual/egl" -PACKAGECONFIG_remove_imxgpu2d = " \ +PACKAGECONFIG:remove:imxgpu2d = " \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "x11", "", d)} \ " diff --git a/recipes-graphics/images/core-image-weston.bbappend b/recipes-graphics/images/core-image-weston.bbappend index 2a3cde69..77d2fe74 100644 --- a/recipes-graphics/images/core-image-weston.bbappend +++ b/recipes-graphics/images/core-image-weston.bbappend @@ -1,3 +1,3 @@ # FIXME: i.MX6SL cannot use mesa for Graphics and it lacks GL support, # so for now we skip it. -CORE_IMAGE_BASE_INSTALL_remove_mx6sl = "clutter-1.0-examples" +CORE_IMAGE_BASE_INSTALL:remove:mx6sl = "clutter-1.0-examples" diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.14.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.14.bb index 1176fa1a..5e3c923d 100644 --- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.14.bb +++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.14.bb @@ -21,15 +21,15 @@ do_install () { cp -r ${S}/gpu-demos/opt ${D} } -FILES_${PN} = "${libdir}/libg2d* /opt" -FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}" -INSANE_SKIP_${PN} += "ldflags" +FILES:${PN} = "${libdir}/libg2d* /opt" +FILES:${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}" +INSANE_SKIP:${PN} += "ldflags" -RDEPENDS_${PN} = "libgal-imx libdrm" +RDEPENDS:${PN} = "libgal-imx libdrm" # This is required to provide support for VPU Amphion HEVC tile format # From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99): # VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx. -RDEPENDS_${PN} += "libopencl-imx" +RDEPENDS:${PN} += "libopencl-imx" COMPATIBLE_MACHINE = "(imxdpu)" diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb index 65ce9cd5..58eb5f44 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb @@ -11,16 +11,16 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig perlnative python3native -PACKAGECONFIG_BACKEND_mx6 = " \ +PACKAGECONFIG_BACKEND:mx6 = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ '', d), d)} \ " -PACKAGECONFIG_BACKEND_mx7 = "${PACKAGECONFIG_BACKEND_mx6}" -PACKAGECONFIG_BACKEND_mx8 = "waffle" +PACKAGECONFIG_BACKEND:mx7 = "${PACKAGECONFIG_BACKEND:mx6}" +PACKAGECONFIG_BACKEND:mx8 = "waffle" PACKAGECONFIG_GPU2D = "" -PACKAGECONFIG_GPU2D_imxgpu2d = "vivante" +PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" PACKAGECONFIG ??= " \ egl \ @@ -37,7 +37,7 @@ PACKAGECONFIG[vivante] = "-DENABLE_VIVANTE=ON,-DENABLE_VIVANTE=OFF,virtual/libg2 SOLIBS = ".so" FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/apitrace/scripts/* \ ${libdir}/apitrace/wrappers/* \ " diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.4.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.4.bb index 257ecf16..2afe1166 100644 --- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.4.bb +++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.4.bb @@ -30,10 +30,10 @@ do_install () { cp -r ${S}/gpu-demos/opt ${D} } -FILES_${PN} = "${libdir}/libg2d* /opt" -FILES_${PN}-dev = "${includedir}" -INSANE_SKIP_${PN} = "ldflags" +FILES:${PN} = "${libdir}/libg2d* /opt" +FILES:${PN}-dev = "${includedir}" +INSANE_SKIP:${PN} = "ldflags" -RDEPENDS_${PN} = "libgal-imx" +RDEPENDS:${PN} = "libgal-imx" COMPATIBLE_MACHINE = "(imxgpu2d)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 91a5542b..e486d689 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -17,8 +17,8 @@ DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb libxshmfence libxxf86vm', \ '', d)} \ " -DEPENDS_append_imxdrm = " libdrm wayland" -DEPENDS_append_mx8 = " patchelf-native" +DEPENDS:append_imxdrm = " libdrm wayland" +DEPENDS:append:mx8 = " patchelf-native" # imx-gpu-viv does not provide everything it needs to for virtual/libgl # on x11 backend or on Wayland backend with XWayland support. @@ -26,19 +26,19 @@ DEPENDS_append_mx8 = " patchelf-native" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}" EXTRA_PROVIDES = "" -EXTRA_PROVIDES_append_imxgpu3d = " \ +EXTRA_PROVIDES:append:imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'virtual/libgl', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libgl', \ '', d), d)} \ virtual/libgles1 \ virtual/libgles2 \ " -EXTRA_PROVIDES_append_mx8 = " \ +EXTRA_PROVIDES:append:mx8 = " \ virtual/libgbm \ " PROVIDES_OPENVX = "" -PROVIDES_OPENVX_mx8 = "virtual/libopenvx" -PROVIDES_OPENVX_mx8mm = "" +PROVIDES_OPENVX:mx8 = "virtual/libopenvx" +PROVIDES_OPENVX:mx8mm = "" PROVIDES += " \ imx-gpu-viv \ libgal-imx \ @@ -52,13 +52,13 @@ PROVIDES += " \ ${EXTRA_PROVIDES} \ " -RPROVIDES_${PN}_imxgpu3d += "imx-gpu-viv" +RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv" PE = "1" inherit fsl-eula-unpack features_check -REQUIRED_DISTRO_FEATURES_mx8 = "wayland" +REQUIRED_DISTRO_FEATURES:mx8 = "wayland" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" @@ -69,7 +69,7 @@ PACKAGECONFIG[valgrind] = "" # Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below IMX_PACKAGES_GBM = "" -IMX_PACKAGES_GBM_mx8 = "libgbm-imx libgbm-imx-dev" +IMX_PACKAGES_GBM:mx8 = "libgbm-imx libgbm-imx-dev" PACKAGES =+ "libclc-imx libclc-imx-dev \ libgl-imx libgl-imx-dev \ libgles1-imx libgles1-imx-dev \ @@ -104,7 +104,7 @@ USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" # Inhibit warnings about files being stripped. INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -INSANE_SKIP_${BPN} += "already-stripped" +INSANE_SKIP:${BPN} += "already-stripped" # FIXME: The provided binary doesn't provide soname. If in future BSP # release the libraries are fixed, we can drop this hack. @@ -116,7 +116,7 @@ python __anonymous() { # the source we cannot fix it. Disable the insane check for now. packages = d.getVar('PACKAGES').split() for p in packages: - d.appendVar("INSANE_SKIP_%s" % p, " ldflags") + d.appendVar("INSANE_SKIP:%s" % p, " ldflags") # For the packages that make up the OpenGL interfaces, inject variables so that # they don't get Debian-renamed (which would remove the -imx suffix). @@ -125,36 +125,36 @@ python __anonymous() { ("libgles3",), ("libgbm",)): fullp = p[0] + "-imx" pkgs = "".join(' %s' % i for i in p) - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") + d.appendVar("RREPLACES:" + fullp, pkgs) + d.appendVar("RPROVIDES:" + fullp, pkgs) + d.appendVar("RCONFLICTS:" + fullp, pkgs) # For -dev, the first element is both the Debian and original name fullp += "-dev" pkgs = p[0] + "-dev" - d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") - d.appendVar("RREPLACES_" + fullp, pkgs) - d.appendVar("RPROVIDES_" + fullp, pkgs) - d.appendVar("RCONFLICTS_" + fullp, pkgs) + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") + d.appendVar("RREPLACES:" + fullp, pkgs) + d.appendVar("RPROVIDES:" + fullp, pkgs) + d.appendVar("RCONFLICTS:" + fullp, pkgs) } IS_MX6SL = "0" -IS_MX6SL_mx6sl = "1" +IS_MX6SL:mx6sl = "1" IS_MX8 = "0" -IS_MX8_mx8 = "1" +IS_MX8:mx8 = "1" PACKAGE_FP_TYPE = "hardfp" HAS_GBM = "false" -HAS_GBM_mx8 = "true" +HAS_GBM:mx8 = "true" GLES3_HEADER_REMOVALS = "gl31.h gl32.h" -GLES3_HEADER_REMOVALS_mx8m = "gl32.h" -GLES3_HEADER_REMOVALS_mx8mm = "gl31.h gl32.h" -GLES3_HEADER_REMOVALS_mx8qxp = "" -GLES3_HEADER_REMOVALS_mx8qm = "" +GLES3_HEADER_REMOVALS:mx8m = "gl32.h" +GLES3_HEADER_REMOVALS:mx8mm = "gl31.h gl32.h" +GLES3_HEADER_REMOVALS:mx8qxp = "" +GLES3_HEADER_REMOVALS:mx8qm = "" do_install () { install -d ${D}${libdir} @@ -272,98 +272,98 @@ do_install () { chown -R root:root "${D}" } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -FILES_libclc-imx = "${libdir}/libCLC${SOLIBS}" -FILES_libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" +FILES:libclc-imx = "${libdir}/libCLC${SOLIBS}" +FILES:libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" # libEGL.so is used by some demo apps from Freescale -INSANE_SKIP_libegl-imx += "dev-so" -FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " -FILES_libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" +INSANE_SKIP:libegl-imx += "dev-so" +FILES:libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " +FILES:libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" -FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" -FILES_libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL" -RDEPENDS_libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}" -RPROVIDES_libgal-imx += "libgal-imx" -RRECOMMENDS_libgal-imx += "kernel-module-imx-gpu-viv" -INSANE_SKIP_libgal-imx += "build-deps" +FILES:libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}" +FILES:libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL" +RDEPENDS:libgal-imx += "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', 'valgrind', '', d)}" +RPROVIDES:libgal-imx += "libgal-imx" +RRECOMMENDS:libgal-imx += "kernel-module-imx-gpu-viv" +INSANE_SKIP:libgal-imx += "build-deps" -FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" +FILES:libvsc-imx = "${libdir}/libVSC${SOLIBS}" -FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" -FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -RDEPENDS_libgbm-imx_append_mx8 = " libdrm" -INSANE_SKIP_libgbm-imx += "dev-so" +FILES:libgbm-imx:mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" +FILES:libgbm-imx-dev:mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" +RDEPENDS:libgbm-imx:append:mx8 = " libdrm" +INSANE_SKIP:libgbm-imx += "dev-so" -FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" -FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" +FILES:libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" +FILES:libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" -FILES_libopenvx-imx = " \ +FILES:libopenvx-imx = " \ ${libdir}/libOpenVX${REALSOLIBS} \ ${libdir}/libOpenVXC${SOLIBS} \ ${libdir}/libOpenVXU${SOLIBS} \ ${libdir}/libOvx*${SOLIBS} \ ${libdir}/libArchModelSw${SOLIBS} \ " -FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}" -RDEPENDS_libopenvx-imx = "libnn-imx" +FILES:libopenvx-imx-dev = "${includedir}/VX ${libdir}/libOpenVX${SOLIBSDEV}" +RDEPENDS:libopenvx-imx = "libnn-imx" -FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}" -FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" +FILES:libgl-imx = "${libdir}/libGL${REALSOLIBS}" +FILES:libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL" # libEGL needs to open libGLESv1.so -INSANE_SKIP_libgles1-imx += "dev-so" -FILES_libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" -FILES_libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" -RPROVIDES_libgles1-imx = "libgles-imx" -RPROVIDES_libgles1-imx-dev = "libgles-imx-dev" +INSANE_SKIP:libgles1-imx += "dev-so" +FILES:libgles1-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}" +FILES:libgles1-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" +RPROVIDES:libgles1-imx = "libgles-imx" +RPROVIDES:libgles1-imx-dev = "libgles-imx-dev" # libEGL needs to open libGLESv2.so -INSANE_SKIP_libgles2-imx += "dev-so" -FILES_libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" -FILES_libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" -RDEPENDS_libgles2-imx = "libglslc-imx" +INSANE_SKIP:libgles2-imx += "dev-so" +FILES:libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" +FILES:libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" +RDEPENDS:libgles2-imx = "libglslc-imx" -FILES_libgles3-imx-dev = "${includedir}/GLES3" +FILES:libgles3-imx-dev = "${includedir}/GLES3" # as long as there is no libgles3: ship libgles3-dev along with # libgles2-dev - otherwise GLES3 headers have to be added manually -RDEPENDS_libgles2-imx-dev += "libgles3-imx-dev" +RDEPENDS:libgles2-imx-dev += "libgles3-imx-dev" -FILES_libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" -FILES_libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" +FILES:libglslc-imx = "${libdir}/libGLSLC${SOLIBS}" +FILES:libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" -FILES_libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ +FILES:libopencl-imx = "${libdir}/libOpenCL${REALSOLIBS} \ ${libdir}/libVivanteOpenCL${SOLIBS} \ ${libdir}/libLLVM_viv${SOLIBS} \ ${sysconfdir}/OpenCL/vendors/Vivante.icd" -FILES_libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}" -RDEPENDS_libopencl-imx= "libclc-imx" +FILES:libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}" +RDEPENDS:libopencl-imx= "libclc-imx" -FILES_libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS}" -FILES_libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc" +FILES:libopenvg-imx = "${libdir}/libOpenVG*${REALSOLIBS}" +FILES:libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc" -FILES_libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" -FILES_libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" +FILES:libvdk-imx = "${libdir}/libVDK*${REALSOLIBS}" +FILES:libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}" -FILES_libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" -RDEPENDS_libvivante-dri-imx = "libdrm" +FILES:libvivante-dri-imx = "${libdir}/dri/vivante_dri.so" +RDEPENDS:libvivante-dri-imx = "libdrm" -INSANE_SKIP_libwayland-viv-imx += "dev-so" -FILES_libwayland-viv-imx = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" -FILES_libwayland-viv-imx-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" -RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imx-vivante', '', d)}" +INSANE_SKIP:libwayland-viv-imx += "dev-so" +FILES:libwayland-viv-imx = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" +FILES:libwayland-viv-imx-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" +RPROVIDES:libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imx-vivante', '', d)}" -INSANE_SKIP_libgc-wayland-protocol-imx += "dev-so" -FILES_libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}" -FILES_libgc-wayland-protocol-imx-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc" +INSANE_SKIP:libgc-wayland-protocol-imx += "dev-so" +FILES:libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}" +FILES:libgc-wayland-protocol-imx-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc" -FILES_imx-gpu-viv-tools = "${bindir}/gmem_info" +FILES:imx-gpu-viv-tools = "${bindir}/gmem_info" -FILES_imx-gpu-viv-demos = "/opt" -INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps" +FILES:imx-gpu-viv-demos = "/opt" +INSANE_SKIP:imx-gpu-viv-demos += "rpaths dev-deps" -FILES_libnn-imx = "${libdir}/libNN*${SOLIBS} ${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" -FILES_libnn-imx-dev = "${includedir}/nnrt" +FILES:libnn-imx = "${libdir}/libNN*${SOLIBS} ${libdir}/libnn*${SOLIBS} ${libdir}/libneuralnetworks${SOLIBS}" +FILES:libnn-imx-dev = "${includedir}/nnrt" # COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)" diff --git a/recipes-graphics/libepoxy/libepoxy_1.5.%.bbappend b/recipes-graphics/libepoxy/libepoxy_1.5.%.bbappend index 5b82b3f4..71baa53d 100644 --- a/recipes-graphics/libepoxy/libepoxy_1.5.%.bbappend +++ b/recipes-graphics/libepoxy/libepoxy_1.5.%.bbappend @@ -1,5 +1,5 @@ # Append EGL_CFLAGS to CFLAGS -CFLAGS_append_imxgpu = " \ +CFLAGS:append:imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DWL_EGL_PLATFORM', '', d)} \ " diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend index 303ea63a..af9c97bb 100644 --- a/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,8 +1,8 @@ # what vivante driver does libsdl2 mean? Anyway it fails with missing functions as # VIVANTE_Create VIVANTE_GLES_GetProcAddress VIVANTE_GLES_UnloadLibrary ... -EXTRA_OECONF_append_imxgpu2d = " --disable-video-vivante" +EXTRA_OECONF:append:imxgpu2d = " --disable-video-vivante" -CFLAGS_append_imxgpu = " -DLINUX \ +CFLAGS:append:imxgpu = " -DLINUX \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_API_FB', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '-DWL_EGL_PLATFORM', '', d)} \ " diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 301f1b59..4b518185 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,26 +1,26 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ +SRC_URI:append:imxgpu = " file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ file://fix-clear-build-break.patch \ file://Add-OpenVG-demos-to-support-wayland.patch" PACKAGECONFIG_REMOVE_IF_2D_ONLY = "" -PACKAGECONFIG_REMOVE_IF_2D_ONLY_imxgpu2d = "gles1 gles2" -PACKAGECONFIG_REMOVE_IF_2D_ONLY_imxgpu3d = "" +PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu2d = "gles1 gles2" +PACKAGECONFIG_REMOVE_IF_2D_ONLY:imxgpu3d = "" PACKAGECONFIG_REMOVE_IF_GPU = "" -PACKAGECONFIG_REMOVE_IF_GPU_imxgpu = " \ +PACKAGECONFIG_REMOVE_IF_GPU:imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu x11', '', d)} \ " -PACKAGECONFIG_remove = " \ +PACKAGECONFIG:remove = " \ ${PACKAGECONFIG_REMOVE_IF_2D_ONLY} \ ${PACKAGECONFIG_REMOVE_IF_GPU} \ " PACKAGECONFIG_APPEND_IF_GPU = "" -PACKAGECONFIG_APPEND_IF_GPU_imxgpu = " \ +PACKAGECONFIG_APPEND_IF_GPU:imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland vg', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glut', '', d)} \ " -PACKAGECONFIG_append = " \ +PACKAGECONFIG:append = " \ ${PACKAGECONFIG_APPEND_IF_GPU} \ " diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb index 2a32c448..87d05365 100644 --- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb +++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb @@ -12,7 +12,7 @@ SRC_URI = "\ do_configure[noexec] = "1" do_compile[noexec] = "1" -do_install_use-mainline-bsp() { +do_install:use-mainline-bsp() { # MESA global envirronment variables # systemd @@ -28,4 +28,4 @@ do_install_use-mainline-bsp() { fi } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend index ca1c8f46..dafd27f0 100644 --- a/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1 +1 @@ -COMPATIBLE_MACHINE_imxgpu = "(-)" +COMPATIBLE_MACHINE:imxgpu = "(-)" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 423ee63e..fedadab2 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_use-mainline-bsp = " \ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +SRC_URI:append:use-mainline-bsp = " \ file://0001-dri-add-createImageWithModifiers2-interface.patch \ file://0002-dri-add-loader_dri_create_image-helper.patch \ file://0003-loader-dri3-convert-to-loader_dri_create_image.patch \ @@ -11,11 +11,11 @@ SRC_URI_append_use-mainline-bsp = " \ file://0009-etnaviv-flush-used-render-buffers-on-context-flush-w.patch \ " -PROVIDES_remove_imxgpu = "virtual/egl" -PROVIDES_remove_imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2" +PROVIDES:remove:imxgpu = "virtual/egl" +PROVIDES:remove:imxgpu3d = "virtual/libgl virtual/libgles1 virtual/libgles2" -PACKAGECONFIG_remove_imxgpu = "egl gbm" -PACKAGECONFIG_remove_imxgpu3d = "gles" +PACKAGECONFIG:remove:imxgpu = "egl gbm" +PACKAGECONFIG:remove:imxgpu3d = "gles" # FIXME: mesa should support 'x11-no-tls' option python () { @@ -28,13 +28,13 @@ python () { } # Enable Etnaviv and Freedreno support -PACKAGECONFIG_append_use-mainline-bsp = " gallium etnaviv kmsro freedreno" +PACKAGECONFIG:append:use-mainline-bsp = " gallium etnaviv kmsro freedreno" # For NXP BSP, GPU drivers don't support dri -PACKAGECONFIG_remove_imxgpu_use-nxp-bsp = "dri" +PACKAGECONFIG:remove:imxgpu:use-nxp-bsp = "dri" # mainline/etnaviv: -RRECOMMENDS_${PN}-megadriver_append_use-mainline-bsp = " libdrm-etnaviv mesa-etnaviv-env" +RRECOMMENDS:${PN}-megadriver:append:use-mainline-bsp = " libdrm-etnaviv mesa-etnaviv-env" BACKEND = \ "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -42,7 +42,7 @@ BACKEND = \ 'fb', d), d)}" # FIXME: Dirty hack to allow use of Vivante GPU libGL binary -do_install_append_imxgpu3d () { +do_install:append:imxgpu3d () { rm -f ${D}${libdir}/libGL.* \ ${D}${includedir}/GL/gl.h \ ${D}${includedir}/GL/glcorearb.h \ @@ -54,6 +54,6 @@ do_install_append_imxgpu3d () { fi } -do_install_append_imxgpu () { +do_install:append:imxgpu () { rm -rf ${D}${includedir}/KHR } diff --git a/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/recipes-graphics/vulkan/vulkan-loader_%.bbappend index 28e1dc32..90776168 100644 --- a/recipes-graphics/vulkan/vulkan-loader_%.bbappend +++ b/recipes-graphics/vulkan/vulkan-loader_%.bbappend @@ -1,3 +1,3 @@ # The i.MX implementation is dynamically loaded, so it requires an # explicit runtime dependency. -RRECOMMENDS_${PN}_append_imxgpu = " libvulkan-imx" +RRECOMMENDS:${PN}:append:imxgpu = " libvulkan-imx" diff --git a/recipes-graphics/waffle/waffle_%.bbappend b/recipes-graphics/waffle/waffle_%.bbappend index 9d090bcf..380273a8 100644 --- a/recipes-graphics/waffle/waffle_%.bbappend +++ b/recipes-graphics/waffle/waffle_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-meson-Add-missing-wayland-dependency-on-EGL.patch \ @@ -6,11 +6,11 @@ SRC_URI += " \ " PACKAGECONFIG_IMXGPU_X11 = "" -PACKAGECONFIG_IMXGPU_X11_imxgpu3d = "x11-egl glx" +PACKAGECONFIG_IMXGPU_X11:imxgpu3d = "x11-egl glx" PACKAGECONFIG_IMXGPU_GBM = "gbm" -PACKAGECONFIG_IMXGPU_GBM_mx6 = "" -PACKAGECONFIG_IMXGPU_GBM_mx7 = "" -PACKAGECONFIG_imxgpu = " \ +PACKAGECONFIG_IMXGPU_GBM:mx6 = "" +PACKAGECONFIG_IMXGPU_GBM:mx7 = "" +PACKAGECONFIG:imxgpu = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', '${PACKAGECONFIG_IMXGPU_X11}', \ '', d), d)} \ diff --git a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb index 852b3160..0d1f4726 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig PACKAGES = "${PN}" -FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" +FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(imxfbdev|imxgpu)" diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index ebd98268..e6baac0b 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -1,24 +1,24 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # OpenGL is not required for parts with GPU support for 2D but not 3D IMX_REQUIRED_DISTRO_FEATURES_REMOVE = "" -IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu2d = "opengl" -IMX_REQUIRED_DISTRO_FEATURES_REMOVE_imxgpu3d = "" -REQUIRED_DISTRO_FEATURES_remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}" +IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu2d = "opengl" +IMX_REQUIRED_DISTRO_FEATURES_REMOVE:imxgpu3d = "" +REQUIRED_DISTRO_FEATURES:remove = "${IMX_REQUIRED_DISTRO_FEATURES_REMOVE}" -SRC_URI_append_mx6sl = " file://weston.config" +SRC_URI:append:mx6sl = " file://weston.config" # To customize weston.ini, start by setting the desired assignment in weston.ini, # commented out. For example: # #xwayland=true # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. -INI_UNCOMMENT_ASSIGNMENTS_append_imx = " \ +INI_UNCOMMENT_ASSIGNMENTS:append_imx = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ " -INI_UNCOMMENT_ASSIGNMENTS_append_mx8 = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \ repaint-window=16 \ " -INI_UNCOMMENT_ASSIGNMENTS_append_mx8mq = " \ +INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq = " \ gbm-format=argb8888 \ \\[shell\\] \ size=1920x1080 \ @@ -27,10 +27,10 @@ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mq = " \ # FIXME: The 8QM and 8QXP SoCs have better performance without G2D so don't enable it # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest # rendering code. -INI_UNCOMMENT_USE_G2D_imxgpu2d ?= "use-g2d=1" -INI_UNCOMMENT_USE_G2D_mx8qm = "" -INI_UNCOMMENT_USE_G2D_mx8qxp = "" -INI_UNCOMMENT_ASSIGNMENTS_append_imxgpu2d = " \ +INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1" +INI_UNCOMMENT_USE_G2D:mx8qm = "" +INI_UNCOMMENT_USE_G2D:mx8qxp = "" +INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \ ${INI_UNCOMMENT_USE_G2D} \ " @@ -41,7 +41,7 @@ uncomment() { sed -i -e 's,^#'"$1"','"$1"',g' $2 } -do_install_append() { +do_install:append() { if [ -f "${WORKDIR}/weston.config" ]; then install -Dm0755 ${WORKDIR}/weston.config ${D}${sysconfdir}/default/weston fi diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 026f27ce..76296c8e 100644 --- a/recipes-graphics/wayland/weston_9.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_9.0.0.imx.bb @@ -20,7 +20,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ " -SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch " +SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe" @@ -97,7 +97,7 @@ PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" # JPEG image loading support PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" -do_install_append() { +do_install:append() { # Weston doesn't need the .la files to load modules, so wipe them rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la @@ -122,23 +122,23 @@ do_install_append() { PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" -FILES_${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" +FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" +FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" -FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" -SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." +FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" +SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." -FILES_${PN}-examples = "${bindir}/*" +FILES:${PN}-examples = "${bindir}/*" -FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS_${PN}-xwayland += "xwayland" +FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" +RDEPENDS:${PN}-xwayland += "xwayland" -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "weston-init liberation-fonts" -RRECOMMENDS_${PN}-dev += "wayland-protocols" +RDEPENDS:${PN} += "xkeyboard-config" +RRECOMMENDS:${PN} = "weston-init liberation-fonts" +RRECOMMENDS:${PN}-dev += "wayland-protocols" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system weston-launch" +GROUPADD_PARAM:${PN} = "--system weston-launch" ########### End of OE-core copy ########### @@ -160,23 +160,23 @@ S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D REQUIRED_DISTRO_FEATURES = "opengl" -REQUIRED_DISTRO_FEATURES_imxgpu2d = "" -REQUIRED_DISTRO_FEATURES_imxgpu3d = "opengl" +REQUIRED_DISTRO_FEATURES:imxgpu2d = "" +REQUIRED_DISTRO_FEATURES:imxgpu3d = "opengl" PACKAGECONFIG_OPENGL = "opengl" -PACKAGECONFIG_OPENGL_imxgpu2d = "" -PACKAGECONFIG_OPENGL_imxgpu3d = "opengl" +PACKAGECONFIG_OPENGL:imxgpu2d = "" +PACKAGECONFIG_OPENGL:imxgpu3d = "opengl" -PACKAGECONFIG_remove = "wayland x11" -PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}" +PACKAGECONFIG:remove = "wayland x11" +PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', '${PACKAGECONFIG_OPENGL}', d)}" -PACKAGECONFIG_remove_imxfbdev = "kms" -PACKAGECONFIG_append_imxfbdev = " fbdev clients" -PACKAGECONFIG_append_imxgpu = " imxgpu" -PACKAGECONFIG_append_imxgpu2d = " imxg2d" +PACKAGECONFIG:remove:imxfbdev = "kms" +PACKAGECONFIG:append:imxfbdev = " fbdev clients" +PACKAGECONFIG:append:imxgpu = " imxgpu" +PACKAGECONFIG:append:imxgpu2d = " imxg2d" # Clients support SIMPLE_CLIENTS = "all" -SIMPLE_CLIENTS_imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" +SIMPLE_CLIENTS:imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLE_CLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Weston with i.MX GPU support diff --git a/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend b/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend index a9c60f3e..d112b274 100644 --- a/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend +++ b/recipes-graphics/xinput-calibrator/pointercal-xinput_%.bbappend @@ -1,2 +1,2 @@ # Append path for freescale layer to include bsp pointercal.xinput -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb index 069008c0..6944184f 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb @@ -34,7 +34,7 @@ TARGET_CC_ARCH += "${LDFLAGS}" PACKAGES =+ "xserver-xorg-extension-viv-autohdmi" -do_install_append () { +do_install:append () { install -d ${D}${includedir} cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir} cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir} @@ -45,7 +45,7 @@ do_install_append () { find ${D}${includedir} -type f -exec chmod 660 {} \; } -RDEPENDS_${PN} += "libvivante-dri-imx \ +RDEPENDS:${PN} += "libvivante-dri-imx \ xserver-xorg-module-exa \ mesa-driver-swrast \ xserver-xorg-extension-dri \ @@ -55,11 +55,11 @@ RDEPENDS_${PN} += "libvivante-dri-imx \ REALSOLIBS := "${SOLIBS}" SOLIBS = "${SOLIBSDEV}" -FILES_${PN} = "${libdir}/*/*/*/vivante_drv${SOLIBS}" -FILES_${PN}-dev = "${includedir} /usr/src ${libdir}/libfsl_x11_ext${SOLIBSDEV}" -FILES_${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/.debug/autohdmi" +FILES:${PN} = "${libdir}/*/*/*/vivante_drv${SOLIBS}" +FILES:${PN}-dev = "${includedir} /usr/src ${libdir}/libfsl_x11_ext${SOLIBSDEV}" +FILES:${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/.debug/autohdmi" -FILES_xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi" +FILES:xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi" PACKAGE_ARCH = "${MACHINE_SOCARCH}" COMPATIBLE_MACHINE = "(mx6|mx7ulp)" diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend index ceb438e3..3fe677b3 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -1,2 +1,2 @@ # Append path for freescale layer to include bsp xorg.conf -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 22d950c7..c7b7e879 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch" -SRC_URI_append_imxgpu = " \ +SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch" +SRC_URI:append:imxgpu = " \ file://0003-Remove-check-for-useSIGIO-option.patch \ file://0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch \ file://0001-glamor-glamor_egl.c-EGL_NATIVE_PIXMAP_KHR-do-not-req.patch \ @@ -10,7 +10,7 @@ SRC_URI_append_imxgpu = " \ " IMX_OPENGL_PKGCONFIGS_REMOVE = "" -IMX_OPENGL_PKGCONFIGS_REMOVE_imxgpu = "glamor" -OPENGL_PKGCONFIGS_remove_mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" -OPENGL_PKGCONFIGS_remove_mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" -OPENGL_PKGCONFIGS_remove_imxdrm = "dri glx" +IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" +OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" +OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" +OPENGL_PKGCONFIGS:remove_imxdrm = "dri glx" diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend index c26bb20d..b3e79e09 100644 --- a/recipes-graphics/xwayland/xwayland_%.bbappend +++ b/recipes-graphics/xwayland/xwayland_%.bbappend @@ -1,4 +1,4 @@ IMX_OPENGL_PKGCONFIGS_REMOVE = "" -IMX_OPENGL_PKGCONFIGS_REMOVE_imxgpu = "glamor" -OPENGL_PKGCONFIGS_remove_mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" -OPENGL_PKGCONFIGS_remove_mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" +IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" +OPENGL_PKGCONFIGS:remove:mx6 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" +OPENGL_PKGCONFIGS:remove:mx7 = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" -- cgit v1.2.3-54-g00ecf