summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch40
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch19
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch46
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb)6
4 files changed, 11 insertions, 100 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch
deleted file mode 100644
index 964d5dd4cf..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001
2From: Peter Hutterer <peter.hutterer@who-t.net>
3Date: Fri, 5 Jan 2018 11:58:42 +1000
4Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset
5
6Erroneous condition caused us to keep going with all devices that didn't have
7ID_INPUT set.
8
9Fixes: 5aad81445c8c3d6
10Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
11Reviewed-by: Adam Jackson <ajax@redhat.com>
12Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
13
14Upstream-status: Backport
15https://patchwork.freedesktop.org/patch/196090/
16Affects: < 1.20.0
17[Yocto # 12899]
18
19Signed-off-by: Armin Kuster <akuser808@gmail.com>
20
21---
22 config/udev.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/config/udev.c b/config/udev.c
26index e198e8609..3a73189e2 100644
27--- a/config/udev.c
28+++ b/config/udev.c
29@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
30 #endif
31
32 value = udev_device_get_property_value(udev_device, "ID_INPUT");
33- if (value && !strcmp(value, "0")) {
34+ if (!value || !strcmp(value, "0")) {
35 LogMessageVerb(X_INFO, 10,
36 "config/udev: ignoring device %s without "
37 "property ID_INPUT set\n", path);
38--
392.17.1
40
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
index 16ec3edb3b..020a1cf37c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
@@ -1,12 +1,13 @@
1Discover monotonic clock using compile-time check 1From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 12 Dec 2016 12:11:39 +0200
4Subject: [PATCH] Discover monotonic clock using compile-time check
2 5
3monotonic clock check does not work when cross-compiling. 6monotonic clock check does not work when cross-compiling.
4 7
5Upstream-Status: Denied [Does not work on OpenBSD] 8Upstream-Status: Denied [Does not work on OpenBSD]
6Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
7 10
8
9
10Original patch follows: 11Original patch follows:
11 12
12When xorg-xserver is being cross-compiled, there is currently no way 13When xorg-xserver is being cross-compiled, there is currently no way
@@ -21,15 +22,16 @@ monotonic clock is available. This check can run just fine when we are
21cross-compiling. 22cross-compiling.
22 23
23Signed-off-by: David James <davidjames at google.com> 24Signed-off-by: David James <davidjames at google.com>
25
24--- 26---
25 configure.ac | 17 +++++++---------- 27 configure.ac | 17 +++++++----------
26 1 file changed, 7 insertions(+), 10 deletions(-) 28 1 file changed, 7 insertions(+), 10 deletions(-)
27 29
28diff --git a/configure.ac b/configure.ac 30diff --git a/configure.ac b/configure.ac
29index f7ab48c..26e85cd 100644 31index 2b21667..786e002 100644
30--- a/configure.ac 32--- a/configure.ac
31+++ b/configure.ac 33+++ b/configure.ac
32@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then 34@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
33 CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" 35 CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
34 fi 36 fi
35 37
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644
54- [MONOTONIC_CLOCK="cross compiling"]) 56- [MONOTONIC_CLOCK="cross compiling"])
55+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) 57+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
56 58
57 LIBS="$LIBS_SAVE" 59 if test "$MONOTONIC_CLOCK" = "cross compiling"; then
58 CPPFLAGS="$CPPFLAGS_SAVE" 60 AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing yes"],[MONOTONIC_CLOCK=no],[#include <time.h>])
59--
602.1.4
61
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
deleted file mode 100644
index 5243761f1e..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 5028ef46ff4ab0930224b71024a7349b05610d42 Mon Sep 17 00:00:00 2001
2From: Stefan Agner <stefan@agner.ch>
3Date: Thu, 22 Dec 2016 15:41:06 +0100
4Subject: [PATCH] modesetting: Fix 16 bit depth/bpp mode
5
6When setting DefaultDepth to 16 in the Screen section, the current
7code requests a 32 bpp framebuffer, however the X-Server seems to
8assumes 16 bpp.
9
10Fixes commit 21217d02168d ("modesetting: Implement 32->24 bpp
11conversion in shadow update")
12
13Signed-off-by: Stefan Agner <stefan@agner.ch>
14
15Upstream-Status: Submitted [1]
16
17[1] https://lists.x.org/archives/xorg-devel/2016-December/052113.html
18---
19 hw/xfree86/drivers/modesetting/driver.c | 4 +++-
20 1 file changed, 3 insertions(+), 1 deletion(-)
21
22diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
23index d7030e5..647ad83 100644
24--- a/hw/xfree86/drivers/modesetting/driver.c
25+++ b/hw/xfree86/drivers/modesetting/driver.c
26@@ -930,7 +930,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
27 "Using 24bpp hw front buffer with 32bpp shadow\n");
28 defaultbpp = 32;
29 } else {
30- ms->drmmode.kbpp = defaultbpp;
31+ ms->drmmode.kbpp = 0;
32 }
33 bppflags = PreferConvert24to32 | SupportConvert24to32 | Support32bppFb;
34
35@@ -950,6 +950,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
36 return FALSE;
37 }
38 xf86PrintDepthBpp(pScrn);
39+ if (!ms->drmmode.kbpp)
40+ ms->drmmode.kbpp = pScrn->bitsPerPixel;
41
42 /* Process the options */
43 xf86CollectOptions(pScrn, NULL);
44--
452.7.4
46
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
index 7e8a9541cb..2cbcd90eb8 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
@@ -2,13 +2,11 @@ require xserver-xorg.inc
2 2
3SRC_URI += "file://musl-arm-inb-outb.patch \ 3SRC_URI += "file://musl-arm-inb-outb.patch \
4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ 4 file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
5 file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
6 file://0003-Remove-check-for-useSIGIO-option.patch \ 5 file://0003-Remove-check-for-useSIGIO-option.patch \
7 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 6 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
8 file://0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch \
9 " 7 "
10SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8" 8SRC_URI[md5sum] = "e525846d1d0af5732ba835f2e2ec066d"
11SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" 9SRC_URI[sha256sum] = "59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918"
12 10
13# These extensions are now integrated into the server, so declare the migration 11# These extensions are now integrated into the server, so declare the migration
14# path for in-place upgrades. 12# path for in-place upgrades.