[PATCH 1/4] xf86-input-mouse: update to 1.9.3

[PATCH 1/4] xf86-input-mouse: update to 1.9.3

[Armin Kuster]

drop patch now included in update

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../0001-Adapt-to-removal-of-xf86GetOS.patch       | 48 ----------------------
 ...ut-mouse_1.9.2.bb => xf86-input-mouse_1.9.3.bb} |  6 +--
 2 files changed, 2 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-input-mouse_1.9.2.bb => xf86-input-mouse_1.9.3.bb} (69%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch b/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch
deleted file mode 100644
index 4a082c0..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse/0001-Adapt-to-removal-of-xf86GetOS.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 16 Feb 2017 09:21:21 -0500
-Subject: [PATCH] Adapt to removal of xf86GetOS
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-Upstream-Status: Backport
-Fixes build issue with updated xorg-server changes.
-
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
----
- src/mouse.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/mouse.c b/src/mouse.c
-index dae98aa..40d97a9 100644
---- a/src/mouse.c
-+++ b/src/mouse.c
-@@ -794,7 +794,6 @@ InitProtocols(void)
- {
-     int classes;
-     int i;
--    const char *osname = NULL;
- 
-     if (osInfo)
-         return TRUE;
-@@ -821,11 +820,11 @@ InitProtocols(void)
-                 mouseProtocols[i].id = PROT_UNSUP;
- 
-     /* NetBSD uses PROT_BM for "PS/2". */
--    xf86GetOS(&osname, NULL, NULL, NULL);
--    if (osname && xf86NameCmp(osname, "netbsd") == 0)
--        for (i = 0; mouseProtocols[i].name; i++)
--            if (mouseProtocols[i].id == PROT_PS2)
--                mouseProtocols[i].id = PROT_BM;
-+#if defined(__NetBSD__)
-+    for (i = 0; mouseProtocols[i].name; i++)
-+        if (mouseProtocols[i].id == PROT_PS2)
-+            mouseProtocols[i].id = PROT_BM;
-+#endif
- 
-     return TRUE;
- }
--- 
-2.7.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb
similarity index 69%
rename from meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb
index 8dea384..c38dab5 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.3.bb
@@ -10,7 +10,5 @@ driver."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=90ea9f90d72b6d9327dede5ffdb2a510"
 
-SRC_URI += "file://0001-Adapt-to-removal-of-xf86GetOS.patch"
-
-SRC_URI[md5sum] = "ce2d679283a22c8e0dccdd9248594845"
-SRC_URI[sha256sum] = "f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f"
+SRC_URI[md5sum] = "a2104693bbcfe1413397f7905eecd3dc"
+SRC_URI[sha256sum] = "93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5"
-- 
2.7.4

[PATCH 2/4] libxscrnsaver: update to 1.2.3

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../xorg-lib/{libxscrnsaver_1.2.2.bb => libxscrnsaver_1.2.3.bb}       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxscrnsaver_1.2.2.bb => libxscrnsaver_1.2.3.bb} (83%)

diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
rename to meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb
index ddf09af..aed52e7 100644
--- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb
@@ -19,5 +19,5 @@ PE = "1"
 
 XORG_PN = "libXScrnSaver"
 
-SRC_URI[md5sum] = "7a773b16165e39e938650bcc9027c1d5"
-SRC_URI[sha256sum] = "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d"
+SRC_URI[md5sum] = "eeea9d5af3e6c143d0ea1721d27a5e49"
+SRC_URI[sha256sum] = "f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
-- 
2.7.4

[PATCH 3/4] libxinerama: update to 1.1.4

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../xorg-lib/{libxinerama_1.1.3.bb => libxinerama_1.1.4.bb}           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxinerama_1.1.3.bb => libxinerama_1.1.4.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
rename to meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb
index 367ad26..edce35d 100644
--- a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb
@@ -16,7 +16,7 @@ PE = "1"
 
 XORG_PN = "libXinerama"
 
-SRC_URI[md5sum] = "9336dc46ae3bf5f81c247f7131461efd"
-SRC_URI[sha256sum] = "7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2"
+SRC_URI[md5sum] = "0d5f826a197dae74da67af4a9ef35885"
+SRC_URI[sha256sum] = "0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.7.4

[PATCH 4/4] libxxf86misc: update to 1.0.4

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .../xorg-lib/{libxxf86misc_1.0.3.bb => libxxf86misc_1.0.4.bb}        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxxf86misc_1.0.3.bb => libxxf86misc_1.0.4.bb} (74%)

diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb
similarity index 74%
rename from meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
rename to meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb
index 04fe962..45b0673 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb
@@ -15,6 +15,5 @@ PE = "1"
 
 XORG_PN = "libXxf86misc"
 
-SRC_URI[md5sum] = "6bc0bf78909fd71021c466c793d4385c"
-SRC_URI[sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b"
-
+SRC_URI[md5sum] = "37ad70f8b53b94b550f9290be97fbe2d"
+SRC_URI[sha256sum] = "a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380"
-- 
2.7.4