Module Name: xsrc
Committed By: mrg
Date: Fri Jul 15 19:10:11 UTC 2022
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c x68kKbd.c
xsrc/external/mit/xorg-server/dist/hw/sun: sunIo.c sunKbd.c
xsrc/external/mit/xorg-server/dist/os: utils.c
Log Message:
couple of changes needed for xorg-server 21.1.4.
- AbortDDX() is removed, make it static to avoid code churn since
it is used by internal code now
- LegalModifier() is gone
- if the PRESENT extension isn't included, don't enable the
-fakescreenfps option since it require PRESENT.
fixes builds for sun3 and x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/dist/os/utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.10 Tue Dec 8 10:33:47 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c Fri Jul 15 19:10:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.10 2020/12/08 10:33:47 mrg Exp $ */
+/* $NetBSD: x68kInit.c,v 1.11 2022/07/15 19:10:11 mrg Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -188,7 +188,7 @@ CloseInput(void)
* argument: ExitCode
* returns: nothing
*-----------------------------------------------------------------------*/
-void
+static void
AbortDDX(enum ExitCode error)
{
int i;
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.13
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.12 Wed Mar 17 15:02:27 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c Fri Jul 15 19:10:11 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.12 2021/03/17 15:02:27 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.13 2022/07/15 19:10:11 mrg Exp $ */
/*-------------------------------------------------------------------------
* Copyright (c) 1996 Yasushi Yamasaki
* All rights reserved.
@@ -403,10 +403,4 @@ x68kSetLeds(X68kKbdPrivPtr pPriv, uint8_
ErrorF("Failed to set keyboard lights\n");
}
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
- return TRUE;
-}
-
/* EOF x68kKbd.c */
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7 Fri Oct 15 17:42:04 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c Fri Jul 15 19:10:11 2022
@@ -158,7 +158,7 @@ sunEnqueueEvents(void)
/*
* DDX - specific abort routine. Called by AbortServer().
*/
-void
+static void
AbortDDX(enum ExitCode error)
{
int i;
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11 Fri Oct 15 17:42:04 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c Fri Jul 15 19:10:11 2022
@@ -907,10 +907,3 @@ sunChangeKbdTranslation(int fd, Bool mak
#endif /* } */
return 0;
}
-
-/*ARGSUSED*/
-Bool
-LegalModifier(unsigned int key, DeviceIntPtr pDev)
-{
- return TRUE;
-}
Index: xsrc/external/mit/xorg-server/dist/os/utils.c
diff -u xsrc/external/mit/xorg-server/dist/os/utils.c:1.12 xsrc/external/mit/xorg-server/dist/os/utils.c:1.13
--- xsrc/external/mit/xorg-server/dist/os/utils.c:1.12 Fri Jul 15 09:10:38 2022
+++ xsrc/external/mit/xorg-server/dist/os/utils.c Fri Jul 15 19:10:11 2022
@@ -787,6 +787,7 @@ ProcessCommandLine(int argc, char *argv[
UseMsg();
}
else if (strcmp(argv[i], "-fakescreenfps") == 0) {
+#ifdef PRESENT
if (++i < argc) {
FakeScreenFps = (uint32_t) atoi(argv[i]);
if (FakeScreenFps < 1 || FakeScreenFps > 600)
@@ -794,6 +795,10 @@ ProcessCommandLine(int argc, char *argv[
}
else
UseMsg();
+#else
+ FatalError("fakescreenfps not available without PRESENT\n");
+ UseMsg();
+#endif
}
else if (strcmp(argv[i], "-fp") == 0) {
if (++i < argc) {
