Skip to contentSkip to conversation

xserver-xorg: upgrade 1.20.11 -> 21.0.99.1

PATCH In review wangmy 3 participants 3 messages Jul 8, 2021

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 xserver-xorg: upgrade 1.20.11 -> 21.0.99.1

0001-test-xtest-Initialize-array-with-braces.patch pkgconfig.patch sdksyms-no-build-path.patch
removed since they're included in 21.0.99.1

refresh 0001-Avoid-duplicate-definitions-of-IOPortBase.patch

---
 .../xorg-xserver/xserver-xorg.inc             |  3 +-
 ...-duplicate-definitions-of-IOPortBase.patch | 16 +-----
 ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
 .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
 .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
 ...g_1.20.11.bb => xserver-xorg_21.0.99.1.bb} |  6 +--
 6 files changed, 4 insertions(+), 141 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.11.bb => xserver-xorg_21.0.99.1.bb} (77%)
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +2 -1
index da025171db..7bbff0073b 100644
@@ -65,6 +65,7 @@ PACKAGES =+ "${PN}-sdl \
              ${PN}-module-xaa \
              ${PN}-module-libxf1bpp \
              ${PN}-module-libxf4bpp \
+	     ${PN}-input-modules \
              xf86-video-modesetting"
 
 SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver"
@@ -101,6 +102,7 @@ FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
 FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
 FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
 FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+FILES_${PN}-input-modules = "${libdir}/xorg/modules/input/*drv*"
 FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"
 
 EXTRA_OECONF += "--with-fop=no \
@@ -116,7 +118,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
                  --with-xkb-output=/var/lib/xkb \
-                 --with-os-name=Linux \
 "
 
 OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch +1 -15
index 4737040675..d876958898 100644
@@ -11,23 +11,9 @@ compiler.h:528: multiple definition of `IOPortBase';
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <[email protected]>
 ---
- hw/xfree86/common/compiler.h            | 2 +-
  hw/xfree86/os-support/linux/lnx_video.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 0 deletion(-)
 
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2b2008b..c7d617e 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
- #define PORT_SIZE short
- #endif
- 
--_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
-+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
- 
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
 diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
 index 04e4509..9dc7316 100644
 --- a/hw/xfree86/os-support/linux/lnx_video.c
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch deleted +0 -36
deleted file mode 100644
index c0c242814b..0000000000
@@ -1,36 +0,0 @@
-From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 1 Mar 2019 09:47:57 -0800
-Subject: [PATCH] test/xtest: Initialize array with braces
-
-Fixes an error when extra warnings are enabled, this is caught with clang
-
-test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
-    WindowRec root = {0};
-                      ^
-                      {}
-1 error generated.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- test/xtest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/xtest.c b/test/xtest.c
-index fc5e433..d7e6620 100644
---- a/test/xtest.c
-+++ b/test/xtest.c
-@@ -61,7 +61,7 @@ xtest_init_devices(void)
- {
-     ScreenRec screen = {0};
-     ClientRec server_client = {0};
--    WindowRec root = {0};
-+    WindowRec root = {{0}};
-     WindowOptRec optional = {0};
- 
-     /* random stuff that needs initialization */
--- 
-2.21.0
-
meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -34
deleted file mode 100644
index 2ef9fa9fe4..0000000000
@@ -1,34 +0,0 @@
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Thu, 20 Sep 2018 20:12:24 +0100
-Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
-
-Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
-simply get all of the CFLAGS.  Aside from completeness, this helps builds in
-sysroots as pkg-config knows what to do with --cflags but doesn't remap
-arbitrary variables.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- xorg-server.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xorg-server.m4 b/xorg-server.m4
-index 18255b91a..195bda5d8 100644
---- a/xorg-server.m4
-+++ b/xorg-server.m4
-@@ -31,7 +31,7 @@ dnl
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- 	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- 	SAVE_CFLAGS="$CFLAGS"
--	CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+	CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
- 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
--- 
-2.11.0
-
meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb +1 -5
similarity index 77%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb
index 1eb2056b8a..53b76af312 100644
@@ -1,14 +1,10 @@
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-           file://pkgconfig.patch \
-           file://0001-test-xtest-Initialize-array-with-braces.patch \
-           file://sdksyms-no-build-path.patch \
            file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
-           file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
            "
-SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49"
+SRC_URI[sha256sum] = "d928de01606958e20b668cba53c26818d595ba81805b4e19693bba795b71af20"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.
Signature · 1 line
2.25.1
#1 lore raw

This is a development snapshot, should not be used.

Alex

Quoted 283 lines · wangmy

0001-test-xtest-Initialize-array-with-braces.patch pkgconfig.patch sdksyms-no-build-path.patch
removed since they're included in 21.0.99.1

refresh 0001-Avoid-duplicate-definitions-of-IOPortBase.patch

---
 .../xorg-xserver/xserver-xorg.inc             |  3 +-
 ...-duplicate-definitions-of-IOPortBase.patch | 16 +-----
 ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
 .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
 .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
 ...g_1.20.11.bb => xserver-xorg_21.0.99.1.bb} |  6 +--
 6 files changed, 4 insertions(+), 141 deletions(-)
 delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
 delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
 delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.11.bb =>

xserver-xorg_21.0.99.1.bb} (77%)

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -0
index da025171db..7bbff0073b 100644
@@ -65,6 +65,7 @@ PACKAGES =+ "${PN}-sdl \
              ${PN}-module-xaa \
              ${PN}-module-libxf1bpp \
              ${PN}-module-libxf4bpp \
+            ${PN}-input-modules \
              xf86-video-modesetting"
 
 SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display

driver"

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
@@ -101,6 +102,7 @@ FILES_${PN}-module-exa =

"${libdir}/xorg/modules/libexa.so"
FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+FILES_${PN}-input-modules = "${libdir}/xorg/modules/input/*drv*"
FILES_xf86-video-modesetting =
"${libdir}/xorg/modules/drivers/modesetting_drv.so"

EXTRA_OECONF += "--with-fop=no \

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -1
@@ -116,7 +118,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
                  --with-xkb-output=/var/lib/xkb \
-                 --with-os-name=Linux \
 "
 
 OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch index 4737040675..d876958898 100644
---
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
+++
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -12
@@ -11,23 +11,9 @@ compiler.h:528: multiple definition of `IOPortBase';
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <[email protected]>
 ---
