summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-02-07 20:45:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit06fc24151819aa4f1e4454a8e27c1cb4c1826412 (patch)
treed9932b5a34e8db83dc2e639fbc82f89d050953fa
parent7e98e4d55c8da7e010e70ad85bab09316f33cd3e (diff)
downloadpoky-06fc24151819aa4f1e4454a8e27c1cb4c1826412.tar.gz
xserver-xorg: upgrade 1.20.6 -> 1.20.7
(From OE-Core rev: cad375e113b52069eaa24d7b07a97cc63ae9da46) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch23
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb)13
2 files changed, 30 insertions, 6 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
new file mode 100644
index 0000000000..4b8e43f1e4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-drmmode_display.c-add-missing-mi.h-include.patch
@@ -0,0 +1,23 @@
1From 84338444179cab7ede1252a11b66e3b8f657e6a4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 7 Feb 2020 20:36:45 +0100
4Subject: [PATCH] drmmode_display.c: add missing mi.h include
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 hw/xfree86/drivers/modesetting/drmmode_display.c | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
13index e18cc37..3445cce 100644
14--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
15+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
16@@ -46,6 +46,7 @@
17 #include "xf86Crtc.h"
18 #include "drmmode_display.h"
19 #include "present.h"
20+#include "mi.h"
21
22 #include <cursorstr.h>
23
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb
index a1cd490394..998b98a76c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.6.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.7.bb
@@ -1,12 +1,13 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ 3SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
4 file://pkgconfig.patch \ 4 file://pkgconfig.patch \
5 file://0001-test-xtest-Initialize-array-with-braces.patch \ 5 file://0001-test-xtest-Initialize-array-with-braces.patch \
6 file://sdksyms-no-build-path.patch \ 6 file://sdksyms-no-build-path.patch \
7 " 7 file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
8SRC_URI[md5sum] = "a98170084f2c8fed480d2ff601f8a14b" 8 "
9SRC_URI[sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" 9SRC_URI[md5sum] = "d2e96355ad47244c675bce38db2b48a9"
10SRC_URI[sha256sum] = "bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1"
10 11
11CFLAGS += "-fcommon" 12CFLAGS += "-fcommon"
12 13