Update to xserver 21.1.15

1 files changed, 110 insertions, 0 deletions

diff --git a/xserver/ChangeLog b/xserver/ChangeLog
index 5e9ab8aa4..58ffe200a 100644
--- a/xserver/ChangeLog
+++ b/xserver/ChangeLog
@@ -1,3 +1,113 @@
+commit b5f1b211b4bbbf4049b422b0e08e02efaaf7a26a
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Tue Dec 17 12:39:36 2024 -0500
+
+    xserver 21.1.15
+    
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1753>
+
+commit 203e0667d21953737537d1991ec76b768fe588ae
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Mon Dec 16 22:38:24 2024 -0500
+
+    hw/xfree86: Fix -Wincompatible-pointer-types sbus compile failure
+    
+    ```
+    ../hw/xfree86/common/xf86sbusBus.c: In function ‘xf86SbusConfigureNewDev’:
+    ../hw/xfree86/common/xf86sbusBus.c:751:21: error: passing argument 1 of ‘XNFasprintf’ from incompatible pointer type [-Wincompatible-pointer-types]
+      751 |         XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
+          |                     ^~~~~~~~~~~~
+          |                     |
+          |                     const char **
+    ```
+    
+    Apply the same fix as in commit e1e01d2e3 ("xfree86/common: Warning
+    fixes. Mostly const string handling.")
+    
+    (cherry picked from commit bdacb100bf6a551bc9045f7f0048cbb99eb3db5a)
+    
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1752>
+
+commit 1958e0f25b6b46940625b407a5e15b39fa648b26
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Mon Dec 16 22:38:03 2024 -0500
+
+    hw/xfree86: Fix -Wmissing-prototypes warnings
+    
+    None of these functions are used elsewhere in the Xserver nor in any of
+    the xf86-video-sun* DDXs.
+    
+    (cherry picked from commit 00a96cd82a7be08f421dcbe3aa628fdbc7c8d856)
+    
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1752>
+
+commit c3144adcbc01d4f9f4d1e42323fc51be689bee17
+Author: Eric Curtin <ecurtin@redhat.com>
+Date:   Fri Dec 16 11:10:12 2022 +0000
+
+    config: add a quirk for Apple Silicon appledrm
+    
+    Xorg server does not correctly select the DCP for the display without a
+    quirk on Apple Silicon.
+    
+    Signed-off-by: Eric Curtin <ecurtin@redhat.com>
+    Suggested-by: Hector Martin <marcan@marcan.st>
+    (cherry picked from commit 39934a656a44722d16a80bf4db411c53e2d67b38)
+    
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1746>
+
+commit 1a836cd47be8177cb3ab3ac2bc90e926c24c0cac
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Wed Oct 30 10:34:14 2024 -0700
+
+    dix-config.h: add HAVE_SOCKLEN_T definition
+    
+    Needed to build with IPv6 disabled using gcc 14 on some platforms to avoid:
+    
+    In file included from /usr/X11/include/X11/Xtrans/transport.c:67,
+                     from xstrans.c:17:
+    /usr/X11/include/X11/Xtrans/Xtranssock.c: In function ‘_XSERVTransSocketOpen’:
+    /usr/X11/include/X11/Xtrans/Xtranssock.c:467:28: error: passing argument 5
+     of ‘getsockopt’ from incompatible pointer type [-Wincompatible-pointer-types]
+      467 |             (char *) &val, &len) == 0 && val < 64 * 1024)
+          |                            ^~~~
+          |                            |
+          |                            size_t * {aka long unsigned int *}
+    
+    (Backport to xserver-21.1-branch of commit a1b5aa5a7f12adc43720a5ae11e6c.
+     Backport adds autoconf equivalent to meson change from master branch.)
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1737>
+
+commit 18c9cd6ab799cf8bd7fb90b4965455bece0046c3
+Author: Joaquim Monteiro <joaquim.monteiro@protonmail.com>
+Date:   Sun Jun 23 21:23:47 2024 +0100
+
+    os: Fix siHostnameAddrMatch in the case where h_addr isn't defined
+    
+    When IPv6 support isn't enabled, and h_addr isn't defined,
+    there is no for loop, so the break statement is invalid.
+    
+    Signed-off-by: Joaquim Monteiro <joaquim.monteiro@protonmail.com>
+    (cherry picked from commit a6a993f9508ff0bd6f19695b2dfaef170c652525)
+    
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1737>
+
+commit e8302b707d6fddf8e27daa0b3ef70fd3efec823c
+Author: Joaquim Monteiro <joaquim.monteiro@protonmail.com>
+Date:   Sun Jun 23 21:17:25 2024 +0100
+
+    os: Fix assignment with incompatible pointer type
+    
+    struct hostent->h_addr_list is of type char**, not const char**.
+    GCC considers this an error when in C99 mode or later.
+    
+    Signed-off-by: Joaquim Monteiro <joaquim.monteiro@protonmail.com>
+    (cherry picked from commit 0ddcd8785199c08d9bded3c767a3b1227c670999)
+    
+    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1737>
+
 commit b25ad9b8f0ebcc3ebe09ce9991410c60f3a8b2ce
 Author: José Expósito <jexposit@redhat.com>
 Date:   Tue Oct 29 14:40:34 2024 +0100