Skip to contentSkip to conversation

xserver-xorg: upgrade 1.19.6 -> 1.20.1

PATCH In review Armin Kuster 5 participants 7 messages Sep 14, 2018 – Sep 20, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 xserver-xorg: upgrade 1.19.6 -> 1.20.1

removed included patch

Refresh 0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC Remove 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch

---
 ...NULL-value-detection-for-ID_INPUT-being-u.patch | 40 -------------------
 ...onfigure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 19 +++++----
 ...003-modesetting-Fix-16-bit-depth-bpp-mode.patch | 46 ----------------------
 .../xorg-xserver/xserver-xorg_1.19.6.bb            | 33 ----------------
 .../xorg-xserver/xserver-xorg_1.20.1.bb            | 31 +++++++++++++++
 5 files changed, 40 insertions(+), 129 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -40
deleted file mode 100644
index 964d5dd..0000000
@@ -1,40 +0,0 @@
-From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Fri, 5 Jan 2018 11:58:42 +1000
-Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset
-
-Erroneous condition caused us to keep going with all devices that didn't have
-ID_INPUT set.
-
-Fixes: 5aad81445c8c3d6
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
-Reviewed-by: Adam Jackson <[email protected]>
-Signed-off-by: Peter Hutterer <[email protected]>
-
-Upstream-status: Backport
-https://patchwork.freedesktop.org/patch/196090/
-Affects: < 1.20.0
-[Yocto # 12899]
-
-Signed-off-by: Armin Kuster <[email protected]>
-
----
- config/udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/udev.c b/config/udev.c
-index e198e8609..3a73189e2 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
- #endif
- 
-     value = udev_device_get_property_value(udev_device, "ID_INPUT");
--    if (value && !strcmp(value, "0")) {
-+    if (!value || !strcmp(value, "0")) {
-         LogMessageVerb(X_INFO, 10,
-                        "config/udev: ignoring device %s without "
-                        "property ID_INPUT set\n", path);
--- 
-2.17.1
-
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +9 -10
index 16ec3ed..020a1cf 100644
@@ -1,12 +1,13 @@
-Discover monotonic clock using compile-time check
+From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Mon, 12 Dec 2016 12:11:39 +0200
+Subject: [PATCH] Discover monotonic clock using compile-time check
 
 monotonic clock check does not work when cross-compiling.
 
 Upstream-Status: Denied [Does not work on OpenBSD]
 Signed-off-by: Jussi Kukkonen <[email protected]>
 
-
-
 Original patch follows:
 
 When 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
 cross-compiling.
 
 Signed-off-by: David James <davidjames at google.com>
+
 ---
  configure.ac | 17 +++++++----------
  1 file changed, 7 insertions(+), 10 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f7ab48c..26e85cd 100644
+index 2b21667..786e002 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
+@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
          CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
      fi
  
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644
 -       [MONOTONIC_CLOCK="cross compiling"])
 +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
  
-     LIBS="$LIBS_SAVE"
-     CPPFLAGS="$CPPFLAGS_SAVE"
--- 
-2.1.4
-
+     if test "$MONOTONIC_CLOCK" = "cross compiling"; then
+         AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing yes"],[MONOTONIC_CLOCK=no],[#include <time.h>])
meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch deleted +0 -46

46 lines not on this page · raw message

meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb deleted +0 -33
deleted file mode 100644
index 7e8a954..0000000
@@ -1,33 +0,0 @@
-require xserver-xorg.inc
-
-SRC_URI += "file://musl-arm-inb-outb.patch \
-            file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
-            file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
-            file://0003-Remove-check-for-useSIGIO-option.patch \
-            file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-            file://0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch \
-            "
-SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8"
-SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197"
-
-# These extensions are now integrated into the server, so declare the migration
-# path for in-place upgrades.
-
-RREPLACES_${PN} =  "${PN}-extension-dri \
-                    ${PN}-extension-dri2 \
-                    ${PN}-extension-record \
-                    ${PN}-extension-extmod \
-                    ${PN}-extension-dbe \
-                   "
-RPROVIDES_${PN} =  "${PN}-extension-dri \
-                    ${PN}-extension-dri2 \
-                    ${PN}-extension-record \
-                    ${PN}-extension-extmod \
-                    ${PN}-extension-dbe \
-                   "
-RCONFLICTS_${PN} = "${PN}-extension-dri \
-                    ${PN}-extension-dri2 \
-                    ${PN}-extension-record \
-                    ${PN}-extension-extmod \
-                    ${PN}-extension-dbe \
-                   "
meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb new file +31 -0
new file mode 100644
index 0000000..2cbcd90
@@ -0,0 +1,31 @@
+require xserver-xorg.inc
+
+SRC_URI += "file://musl-arm-inb-outb.patch \
+            file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
+            file://0003-Remove-check-for-useSIGIO-option.patch \
+            file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
+            "
+SRC_URI[md5sum] = "e525846d1d0af5732ba835f2e2ec066d"
+SRC_URI[sha256sum] = "59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918"
+
+# These extensions are now integrated into the server, so declare the migration
+# path for in-place upgrades.
+
+RREPLACES_${PN} =  "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
+RPROVIDES_${PN} =  "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
+RCONFLICTS_${PN} = "${PN}-extension-dri \
+                    ${PN}-extension-dri2 \
+                    ${PN}-extension-record \
+                    ${PN}-extension-extmod \
+                    ${PN}-extension-dbe \
+                   "
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/3 xf86-video-fbdev: update to 0.5.0

---
 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb | 9 ---------
 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.5.0.bb | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
 create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.5.0.bb
meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb deleted +0 -9
deleted file mode 100644
index 52e9bd1..0000000
@@ -1,9 +0,0 @@
-require xorg-driver-video.inc
-
-SUMMARY = "X.Org X server -- fbdev display driver"
-DESCRIPTION = "fbdev is an Xorg driver for framebuffer devices. This is a non-accelerated driver."
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
-
-SRC_URI[md5sum] = "3931c0e19d441cc576dc088f9eb9fd73"
-SRC_URI[sha256sum] = "9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b"
meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.5.0.bb new file +9 -0
new file mode 100644
index 0000000..7b4ac88
@@ -0,0 +1,9 @@
+require xorg-driver-video.inc
+
+SUMMARY = "X.Org X server -- fbdev display driver"
+DESCRIPTION = "fbdev is an Xorg driver for framebuffer devices. This is a non-accelerated driver."
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
+
+SRC_URI[md5sum] = "f07475655376be5a124d8187aacd87b6"
+SRC_URI[sha256sum] = "dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699"
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/3 xorg-xserver 1.20 qemumips fix

In reply to Armin Kuster

When updating to xorg-xserve 1.20+, mips64 would not work correctly and cause the xorg test to fail.

Changing the DefaultDepth fixed that.

[Yocto # 12845]

---
 .../xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf                | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf +1 -0
index f4cd139..03b94dc 100644
@@ -26,6 +26,7 @@ Section "Screen"
     Identifier    "Default Screen"
     Device        "Graphics Controller"
     Monitor        "Generic Monitor"
+    DefaultDepth    16
     SubSection "Display"
         Modes     "640x480"
     EndSubSection
Signature · 1 line
2.7.4
#3 lore raw

✗ patchtest: failure for "xserver-xorg: upgrade 1.19.6 -..." and 2 more

In reply to Armin Kuster

== Series Details ==

Series: "xserver-xorg: upgrade 1.19.6 -..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/14080/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Patch            [3/3] xorg-xserver 1.20 qemumips fix
 Issue             Shortlog does not follow expected format [test_shortlog_format] 
  Suggested fix    Commit shortlog (first line of commit message) should follow the format "<target>: <summary>"

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#4 lore raw
In reply to Armin Kuster
Quoted 132 lines

-----Original Message-----
From: [email protected] [mailto:openembedded- [email protected]] On Behalf Of Armin Kuster
Sent: Saturday, September 15, 2018 12:04 AM
To: [email protected]; [email protected]
Subject: [OE-core] [PATCH 1/3] xserver-xorg: upgrade 1.19.6 -> 1.20.1

removed included patch

Refresh 0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC Remove 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch

---
 ...NULL-value-detection-for-ID_INPUT-being-u.patch | 40 -------------------
...onfigure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 19 +++++----  ...003-
modesetting-Fix-16-bit-depth-bpp-mode.patch | 46 ----------------------
 .../xorg-xserver/xserver-xorg_1.19.6.bb            | 33 ----------------
 .../xorg-xserver/xserver-xorg_1.20.1.bb            | 31 +++++++++++++++
 5 files changed, 40 insertions(+), 129 deletions(-)  delete mode 100644 meta/recipes-
graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-
ID_INPUT-being-u.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-
modesetting-Fix-16-bit-depth-bpp-mode.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
(quoted diff) +0 -0

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 964d5dd..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value- detection-for-ID_INPUT-being-u.patch
+++ /dev/null

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -6
@@ -1,40 +0,0 @@
-From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Fri, 5 Jan 2018 11:58:42 +1000
-Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset
-
-Erroneous condition caused us to keep going with all devices that didn't have -

ID_INPUT set.

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -32
-
-Fixes: 5aad81445c8c3d6
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
-Reviewed-by: Adam Jackson <[email protected]>
-Signed-off-by: Peter Hutterer <[email protected]>
-
-Upstream-status: Backport
-https://patchwork.freedesktop.org/patch/196090/
-Affects: < 1.20.0
-[Yocto # 12899]
-
-Signed-off-by: Armin Kuster <[email protected]>
-
----
- config/udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/udev.c b/config/udev.c -index e198e8609..3a73189e2 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
- #endif
-
-     value = udev_device_get_property_value(udev_device, "ID_INPUT");
--    if (value && !strcmp(value, "0")) {
-+    if (!value || !strcmp(value, "0")) {
-         LogMessageVerb(X_INFO, 10,
-                        "config/udev: ignoring device %s without "
-                        "property ID_INPUT set\n", path);
---
-2.17.1
-
(quoted diff) +0 -0

check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg- xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch index 16ec3ed..020a1cf 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

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +5 -3
@@ -1,12 +1,13 @@
-Discover monotonic clock using compile-time check
+From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Mon, 12 Dec 2016 12:11:39 +0200
+Subject: [PATCH] Discover monotonic clock using compile-time check
 
 monotonic clock check does not work when cross-compiling.
 
 Upstream-Status: Denied [Does not work on OpenBSD]
 Signed-off-by: Jussi Kukkonen <[email protected]>
 
-
-
 Original patch follows:
 
 When 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

cross-compiling.

Signed-off-by David James <davidjames at google.com>
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +5 -6
+
 ---
  configure.ac | 17 +++++++----------
  1 file changed, 7 insertions(+), 10 deletions(-)
 
 diff --git a/configure.ac b/configure.ac -index f7ab48c..26e85cd 100644
+index 2b21667..786e002 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
+@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
          CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
      fi
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644
 -       [MONOTONIC_CLOCK="cross compiling"])
 +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
 
-     LIBS="$LIBS_SAVE"
-     CPPFLAGS="$CPPFLAGS_SAVE"
---
-2.1.4
-
+     if test "$MONOTONIC_CLOCK" = "cross compiling"; then
+
Quoted 2 lines

AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing
+ yes"],[MONOTONIC_CLOCK=no],[#include <time.h>])

Do we still need this patch after this change in 1.20:

https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=c601c8faf54ff9e3bcbc653421828d71042deef7

Thanks,
Anuj

#5 lore raw
Quoted 126 lines · Anuj
Quoted 126 lines

-----Original Message-----
From: [email protected] [mailto:openembedded- [email protected]] On Behalf Of Armin Kuster
Sent: Saturday, September 15, 2018 12:04 AM
To: [email protected]; [email protected]
Subject: [OE-core] [PATCH 1/3] xserver-xorg: upgrade 1.19.6 -> 1.20.1

removed included patch

Refresh 0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC Remove 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch

---
 ...NULL-value-detection-for-ID_INPUT-being-u.patch | 40 -------------------
...onfigure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 19 +++++----  ...003-
modesetting-Fix-16-bit-depth-bpp-mode.patch | 46 ----------------------
 .../xorg-xserver/xserver-xorg_1.19.6.bb            | 33 ----------------
 .../xorg-xserver/xserver-xorg_1.20.1.bb            | 31 +++++++++++++++
 5 files changed, 40 insertions(+), 129 deletions(-)  delete mode 100644 meta/recipes-
graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-
ID_INPUT-being-u.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-
modesetting-Fix-16-bit-depth-bpp-mode.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
(quoted diff) +0 -0

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 964d5dd..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value- detection-for-ID_INPUT-being-u.patch
+++ /dev/null

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -6
@@ -1,40 +0,0 @@
-From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Fri, 5 Jan 2018 11:58:42 +1000
-Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset
-
-Erroneous condition caused us to keep going with all devices that didn't have -

ID_INPUT set.

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -32
-
-Fixes: 5aad81445c8c3d6
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
-Reviewed-by: Adam Jackson <[email protected]>
-Signed-off-by: Peter Hutterer <[email protected]>
-
-Upstream-status: Backport
-https://patchwork.freedesktop.org/patch/196090/
-Affects: < 1.20.0
-[Yocto # 12899]
-
-Signed-off-by: Armin Kuster <[email protected]>
-
----
- config/udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/udev.c b/config/udev.c -index e198e8609..3a73189e2 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
- #endif
-
-     value = udev_device_get_property_value(udev_device, "ID_INPUT");
--    if (value && !strcmp(value, "0")) {
-+    if (!value || !strcmp(value, "0")) {
-         LogMessageVerb(X_INFO, 10,
-                        "config/udev: ignoring device %s without "
-                        "property ID_INPUT set\n", path);
---
-2.17.1
-
(quoted diff) +0 -0

check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg- xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch index 16ec3ed..020a1cf 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

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +5 -3
@@ -1,12 +1,13 @@
-Discover monotonic clock using compile-time check
+From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Mon, 12 Dec 2016 12:11:39 +0200
+Subject: [PATCH] Discover monotonic clock using compile-time check
 
 monotonic clock check does not work when cross-compiling.
 
 Upstream-Status: Denied [Does not work on OpenBSD]
 Signed-off-by: Jussi Kukkonen <[email protected]>
 
-
-
 Original patch follows:
 
 When 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

cross-compiling.

Signed-off-by David James <davidjames at google.com>
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +3 -1
+
 ---
  configure.ac | 17 +++++++----------
  1 file changed, 7 insertions(+), 10 deletions(-)
 
 diff --git a/configure.ac b/configure.ac -index f7ab48c..26e85cd 100644
+index 2b21667..786e002 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
+@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
          CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
      fi
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644
 -       [MONOTONIC_CLOCK="cross compiling"])
 +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
 
Quoted 13 lines
Quoted 9 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +2 -5
-     LIBS="$LIBS_SAVE"
-     CPPFLAGS="$CPPFLAGS_SAVE"
---
-2.1.4
-
+     if test "$MONOTONIC_CLOCK" = "cross compiling"; then
+

AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing
+ yes"],[MONOTONIC_CLOCK=no],[#include <time.h>])

Do we still need this patch after this change in 1.20:

no we dont

Quoted 9 lines

https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=c601c8faf54ff9e3bcbc653421828d71042deef7

Thanks,
Anuj
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw

Patch to remove that sent. I also sent upstream the arm/musl/inb patch.

Ross

Quoted 158 lines · Khem Raj
Quoted 126 lines · Anuj
Quoted 126 lines

-----Original Message-----
From: [email protected] [mailto:openembedded- [email protected]] On Behalf Of Armin Kuster
Sent: Saturday, September 15, 2018 12:04 AM
To: [email protected]; [email protected]
Subject: [OE-core] [PATCH 1/3] xserver-xorg: upgrade 1.19.6 -> 1.20.1

removed included patch

Refresh 0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC Remove 0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch

---
 ...NULL-value-detection-for-ID_INPUT-being-u.patch | 40 -------------------
...onfigure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 19 +++++----  ...003-
modesetting-Fix-16-bit-depth-bpp-mode.patch | 46 ----------------------
 .../xorg-xserver/xserver-xorg_1.19.6.bb            | 33 ----------------
 .../xorg-xserver/xserver-xorg_1.20.1.bb            | 31 +++++++++++++++
 5 files changed, 40 insertions(+), 129 deletions(-)  delete mode 100644 meta/recipes-
graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-
ID_INPUT-being-u.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-
modesetting-Fix-16-bit-depth-bpp-mode.patch
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
 create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb
(quoted diff) +0 -0

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 964d5dd..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value- detection-for-ID_INPUT-being-u.patch
+++ /dev/null

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -6
@@ -1,40 +0,0 @@
-From a309323328d9d6e0bf5d9ea1d75920e53b9beef3 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <[email protected]>
-Date: Fri, 5 Jan 2018 11:58:42 +1000
-Subject: [PATCH] config: fix NULL value detection for ID_INPUT being unset
-
-Erroneous condition caused us to keep going with all devices that didn't have -

ID_INPUT set.

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-config-fix-NULL-value-detection-for-ID_INPUT-being-u.patch deleted +0 -32
-
-Fixes: 5aad81445c8c3d6
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
-Reviewed-by: Adam Jackson <[email protected]>
-Signed-off-by: Peter Hutterer <[email protected]>
-
-Upstream-status: Backport
-https://patchwork.freedesktop.org/patch/196090/
-Affects: < 1.20.0
-[Yocto # 12899]
-
-Signed-off-by: Armin Kuster <[email protected]>
-
----
- config/udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/udev.c b/config/udev.c -index e198e8609..3a73189e2 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -135,7 +135,7 @@ device_added(struct udev_device *udev_device)
- #endif
-
-     value = udev_device_get_property_value(udev_device, "ID_INPUT");
--    if (value && !strcmp(value, "0")) {
-+    if (!value || !strcmp(value, "0")) {
-         LogMessageVerb(X_INFO, 10,
-                        "config/udev: ignoring device %s without "
-                        "property ID_INPUT set\n", path);
---
-2.17.1
-
(quoted diff) +0 -0

check-for-CLOCK_MONOTONIC.patch b/meta/recipes-graphics/xorg- xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch index 16ec3ed..020a1cf 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

meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +5 -3
@@ -1,12 +1,13 @@
-Discover monotonic clock using compile-time check
+From 8a91316c4a38f20e7866289f3d779a037d27a129 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Mon, 12 Dec 2016 12:11:39 +0200
+Subject: [PATCH] Discover monotonic clock using compile-time check
 
 monotonic clock check does not work when cross-compiling.
 
 Upstream-Status: Denied [Does not work on OpenBSD]
 Signed-off-by: Jussi Kukkonen <[email protected]>
 
-
-
 Original patch follows:
 
 When 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

cross-compiling.

Signed-off-by David James <davidjames at google.com>
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +3 -1
+
 ---
  configure.ac | 17 +++++++----------
  1 file changed, 7 insertions(+), 10 deletions(-)
 
 diff --git a/configure.ac b/configure.ac -index f7ab48c..26e85cd 100644
+index 2b21667..786e002 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
+@@ -984,19 +984,16 @@ if ! test "x$have_clock_gettime" = xno; then
          CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
      fi
@@ -54,8 +56,5 @@ index f7ab48c..26e85cd 100644
 -       [MONOTONIC_CLOCK="cross compiling"])
 +]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
 
Quoted 13 lines
Quoted 9 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +2 -5
-     LIBS="$LIBS_SAVE"
-     CPPFLAGS="$CPPFLAGS_SAVE"
---
-2.1.4
-
+     if test "$MONOTONIC_CLOCK" = "cross compiling"; then
+

AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing
+ yes"],[MONOTONIC_CLOCK=no],[#include <time.h>])

Do we still need this patch after this change in 1.20:

no we dont

Quoted 9 lines

https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=c601c8faf54ff9e3bcbc653421828d71042deef7

Thanks,
Anuj
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core