- hw/xfree86/common/compiler.h            | 2 +-
  hw/xfree86/os-support/linux/lnx_video.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 0 deletion(-)
 
-diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
-index 2b2008b..c7d617e 100644
---- a/hw/xfree86/common/compiler.h
-+++ b/hw/xfree86/common/compiler.h
-@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const
 unsigned long offset,
- #define PORT_SIZE short
- #endif
-
--_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
-+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port

area */
-
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
diff --git a/hw/xfree86/os-support/linux/lnx_video.c
b/hw/xfree86/os-support/linux/lnx_video.c
index 04e4509..9dc7316 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch deleted file mode 100644
index c0c242814b..0000000000
---
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch +++ /dev/null

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -8
@@ -1,36 +0,0 @@
-From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 1 Mar 2019 09:47:57 -0800
-Subject: [PATCH] test/xtest: Initialize array with braces
-
-Fixes an error when extra warnings are enabled, this is caught with clang
-
-test/xtest.c:64:23: error: suggest braces around initialization of

subobject [-Werror,-Wmissing-braces]

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -28
-    WindowRec root = {0};
-                      ^
-                      {}
-1 error generated.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
----
- test/xtest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/xtest.c b/test/xtest.c
-index fc5e433..d7e6620 100644
---- a/test/xtest.c
-+++ b/test/xtest.c
-@@ -61,7 +61,7 @@ xtest_init_devices(void)
- {
-     ScreenRec screen = {0};
-     ClientRec server_client = {0};
--    WindowRec root = {0};
-+    WindowRec root = {{0}};
-     WindowOptRec optional = {0};
-
-     /* random stuff that needs initialization */
---
-2.21.0
-

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted file mode 100644
index 2ef9fa9fe4..0000000000

meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -1
@@ -1,34 +0,0 @@
-Upstream-Status: Submitted [

https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22]

meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -8
-Signed-off-by: Ross Burton <[email protected]>
-
-From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Thu, 20 Sep 2018 20:12:24 +0100
-Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
-
-Instead of fetching just the sdkdir variable of xorg-server using

pkg-config,
-simply get all of the CFLAGS. Aside from completeness, this helps builds in

meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -24
-sysroots as pkg-config knows what to do with --cflags but doesn't remap
-arbitrary variables.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- xorg-server.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xorg-server.m4 b/xorg-server.m4
-index 18255b91a..195bda5d8 100644
---- a/xorg-server.m4
-+++ b/xorg-server.m4
-@@ -31,7 +31,7 @@ dnl
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
-       AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-       SAVE_CFLAGS="$CFLAGS"
--      CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+      CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
---
-2.11.0
-

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch deleted file mode 100644
index be198ece49..0000000000
---
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch +++ /dev/null

meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -1
@@ -1,50 +0,0 @@
-Upstream-Status: Backport [

https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253]

meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -8
-Signed-off-by: Ross Burton <[email protected]>
-
-From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Thu, 1 Aug 2019 15:24:51 +0100
-Subject: [PATCH] sdksyms.sh: don't embed the build path
-
-This script generates a header that has a comment containing the build

path for
-no real reason. As this source can end up deployed on targets in debug packages
-this means there is both potentially sensitive information leakage about the

meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch deleted +0 -39
-build environment, and a source of change for reproducible builds.
----
- hw/xfree86/sdksyms.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
-index 39e33711d..bdf47a71a 100755
---- a/hw/xfree86/sdksyms.sh
-+++ b/hw/xfree86/sdksyms.sh
-@@ -302,13 +302,16 @@ LC_ALL=C
- export LC_ALL
- ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
- ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
-+function basename(file) {
-+    sub(".*/", "", file)
-+    return file
-+}
- BEGIN {
-     sdk = 0;
-     print("/*");
-     print(" * These symbols are referenced to ensure they");
-     print(" * will be available in the X Server binary.");
-     print(" */");
--    printf("/* topdir=%s */\n", topdir);
-     print("_X_HIDDEN void *xorg_symbols[] = {");
-
-     printf("sdksyms.c:") > "sdksyms.dep";
-@@ -337,7 +340,7 @@ BEGIN {
-       # remove quotes
-       gsub(/"/, "", $3);
-       line = $2;
--      header = $3;
-+      header = basename($3);
-       if (! headers[$3]) {
-           printf(" \\\n  %s", $3) >> "sdksyms.dep";
-           headers[$3] = 1;
---
-2.20.1
-
meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb +0 -5
similarity index 77%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb
index 1eb2056b8a..53b76af312 100644
@@ -1,14 +1,10 @@
 require xserver-xorg.inc
 
 SRC_URI +=
 "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-           file://pkgconfig.patch \
-           file://0001-test-xtest-Initialize-array-with-braces.patch \
-           file://sdksyms-no-build-path.patch \
            file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
-
 file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
            "
-SRC_URI[sha256sum] =

"914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49" +SRC_URI[sha256sum] = "d928de01606958e20b668cba53c26818d595ba81805b4e19693bba795b71af20"

# These extensions are now integrated into the server, so declare the
migration

 # path for in-place upgrades.
--
2.25.1
#2 lore raw

2021. 07. 08. 7:38 keltezéssel, Alexander Kanavin írta:

Quoted 1 line

This is a development snapshot, should not be used.

Still, it works a lot better than the 1.20.x stable branch.

Quoted 284 lines

Alex

On Thu 8. Jul 2021 at 2.18, wangmy <[email protected] <mailto:[email protected]>> wrote:

    0001-test-xtest-Initialize-array-with-braces.patch
    pkgconfig.patch
    sdksyms-no-build-path.patch
    removed since they're included in 21.0.99.1

    refresh 0001-Avoid-duplicate-definitions-of-IOPortBase.patch

    Signed-off-by: Wang Mingyu <[email protected] <mailto:[email protected]>>
    ---
      .../xorg-xserver/xserver-xorg.inc             |  3 +-
      ...-duplicate-definitions-of-IOPortBase.patch | 16 +-----
      ...t-xtest-Initialize-array-with-braces.patch | 36 -------------
      .../xorg-xserver/xserver-xorg/pkgconfig.patch | 34 -------------
      .../xserver-xorg/sdksyms-no-build-path.patch  | 50 -------------------
      ...g_1.20.11.bb <http://g_1.20.11.bb> => xserver-xorg_21.0.99.1.bb
    <http://xserver-xorg_21.0.99.1.bb>} |  6 +--
      6 files changed, 4 insertions(+), 141 deletions(-)
      delete mode 100644
    meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
      delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
      delete mode 100644
    meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
      rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.11.bb
    <http://xserver-xorg_1.20.11.bb> => xserver-xorg_21.0.99.1.bb
    <http://xserver-xorg_21.0.99.1.bb>} (77%)

    diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
    index da025171db..7bbff0073b 100644
    --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
    +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
    @@ -65,6 +65,7 @@ PACKAGES =+ "${PN}-sdl \
                   ${PN}-module-xaa \
                   ${PN}-module-libxf1bpp \
                   ${PN}-module-libxf4bpp \
    +            ${PN}-input-modules \
                   xf86-video-modesetting"

      SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver"
    @@ -101,6 +102,7 @@ FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
      FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
      FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
      FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
    +FILES_${PN}-input-modules = "${libdir}/xorg/modules/input/*drv*"
      FILES_xf86-video-modesetting = "${libdir}/xorg/modules/drivers/modesetting_drv.so"

      EXTRA_OECONF += "--with-fop=no \
    @@ -116,7 +118,6 @@ EXTRA_OECONF += "--with-fop=no \
                       --sysconfdir=/etc/X11 \
                       --localstatedir=/var \
                       --with-xkb-output=/var/lib/xkb \
    -                 --with-os-name=Linux \
      "

      OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence"
    diff --git
    a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
    index 4737040675..d876958898 100644
    ---
    a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
    +++
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch
    @@ -11,23 +11,9 @@ compiler.h:528: multiple definition of `IOPortBase';
      Upstream-Status: Pending
      Signed-off-by: Khem Raj <[email protected] <mailto:[email protected]>>
      ---
    - hw/xfree86/common/compiler.h            | 2 +-
       hw/xfree86/os-support/linux/lnx_video.c | 1 +
    - 2 files changed, 2 insertions(+), 1 deletion(-)
    + 1 files changed, 1 insertions(+), 0 deletion(-)

    -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
    -index 2b2008b..c7d617e 100644
    ---- a/hw/xfree86/common/compiler.h
    -+++ b/hw/xfree86/common/compiler.h
    -@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long
    offset,
    - #define PORT_SIZE short
    - #endif
    -
    --_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
    -+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
    -
    - static __inline__ void
    - outb(unsigned PORT_SIZE port, unsigned char val)
      diff --git a/hw/xfree86/os-support/linux/lnx_video.c
    b/hw/xfree86/os-support/linux/lnx_video.c
      index 04e4509..9dc7316 100644
      --- a/hw/xfree86/os-support/linux/lnx_video.c
    diff --git
    a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
    deleted file mode 100644
    index c0c242814b..0000000000
    ---
    a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch
    +++ /dev/null
    @@ -1,36 +0,0 @@
    -From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001
    -From: Khem Raj <[email protected] <mailto:[email protected]>>
    -Date: Fri, 1 Mar 2019 09:47:57 -0800
    -Subject: [PATCH] test/xtest: Initialize array with braces
    -
    -Fixes an error when extra warnings are enabled, this is caught with clang
    -
    -test/xtest.c:64:23: error: suggest braces around initialization of subobject
    [-Werror,-Wmissing-braces]
    -    WindowRec root = {0};
    -                      ^
    -                      {}
    -1 error generated.
    -
    -Upstream-Status: Pending
    -
    -Signed-off-by: Khem Raj <[email protected] <mailto:[email protected]>>
    ----
    - test/xtest.c | 2 +-
    - 1 file changed, 1 insertion(+), 1 deletion(-)
    -
    -diff --git a/test/xtest.c b/test/xtest.c
    -index fc5e433..d7e6620 100644
    ---- a/test/xtest.c
    -+++ b/test/xtest.c
    -@@ -61,7 +61,7 @@ xtest_init_devices(void)
    - {
    -     ScreenRec screen = {0};
    -     ClientRec server_client = {0};
    --    WindowRec root = {0};
    -+    WindowRec root = {{0}};
    -     WindowOptRec optional = {0};
    -
    -     /* random stuff that needs initialization */
    ---
    -2.21.0
    -
    diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
    deleted file mode 100644
    index 2ef9fa9fe4..0000000000
    --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/pkgconfig.patch
    +++ /dev/null
    @@ -1,34 +0,0 @@
    -Upstream-Status: Submitted
    [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22
    <https://gitlab.freedesktop.org/xorg/xserver/merge_requests/22>]
    -Signed-off-by: Ross Burton <[email protected] <mailto:[email protected]>>
    -
    -From 5f65a6246fe752764045dd1e38912f1dccec71e4 Mon Sep 17 00:00:00 2001
    -From: Ross Burton <[email protected] <mailto:[email protected]>>
    -Date: Thu, 20 Sep 2018 20:12:24 +0100
    -Subject: [PATCH] xorg-server.m4: just all cflags instead of just sdkdir
    -
    -Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
    -simply get all of the CFLAGS.  Aside from completeness, this helps builds in
    -sysroots as pkg-config knows what to do with --cflags but doesn't remap
    -arbitrary variables.
    -
    -Signed-off-by: Ross Burton <[email protected] <mailto:[email protected]>>
    ----
    - xorg-server.m4 | 2 +-
    - 1 file changed, 1 insertion(+), 1 deletion(-)
    -
    -diff --git a/xorg-server.m4 b/xorg-server.m4
    -index 18255b91a..195bda5d8 100644
    ---- a/xorg-server.m4
    -+++ b/xorg-server.m4
    -@@ -31,7 +31,7 @@ dnl
    - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
    -       AC_REQUIRE([PKG_PROG_PKG_CONFIG])
    -       SAVE_CFLAGS="$CFLAGS"
    --      CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
    -+      CFLAGS="$CFLAGS `$PKG_CONFIG --cflags xorg-server`"
    -       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
    - #include "xorg-server.h"
    - #if !defined $1
    ---
    -2.11.0
    -
    diff --git
    a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
    deleted file mode 100644
    index be198ece49..0000000000
    --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/sdksyms-no-build-path.patch
    +++ /dev/null
    @@ -1,50 +0,0 @@
    -Upstream-Status: Backport
    [https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253
    <https://gitlab.freedesktop.org/xorg/xserver/merge_requests/253>]
    -Signed-off-by: Ross Burton <[email protected] <mailto:[email protected]>>
    -
    -From ca832598d38ba55a001088b57d73c6d7261dc9a7 Mon Sep 17 00:00:00 2001
    -From: Ross Burton <[email protected] <mailto:[email protected]>>
    -Date: Thu, 1 Aug 2019 15:24:51 +0100
    -Subject: [PATCH] sdksyms.sh: don't embed the build path
    -
    -This script generates a header that has a comment containing the build path for
    -no real reason.  As this source can end up deployed on targets in debug packages
    -this means there is both potentially sensitive information leakage about the
    -build environment, and a source of change for reproducible builds.
    ----
    - hw/xfree86/sdksyms.sh | 7 +++++--
    - 1 file changed, 5 insertions(+), 2 deletions(-)
    -
    -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
    -index 39e33711d..bdf47a71a 100755
    ---- a/hw/xfree86/sdksyms.sh
    -+++ b/hw/xfree86/sdksyms.sh
    -@@ -302,13 +302,16 @@ LC_ALL=C
    - export LC_ALL
    - ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
    - ${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
    -+function basename(file) {
    -+    sub(".*/", "", file)
    -+    return file
    -+}
    - BEGIN {
    -     sdk = 0;
    -     print("/*");
    -     print(" * These symbols are referenced to ensure they");
    -     print(" * will be available in the X Server binary.");
    -     print(" */");
    --    printf("/* topdir=%s */\n", topdir);
    -     print("_X_HIDDEN void *xorg_symbols[] = {");
    -
    -     printf("sdksyms.c:") > "sdksyms.dep";
    -@@ -337,7 +340,7 @@ BEGIN {
    -       # remove quotes
    -       gsub(/"/, "", $3);
    -       line = $2;
    --      header = $3;
    -+      header = basename($3);
    -       if (! headers[$3]) {
    -           printf(" \\\n  %s", $3) >> "sdksyms.dep";
    -           headers[$3] = 1;
    ---
    -2.20.1
    -
    diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
    <http://xserver-xorg_1.20.11.bb>
    b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb
    <http://xserver-xorg_21.0.99.1.bb>
    similarity index 77%
    rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
    <http://xserver-xorg_1.20.11.bb>
    rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb
    <http://xserver-xorg_21.0.99.1.bb>
    index 1eb2056b8a..53b76af312 100644
    --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
    <http://xserver-xorg_1.20.11.bb>
    +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.0.99.1.bb
    <http://xserver-xorg_21.0.99.1.bb>
    @@ -1,14 +1,10 @@
      require xserver-xorg.inc

      SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
    -           file://pkgconfig.patch \
    -           file://0001-test-xtest-Initialize-array-with-braces.patch \
    -           file://sdksyms-no-build-path.patch \
                 file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
                 file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
    -           file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
                 "
    -SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49"
    +SRC_URI[sha256sum] = "d928de01606958e20b668cba53c26818d595ba81805b4e19693bba795b71af20"

      # These extensions are now integrated into the server, so declare the migration
      # path for in-place upgrades.
    -- 
    2.25.1