diff options
Diffstat (limited to 'recipes-graphics')
-rw-r--r-- | recipes-graphics/cairo/cairo_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/kmscube/kmscube_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/libsdl2/libsdl2_%.bbappend | 4 | ||||
-rw-r--r-- | recipes-graphics/libva/libva_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/mesa/libglu_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/mesa/mesa-demos_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/mesa/mesa-gl_%.bbappend | 8 | ||||
-rw-r--r-- | recipes-graphics/mesa/mesa_%.bbappend | 4 | ||||
-rw-r--r-- | recipes-graphics/piglit/piglit_%.bbappend | 4 | ||||
-rw-r--r-- | recipes-graphics/raspidmx/raspidmx_git.bb | 2 | ||||
-rw-r--r-- | recipes-graphics/userland/userland_git.bb | 26 | ||||
-rw-r--r-- | recipes-graphics/vc-graphics/vc-graphics.inc | 8 | ||||
-rw-r--r-- | recipes-graphics/wayland/wayland_%.bbappend | 2 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_%.bbappend | 4 | ||||
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend | 8 | ||||
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 4 |
16 files changed, 42 insertions, 42 deletions
diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend index 7ba13e2..5efd8fc 100644 --- a/recipes-graphics/cairo/cairo_%.bbappend +++ b/recipes-graphics/cairo/cairo_%.bbappend @@ -1,3 +1,3 @@ PACKAGECONFIG_GLESV2 = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'glesv2', d)}" -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}" diff --git a/recipes-graphics/kmscube/kmscube_%.bbappend b/recipes-graphics/kmscube/kmscube_%.bbappend index 9343fb0..f9c23c9 100644 --- a/recipes-graphics/kmscube/kmscube_%.bbappend +++ b/recipes-graphics/kmscube/kmscube_%.bbappend @@ -1,2 +1,2 @@ # userland driver EGL implementation does not have all needed bits for it so remove it from build -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend index cb9c24e..28a66bc 100644 --- a/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/recipes-graphics/libva/libva_%.bbappend b/recipes-graphics/libva/libva_%.bbappend index 56ff421..ebfc519 100644 --- a/recipes-graphics/libva/libva_%.bbappend +++ b/recipes-graphics/libva/libva_%.bbappend @@ -1,3 +1,3 @@ # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/recipes-graphics/mesa/libglu_%.bbappend b/recipes-graphics/mesa/libglu_%.bbappend index 56ff421..ebfc519 100644 --- a/recipes-graphics/mesa/libglu_%.bbappend +++ b/recipes-graphics/mesa/libglu_%.bbappend @@ -1,3 +1,3 @@ # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index c187ab9..abb11ec 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,2 +1,2 @@ # mesa-demos need libgles1 and userland driver does not have it -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/recipes-graphics/mesa/mesa-gl_%.bbappend b/recipes-graphics/mesa/mesa-gl_%.bbappend index e561a1b..edb75f5 100644 --- a/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1,8 +1,8 @@ -PACKAGECONFIG_append_rpi = " gbm" -PROVIDES_append_rpi = " virtual/libgbm" +PACKAGECONFIG:append:rpi = " gbm" +PROVIDES:append:rpi = " virtual/libgbm" -GALLIUMDRIVERS_append_rpi = ",swrast" +GALLIUMDRIVERS:append:rpi = ",swrast" -do_install_append_rpi() { +do_install:append:rpi() { rm -rf ${D}${includedir}/KHR/khrplatform.h } diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index eaa46f2..09c8db7 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -2,5 +2,5 @@ # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set # as default. To state out clearly that Raspi needs dri3 and to avoid surprises # in case oe-core changes this default, we set dri3 explicitly. -PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" -DRIDRIVERS_class-target_rpi = "" +PACKAGECONFIG:append:rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" +DRIDRIVERS:class-target:rpi = "" diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend index 0503fd0..8dfce27 100644 --- a/recipes-graphics/piglit/piglit_%.bbappend +++ b/recipes-graphics/piglit/piglit_%.bbappend @@ -1,5 +1,5 @@ # mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps -RDEPENDS_${PN}_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" +RDEPENDS:${PN}:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" # it needs EGL >= 11 but userland says it provided version 10, remove it from build # | -- Requested 'egl >= 11.0' but version of EGL is 10 -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/recipes-graphics/raspidmx/raspidmx_git.bb b/recipes-graphics/raspidmx/raspidmx_git.bb index 71590e3..c81fb03 100644 --- a/recipes-graphics/raspidmx/raspidmx_git.bb +++ b/recipes-graphics/raspidmx/raspidmx_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=52962875ab02c36df6cde47b1f463024" COMPATIBLE_HOST = "null" -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" SRC_URI = "git://github.com/AndrewFromMelbourne/raspidmx;protocol=https \ file://0001-gitignore-add-archives-from-lib-directory.patch \ diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index ead81f0..4b01535 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb @@ -1,14 +1,14 @@ DESCRIPTION = "This repository contains the source code for the ARM side \ libraries used on Raspberry Pi. These typically are installed in /opt/vc/lib \ and includes source for the ARM side code to interface to: EGL, mmal, GLESv2,\ -vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG." +vcos, openmaxil, vchiq:arm, bcm_host, WFC, OpenVG." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" PROVIDES += "virtual/libomxil" -RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" +RPROVIDES:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" @@ -47,7 +47,7 @@ SRC_URI = "\ file://0024-userland-Sync-needed-defines-for-weston-build.patch \ " -SRC_URI_remove_toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch" +SRC_URI:remove:toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch" S = "${WORKDIR}/git" @@ -59,7 +59,7 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-a -DVMCS_INSTALL_PREFIX=${exec_prefix} \ " -EXTRA_OECMAKE_append_aarch64 = " -DARM64=ON " +EXTRA_OECMAKE:append:aarch64 = " -DARM64=ON " PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" @@ -67,9 +67,9 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland" PACKAGECONFIG[allapps] = "-DALL_APPS=true,,," -CFLAGS_append = " -fPIC" +CFLAGS:append = " -fPIC" -do_install_append () { +do_install:append () { for f in `find ${D}${includedir}/interface/vcos/ -name "*.h"`; do sed -i 's/include "vcos_platform.h"/include "pthreads\/vcos_platform.h"/g' ${f} sed -i 's/include "vcos_futex_mutex.h"/include "pthreads\/vcos_futex_mutex.h"/g' ${f} @@ -94,15 +94,15 @@ do_install_append () { # to force the .so files into the runtime package (and keep them # out of -dev package). FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/*.so \ ${libdir}/plugins" -FILES_${PN}-dev += "${includedir} \ +FILES:${PN}-dev += "${includedir} \ ${prefix}/src" -FILES_${PN}-doc += "${datadir}/install" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" +FILES:${PN}-doc += "${datadir}/install" +FILES:${PN}-dbg += "${libdir}/plugins/.debug" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" diff --git a/recipes-graphics/vc-graphics/vc-graphics.inc b/recipes-graphics/vc-graphics/vc-graphics.inc index 540e289..e5e8f53 100644 --- a/recipes-graphics/vc-graphics/vc-graphics.inc +++ b/recipes-graphics/vc-graphics/vc-graphics.inc @@ -40,15 +40,15 @@ do_install () { } # These are proprietary binaries generated elsewhere so don't check ldflags -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" INITSCRIPT_NAME = "vchiq.sh" INITSCRIPT_PARAMS = "start 03 S ." -FILES_${PN} = "${bindir}/* \ +FILES:${PN} = "${bindir}/* \ ${libdir}/lib*.so \ ${sysconfdir}/init.d \ ${libdir}/plugins" -FILES_${PN}-dev = "${libdir}/pkgconfig \ +FILES:${PN}-dev = "${libdir}/pkgconfig \ ${includedir}" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" +FILES:${PN}-dbg += "${libdir}/plugins/.debug" diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend index e5bbf4a..ca2b296 100644 --- a/recipes-graphics/wayland/wayland_%.bbappend +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -1,5 +1,5 @@ # until fully tested, prefer `libwayland-egl` provided by `userland` instead of `wayland` when not using vc4graphics -do_install_append_rpi () { +do_install:append:rpi () { if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "0" ]; then rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend index 55cf700..89917f0 100644 --- a/recipes-graphics/wayland/weston_%.bbappend +++ b/recipes-graphics/wayland/weston_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" +PACKAGECONFIG:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" -EXTRA_OECONF_append_rpi = " \ +EXTRA_OECONF:append:rpi = " \ --disable-xwayland-test \ --disable-simple-egl-clients \ ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend index 71e0adc..da3cd8a 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://xorg.conf.d/98-pitft.conf \ file://xorg.conf.d/99-calibration.conf \ " -do_install_append_rpi () { +do_install:append:rpi () { PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" if [ "${PITFT}" = "1" ]; then install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ @@ -13,4 +13,4 @@ do_install_append_rpi () { fi } -FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" +FILES:${PN}:rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 9574fa5..25829c2 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,5 +1,5 @@ -OPENGL_PKGCONFIGS_rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" +OPENGL_PKGCONFIGS:rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" |