summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2018-11-18 14:35:44 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2019-03-06 18:54:40 +0100
commite22e39a2a7364cc1080d6e114aeca0377625c3e4 (patch)
tree1c9c7a2347a80f593f1a38ee14062d2e7ec138ce
parent2e61d71cddab41865b7b2837279f63b29f8ee924 (diff)
xserver-xorg: tk1-mainline: follow update to 1.20
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--conf/machine/apalis-tk1-mainline.conf2
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend (renamed from recipes-graphics/xorg-xserver/xserver-xorg_1.19%.bbappend)1
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf
index 1938c21..71d27cc 100644
--- a/conf/machine/apalis-tk1-mainline.conf
+++ b/conf/machine/apalis-tk1-mainline.conf
@@ -54,7 +54,7 @@ PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_VERSION_xserver-xorg_tegra124m = "99:1.19%"
+PREFERRED_VERSION_xserver-xorg_tegra124m = "99:1.20%"
PREFERRED_PROVIDER_virtual/mesa ?= "mesa"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.19%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
index 8e6ecaa..2c5dd09 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.19%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend
@@ -6,4 +6,3 @@ PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE_tegra124m = "(apalis-tk1-mainline)"
PACKAGECONFIG_tegra124m ?= "dri2 dri3 xshmfence glamor xwayland udev ${XORG_CRYPTO} "
-