summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-07-29 19:58:04 +0200
committerAndrei Gherzan <andrei@gherzan.com>2021-08-04 12:30:12 +0300
commit9ea7aa2cd2cdc775425797b689e782718896ea50 (patch)
tree3831e2403262e27cd178a213b82c2ed8ad91e9a6 /recipes-graphics/xorg-xserver
parent8dc3a310883ea87cd9900442f46f20bb08e57583 (diff)
downloadmeta-raspberrypi-9ea7aa2cd2cdc775425797b689e782718896ea50.tar.gz
Convert to new override syntax
This is the result of automated script conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-graphics/xorg-xserver')
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend8
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend4
2 files changed, 6 insertions, 6 deletions
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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
2 2
3SRC_URI_append_rpi = " \ 3SRC_URI:append:rpi = " \
4 file://xorg.conf.d/98-pitft.conf \ 4 file://xorg.conf.d/98-pitft.conf \
5 file://xorg.conf.d/99-calibration.conf \ 5 file://xorg.conf.d/99-calibration.conf \
6" 6"
7do_install_append_rpi () { 7do_install:append:rpi () {
8 PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" 8 PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
9 if [ "${PITFT}" = "1" ]; then 9 if [ "${PITFT}" = "1" ]; then
10 install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ 10 install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
@@ -13,4 +13,4 @@ do_install_append_rpi () {
13 fi 13 fi
14} 14}
15 15
16FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" 16FILES:${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 @@
1OPENGL_PKGCONFIGS_rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" 1OPENGL_PKGCONFIGS:rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}"
2 2
3# when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where 3# when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where
4# we explicitly delete KHR/khrplatform.h since its already coming from userland package 4# we explicitly delete KHR/khrplatform.h since its already coming from userland package
5DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" 5DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}"