Commits:
-
e8302b70
by Joaquim Monteiro at 2024-10-30T10:14:36-07:00
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>
-
18c9cd6a
by Joaquim Monteiro at 2024-10-30T10:15:30-07:00
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>
-
1a836cd4
by Alan Coopersmith at 2024-10-30T17:12:06-07:00
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>
-
c3144adc
by Eric Curtin at 2024-12-02T16:11:51+00:00
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>
-
1958e0f2
by Matt Turner at 2024-12-17T17:27:20+00:00
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>
-
203e0667
by Matt Turner at 2024-12-17T17:27:20+00:00
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>
-
b5f1b211
by Matt Turner at 2024-12-17T12:39:36-05:00
xserver 21.1.15
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1753>
7 changed files:
Changes:
config/10-quirks.conf
| ... |
... |
@@ -36,3 +36,13 @@ Section "InputClass" |
|
36
|
36
|
MatchDriver "evdev"
|
|
37
|
37
|
Option "TypeName" "MOUSE"
|
|
38
|
38
|
EndSection
|
|
|
39
|
+
|
|
|
40
|
+# https://bugzilla.redhat.com/show_bug.cgi?id=2152414
|
|
|
41
|
+# Xorg server does not correctly select the DCP for the display without
|
|
|
42
|
+# a quirk on Apple Silicon
|
|
|
43
|
+Section "OutputClass"
|
|
|
44
|
+ Identifier "appledrm"
|
|
|
45
|
+ MatchDriver "apple"
|
|
|
46
|
+ Driver "modesetting"
|
|
|
47
|
+ Option "PrimaryGPU" "true"
|
|
|
48
|
+EndSection |
configure.ac
| ... |
... |
@@ -26,8 +26,8 @@ dnl |
|
26
|
26
|
dnl Process this file with autoconf to create configure.
|
|
27
|
27
|
|
|
28
|
28
|
AC_PREREQ(2.60)
|
|
29
|
|
-AC_INIT([xorg-server], 21.1.14, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
|
|
30
|
|
-RELEASE_DATE="2024-10-29"
|
|
|
29
|
+AC_INIT([xorg-server], 21.1.15, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
|
|
|
30
|
+RELEASE_DATE="2024-12-17"
|
|
31
|
31
|
RELEASE_NAME="Caramel Ice Cream"
|
|
32
|
32
|
AC_CONFIG_SRCDIR([Makefile.am])
|
|
33
|
33
|
AC_CONFIG_MACRO_DIR([m4])
|
hw/xfree86/common/xf86sbusBus.c
| ... |
... |
@@ -244,7 +244,7 @@ xf86SbusProbe(void) |
|
244
|
244
|
* in the correct format for a SBUS bus id.
|
|
245
|
245
|
*/
|
|
246
|
246
|
|
|
247
|
|
-Bool
|
|
|
247
|
+static Bool
|
|
248
|
248
|
xf86ParseSbusBusString(const char *busID, int *fbNum)
|
|
249
|
249
|
{
|
|
250
|
250
|
/*
|
| ... |
... |
@@ -316,7 +316,7 @@ xf86ParseSbusBusString(const char *busID, int *fbNum) |
|
316
|
316
|
* Compare a BUS ID string with a SBUS bus id. Return TRUE if they match.
|
|
317
|
317
|
*/
|
|
318
|
318
|
|
|
319
|
|
-Bool
|
|
|
319
|
+static Bool
|
|
320
|
320
|
xf86CompareSbusBusString(const char *busID, int fbNum)
|
|
321
|
321
|
{
|
|
322
|
322
|
int iFbNum;
|
| ... |
... |
@@ -333,7 +333,7 @@ xf86CompareSbusBusString(const char *busID, int fbNum) |
|
333
|
333
|
* Check if the slot requested is free. If it is already in use, return FALSE.
|
|
334
|
334
|
*/
|
|
335
|
335
|
|
|
336
|
|
-Bool
|
|
|
336
|
+static Bool
|
|
337
|
337
|
xf86CheckSbusSlot(int fbNum)
|
|
338
|
338
|
{
|
|
339
|
339
|
int i;
|
| ... |
... |
@@ -354,7 +354,7 @@ xf86CheckSbusSlot(int fbNum) |
|
354
|
354
|
* Otherwise, claim the slot for the screen requesting it.
|
|
355
|
355
|
*/
|
|
356
|
356
|
|
|
357
|
|
-int
|
|
|
357
|
+static int
|
|
358
|
358
|
xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp, GDevPtr dev, Bool active)
|
|
359
|
359
|
{
|
|
360
|
360
|
EntityPtr p = NULL;
|
| ... |
... |
@@ -740,6 +740,7 @@ void |
|
740
|
740
|
xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev)
|
|
741
|
741
|
{
|
|
742
|
742
|
char *promPath = NULL;
|
|
|
743
|
+ char *tmp;
|
|
743
|
744
|
|
|
744
|
745
|
sBus = (sbusDevicePtr) busData;
|
|
745
|
746
|
GDev->identifier = sBus->descr;
|
| ... |
... |
@@ -748,10 +749,11 @@ xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec * GDev) |
|
748
|
749
|
sparcPromClose();
|
|
749
|
750
|
}
|
|
750
|
751
|
if (promPath) {
|
|
751
|
|
- XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
|
|
|
752
|
+ XNFasprintf(&tmp, "SBUS:%s", promPath);
|
|
752
|
753
|
free(promPath);
|
|
753
|
754
|
}
|
|
754
|
755
|
else {
|
|
755
|
|
- XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
|
|
|
756
|
+ XNFasprintf(&tmp, "SBUS:fb%d", sBus->fbNum);
|
|
756
|
757
|
}
|
|
|
758
|
+ GDev->busID = tmp;
|
|
757
|
759
|
} |
include/dix-config.h.in
| ... |
... |
@@ -173,6 +173,9 @@ |
|
173
|
173
|
/* Define to 1 if you have the `shmctl64' function. */
|
|
174
|
174
|
#undef HAVE_SHMCTL64
|
|
175
|
175
|
|
|
|
176
|
+/* Define to 1 if the system has the type 'socklen_t'. */
|
|
|
177
|
+#undef HAVE_SOCKLEN_T
|
|
|
178
|
+
|
|
176
|
179
|
/* Define to 1 if you have the <stdlib.h> header file. */
|
|
177
|
180
|
#undef HAVE_STDLIB_H
|
|
178
|
181
|
|
include/meson.build
| ... |
... |
@@ -166,6 +166,8 @@ conf_data.set('HAVE_SETITIMER', cc.has_function('setitimer') ? '1' : false) |
|
166
|
166
|
conf_data.set('HAVE_SHMCTL64', cc.has_function('shmctl64') ? '1' : false)
|
|
167
|
167
|
conf_data.set('HAVE_SIGACTION', cc.has_function('sigaction') ? '1' : false)
|
|
168
|
168
|
conf_data.set('HAVE_SIGPROCMASK', cc.has_function('sigprocmask') ? '1' : false)
|
|
|
169
|
+# HAVE_SOCKLEN_T is used by xtrans when IPv6 is disabled
|
|
|
170
|
+conf_data.set('HAVE_SOCKLEN_T', cc.has_type('socklen_t', prefix: '#include <sys/socket.h>') ? '1' : false)
|
|
169
|
171
|
conf_data.set('HAVE_STRCASECMP', cc.has_function('strcasecmp') ? '1' : false)
|
|
170
|
172
|
conf_data.set('HAVE_STRCASESTR', cc.has_function('strcasestr') ? '1' : false)
|
|
171
|
173
|
conf_data.set('HAVE_STRLCAT', cc.has_function('strlcat', dependencies: libbsd_dep) ? '1' : false)
|
meson.build
| ... |
... |
@@ -3,10 +3,10 @@ project('xserver', 'c', |
|
3
|
3
|
'buildtype=debugoptimized',
|
|
4
|
4
|
'c_std=gnu99',
|
|
5
|
5
|
],
|
|
6
|
|
- version: '21.1.14',
|
|
|
6
|
+ version: '21.1.15',
|
|
7
|
7
|
meson_version: '>= 0.47.0',
|
|
8
|
8
|
)
|
|
9
|
|
-release_date = '2024-10-29'
|
|
|
9
|
+release_date = '2024-12-17'
|
|
10
|
10
|
|
|
11
|
11
|
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
|
|
12
|
12
|
cc = meson.get_compiler('c')
|
os/access.c
| ... |
... |
@@ -1860,7 +1860,7 @@ siHostnameAddrMatch(int family, void *addr, int len, |
|
1860
|
1860
|
char hostname[SI_HOSTNAME_MAXLEN];
|
|
1861
|
1861
|
int f, hostaddrlen;
|
|
1862
|
1862
|
void *hostaddr;
|
|
1863
|
|
- const char **addrlist;
|
|
|
1863
|
+ char **addrlist;
|
|
1864
|
1864
|
|
|
1865
|
1865
|
if (siAddrLen >= sizeof(hostname))
|
|
1866
|
1866
|
return FALSE;
|
| ... |
... |
@@ -1885,7 +1885,9 @@ siHostnameAddrMatch(int family, void *addr, int len, |
|
1885
|
1885
|
if ((f == family) && (len == hostaddrlen) &&
|
|
1886
|
1886
|
(memcmp(addr, hostaddr, len) == 0)) {
|
|
1887
|
1887
|
res = TRUE;
|
|
|
1888
|
+#ifdef h_addr
|
|
1888
|
1889
|
break;
|
|
|
1890
|
+#endif
|
|
1889
|
1891
|
}
|
|
1890
|
1892
|
}
|
|
1891
|
1893
|
}
|
|