summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-02-18 09:34:28 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2019-03-06 19:03:44 +0100
commit90dd09c4014acc74791151f2b13281efae6aacd7 (patch)
tree37ad26ce7bc1a4f26b731cc5661141b0a4312dca
parent8691ba636cb22021ec950efead309512ad97c15f (diff)
xserver-xorg: add last change used from meta-jetson-tk1
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bbappend3
-rw-r--r--jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend3
2 files changed, 3 insertions, 3 deletions
diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bbappend b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bbappend
deleted file mode 100644
index 3b7f71c..0000000
--- a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# we now use 1.17.4 for TK1, do not consisder the 1.17.2 recipe for any
-# machine
-PNBLACKLIST[xserver-xorg] = "don't prefer older xserver over newer one from layer with less priority" \ No newline at end of file
diff --git a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend
index de91e1b..9a577a8 100644
--- a/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend
+++ b/jetson-tk1/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bbappend
@@ -21,3 +21,6 @@ PACKAGECONFIG ?= "dri2 udev ${XORG_CRYPTO} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \
${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \
"
+
+# The NVidia driver needs this enabled.
+PACKAGECONFIG_append = " xinerama "