[gentoo-commits] proj/musl:master commit in: x11-base/xorg-server/files/

[Jory Pratt]

commit:     caced4d8e1d9db36c4892e12b1a2e57ff1702e80
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 03:59:46 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat May  1 03:59:46 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=caced4d8

x11-base/xorg-server: rebase patches so they will apply properly

Closes: https://github.com/gentoo/musl/issues/431
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 .../files/xorg-server-1.12-unloadsubmodule.patch   | 44 +++++++----------
 ...rver-1.18-support-multiple-Files-sections.patch | 30 +++++++++---
 .../files/xorg-server-1.20.11-arm-musl.patch       | 22 +++++++--
 .../xorg-server-1.20.11.fix-musl-input_event.patch | 55 ++++++++++++++--------
 4 files changed, 95 insertions(+), 56 deletions(-)

diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
index 57c7349..ab08df7 100644
--- a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
@@ -1,29 +1,28 @@
-diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
---- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c	2012-09-05 18:26:42.000000000 +0200
-+++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c	2012-09-05 18:28:54.000000000 +0200
-@@ -1109,39 +1109,38 @@
- static void
- RemoveChild(ModuleDescPtr child)
- {
-     ModuleDescPtr mdp;
-     ModuleDescPtr prevsib;
-     ModuleDescPtr parent;
- 
-     if (!child->parent)
-         return;
- 
+From 4d5c555b05cf09e186cab9411aea3155018dab59 Mon Sep 17 00:00:00 2001
+From: 
+Date: Fri, 30 Apr 2021 22:50:01 -0500
+Subject: [PATCH 1/4] 
+
+---
+ hw/xfree86/loader/loadmod.c | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
+index a6356bd..a2130a0 100644
+--- a/hw/xfree86/loader/loadmod.c
++++ b/hw/xfree86/loader/loadmod.c
+@@ -892,19 +892,18 @@ RemoveChild(ModuleDescPtr child)
      parent = child->parent;
      if (parent->child == child) {
          parent->child = child->sib;
 -        return;
--    }
+     }
 -
 -    prevsib = parent->child;
 -    mdp = prevsib->sib;
 -    while (mdp && mdp != child) {
 -        prevsib = mdp;
 -        mdp = mdp->sib;
-+    }
 +    else {
 +        prevsib = parent->child;
 +        mdp = prevsib->sib;
@@ -41,13 +40,6 @@ diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12
  }
  
  void
- LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
- {
-     const char *msg;
-     MessageType type = X_ERROR;
- 
-     switch (errmaj) {
-     case LDR_NOERROR:
-         msg = "no error";
-         break;
-     case LDR_NOMEM:
+-- 
+2.26.3
+

diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
index 0a61145..3a58d71 100644
--- a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
@@ -1,10 +1,25 @@
-See http://lists.x.org/archives/xorg-devel/2015-February/045755.html
+From 8fd90ff40ab7c59c7f0a6430737fbb31d0214e44 Mon Sep 17 00:00:00 2001
+From: Michał Górny <mgorny at gentoo.org>
+Date: Fri, 30 Apr 2021 22:51:14 -0500
+Subject: [PATCH 2/4] Support reading multiple 'Files' sections in
+ configuration, concatenating the resulting paths. This makes it possible to
+ add ModulePaths and FontPaths within xorg.conf.d/ files without interfering
+ with user-provided xorg.conf. Gentoo needs this to support using replacement
+ xorg modules provided by proprietary video drivers.
+
+Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88003
+Signed-off-by: Michał Górny <mgorny at gentoo.org>
+---
+ hw/xfree86/parser/Files.c       | 8 ++++++--
+ hw/xfree86/parser/configProcs.h | 2 +-
+ hw/xfree86/parser/read.c        | 2 +-
+ 3 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
-index 849bf92..5cc3ec7 100644
+index c86ac7a..cad11cc 100644
 --- a/hw/xfree86/parser/Files.c
 +++ b/hw/xfree86/parser/Files.c
-@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = {
+@@ -76,14 +76,18 @@ static const xf86ConfigSymTabRec FilesTab[] = {
  #define CLEANUP xf86freeFiles
  
  XF86ConfFilesPtr
@@ -26,7 +41,7 @@ index 849bf92..5cc3ec7 100644
          while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
          switch (token) {
 diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
-index 171f8e8..e8199fe 100644
+index 7a46e01..0eccd14 100644
 --- a/hw/xfree86/parser/configProcs.h
 +++ b/hw/xfree86/parser/configProcs.h
 @@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr);
@@ -39,10 +54,10 @@ index 171f8e8..e8199fe 100644
  void xf86freeFiles(XF86ConfFilesPtr p);
  
 diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
-index 327c02a..e0d6139 100644
+index d7e7312..f8f5ed5 100644
 --- a/hw/xfree86/parser/read.c
 +++ b/hw/xfree86/parser/read.c
-@@ -110,7 +110,7 @@ xf86readConfigFile(void)
+@@ -111,7 +111,7 @@ xf86readConfigFile(void)
              if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {
                  free(xf86_lex_val.str);
                  xf86_lex_val.str = NULL;
@@ -51,3 +66,6 @@ index 327c02a..e0d6139 100644
              }
              else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {
                  free(xf86_lex_val.str);
+-- 
+2.26.3
+

diff --git a/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
index 541b5c7..4663cc5 100644
--- a/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.20.11-arm-musl.patch
@@ -1,7 +1,18 @@
-diff -Naur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
---- a/hw/xfree86/common/compiler.h	2021-04-29 15:19:17.958218267 -0400
-+++ b/hw/xfree86/common/compiler.h	2021-04-29 15:19:44.362218296 -0400
-@@ -518,7 +518,7 @@
+From 6a4a8b4fc167541bb2ed7911d1b22fc726ca3bf1 Mon Sep 17 00:00:00 2001
+From: 
+Date: Fri, 30 Apr 2021 22:55:18 -0500
+Subject: [PATCH 4/4] convert to checking GLIBC instead of linux for arm musl
+ users
+
+---
+ hw/xfree86/common/compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index 2b2008b..ddda5bf 100644
+--- a/hw/xfree86/common/compiler.h
++++ b/hw/xfree86/common/compiler.h
+@@ -518,7 +518,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
      barrier();
  }
  
@@ -10,3 +21,6 @@ diff -Naur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
  #if defined(__arm32__) || defined(__mips64)
  #define PORT_SIZE long
  #else
+-- 
+2.26.3
+

diff --git a/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch b/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
index ec1ae8f..cd79b67 100644
--- a/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.20.11.fix-musl-input_event.patch
@@ -1,23 +1,19 @@
-Source: @pullmoll
-Upstream: no
-Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
+From d8f70ec853fcd43199ca4887f75acc8a544084ce Mon Sep 17 00:00:00 2001
+From:
+Date: Fri, 30 Apr 2021 22:53:16 -0500
+Subject: [PATCH 3/4] Gracefully handle transition to 64 bit time with
+ musl-1.2.1
 
---- hw/dmx/input/usb-keyboard.c	2020-12-01 17:32:25.000000000 +0100
-+++ hw/dmx/input/usb-keyboard.c	2020-12-01 20:28:02.489695853 +0100
-@@ -278,8 +278,8 @@
- 
-     gettimeofday(&tv, NULL);
-     for (i = 0; i < 5; i++) {
--        event.time.tv_sec = tv.tv_sec;
--        event.time.tv_usec = tv.tv_usec;
-+        event.input_event_sec = tv.tv_sec;
-+        event.input_event_usec = tv.tv_usec;
-         event.type = EV_LED;
-         if (i == 0)
-             led = 1;            /* LED_CAPSL == 0x01 */
---- hw/dmx/examples/ev.c	2020-12-01 17:32:25.000000000 +0100
-+++ hw/dmx/examples/ev.c	2020-12-01 20:31:24.585605950 +0100
-@@ -114,8 +114,8 @@
+---
+ hw/dmx/examples/ev.c        | 9 +++++----
+ hw/dmx/input/usb-keyboard.c | 4 ++--
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/hw/dmx/examples/ev.c b/hw/dmx/examples/ev.c
+index 09e703c..692c2ef 100644
+--- a/hw/dmx/examples/ev.c
++++ b/hw/dmx/examples/ev.c
+@@ -114,8 +114,8 @@ main(int argc, char **argv)
          if ((fd = open(name, O_RDWR, 0)) >= 0) {
              printf("%s: open, fd = %d\n", name, fd);
              for (i = 0; i < LED_MAX; i++) {
@@ -28,7 +24,7 @@ Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
                  event.type = EV_LED;
                  event.code = i;
                  event.value = 0;
-@@ -123,9 +123,10 @@
+@@ -123,10 +123,11 @@ main(int argc, char **argv)
              }
  
              while ((rc = read(fd, &event, sizeof(event))) > 0) {
@@ -41,3 +37,22 @@ Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
 +                       t.tv_usec, event.type, event.code, event.value);
                  switch (event.type) {
                  case EV_KEY:
+                     if (event.code > BTN_MISC) {
+diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c
+index b26c822..feac3d2 100644
+--- a/hw/dmx/input/usb-keyboard.c
++++ b/hw/dmx/input/usb-keyboard.c
+@@ -278,8 +278,8 @@ kbdUSBCtrl(DevicePtr pDev, KeybdCtrl * ctrl)
+ 
+     gettimeofday(&tv, NULL);
+     for (i = 0; i < 5; i++) {
+-        event.time.tv_sec = tv.tv_sec;
+-        event.time.tv_usec = tv.tv_usec;
++        event.input_event_sec = tv.tv_sec;
++        event.input_event_usec = tv.tv_usec;
+         event.type = EV_LED;
+         if (i == 0)
+             led = 1;            /* LED_CAPSL == 0x01 */
+-- 
+2.26.3
+