mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-28 07:44:18 +08:00
137 lines
5.5 KiB
Diff
137 lines
5.5 KiB
Diff
diff -ruwN xorg-server-21.1.16/hw/xfree86/common/xf86Xinput.c source/hw/xfree86/common/xf86Xinput.c
|
|
--- xorg-server-21.1.16/hw/xfree86/common/xf86Xinput.c 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/hw/xfree86/common/xf86Xinput.c 2025-05-03 11:28:37.266757877 -0600
|
|
@@ -860,8 +860,10 @@
|
|
if (stat(path, &st) == -1)
|
|
return;
|
|
|
|
+ /*TODO
|
|
*maj = major(st.st_rdev);
|
|
*min = minor(st.st_rdev);
|
|
+ */
|
|
}
|
|
|
|
static inline InputDriverPtr
|
|
diff -ruwN xorg-server-21.1.16/hw/xfree86/loader/meson.build source/hw/xfree86/loader/meson.build
|
|
--- xorg-server-21.1.16/hw/xfree86/loader/meson.build 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/hw/xfree86/loader/meson.build 2025-05-03 11:28:37.267757875 -0600
|
|
@@ -10,7 +10,7 @@
|
|
c_args: xorg_c_args,
|
|
)
|
|
|
|
-xorg_symbol_test = executable('xorg_symbol_test',
|
|
- 'symbol-test.c',
|
|
- dependencies: dl_dep,
|
|
-)
|
|
+# xorg_symbol_test = executable('xorg_symbol_test',
|
|
+# 'symbol-test.c',
|
|
+# dependencies: dl_dep,
|
|
+# )
|
|
diff -ruwN xorg-server-21.1.16/hw/xfree86/meson.build source/hw/xfree86/meson.build
|
|
--- xorg-server-21.1.16/hw/xfree86/meson.build 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/hw/xfree86/meson.build 2025-05-03 11:28:37.267757875 -0600
|
|
@@ -171,13 +171,13 @@
|
|
)
|
|
endif
|
|
|
|
-executable('gtf',
|
|
- 'utils/gtf/gtf.c',
|
|
- include_directories: [inc, xorg_inc],
|
|
- dependencies: xorg_deps,
|
|
- c_args: xorg_c_args,
|
|
- install: true,
|
|
-)
|
|
+# executable('gtf',
|
|
+# 'utils/gtf/gtf.c',
|
|
+# include_directories: [inc, xorg_inc],
|
|
+# dependencies: xorg_deps,
|
|
+# c_args: xorg_c_args,
|
|
+# install: true,
|
|
+# )
|
|
|
|
# For symbol presence testing only
|
|
xorgserver_lib = shared_library(
|
|
diff -ruwN xorg-server-21.1.16/hw/xfree86/os-support/shared/sigio.c source/hw/xfree86/os-support/shared/sigio.c
|
|
--- xorg-server-21.1.16/hw/xfree86/os-support/shared/sigio.c 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/hw/xfree86/os-support/shared/sigio.c 2025-05-03 11:28:37.267757875 -0600
|
|
@@ -196,11 +196,12 @@
|
|
fd, strerror(errno));
|
|
}
|
|
else {
|
|
+ /*TODO
|
|
if (fcntl(fd, F_SETOWN, getpid()) == -1) {
|
|
xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n",
|
|
fd, strerror(errno));
|
|
}
|
|
- else {
|
|
+ else*/{
|
|
installed = TRUE;
|
|
}
|
|
}
|
|
diff -ruwN xorg-server-21.1.16/hw/xfree86/os-support/xf86_OSlib.h source/hw/xfree86/os-support/xf86_OSlib.h
|
|
--- xorg-server-21.1.16/hw/xfree86/os-support/xf86_OSlib.h 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/hw/xfree86/os-support/xf86_OSlib.h 2025-05-03 11:28:37.267757875 -0600
|
|
@@ -176,7 +176,7 @@
|
|
/**************************************************************************/
|
|
/* Linux or Glibc-based system */
|
|
/**************************************************************************/
|
|
-#if defined(__linux__) || defined(__GLIBC__) || defined(__CYGWIN__)
|
|
+#if defined(__linux__) || defined(__GLIBC__) || defined(__CYGWIN__) || defined(__redox__)
|
|
#include <sys/ioctl.h>
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
diff -ruwN xorg-server-21.1.16/include/meson.build source/include/meson.build
|
|
--- xorg-server-21.1.16/include/meson.build 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/include/meson.build 2025-05-06 18:15:08.036215875 -0600
|
|
@@ -162,7 +162,7 @@
|
|
conf_data.set('HAVE_PORT_CREATE', cc.has_function('port_create') ? '1' : false)
|
|
conf_data.set('HAVE_REALLOCARRAY', cc.has_function('reallocarray', dependencies: libbsd_dep) ? '1' : false)
|
|
conf_data.set('HAVE_SETEUID', cc.has_function('seteuid') ? '1' : false)
|
|
-conf_data.set('HAVE_SETITIMER', cc.has_function('setitimer') ? '1' : false)
|
|
+conf_data.set('HAVE_SETITIMER', false)
|
|
conf_data.set('HAVE_SHMCTL64', cc.has_function('shmctl64') ? '1' : false)
|
|
conf_data.set('HAVE_SIGACTION', cc.has_function('sigaction') ? '1' : false)
|
|
conf_data.set('HAVE_SIGPROCMASK', cc.has_function('sigprocmask') ? '1' : false)
|
|
@@ -190,7 +190,7 @@
|
|
conf_data.set('LISTEN_LOCAL', get_option('listen_local'))
|
|
|
|
if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS')
|
|
- conf_data.set('XTRANS_SEND_FDS', '1')
|
|
+ #TODO conf_data.set('XTRANS_SEND_FDS', '1')
|
|
endif
|
|
|
|
if conf_data.get('HAVE_GETPEEREID').to_int() == 0 and conf_data.get('HAVE_GETPEERUCRED').to_int() == 0
|
|
@@ -212,7 +212,7 @@
|
|
conf_data.set('DRI2', build_dri2 ? '1' : false)
|
|
conf_data.set('DRI3', build_dri3 ? '1' : false)
|
|
if build_glx
|
|
- conf_data.set_quoted('DRI_DRIVER_PATH', dri_dep.get_pkgconfig_variable('dridriverdir'))
|
|
+ conf_data.set_quoted('DRI_DRIVER_PATH', '/usr/lib/dri')
|
|
endif
|
|
conf_data.set('HAS_SHM', build_mitshm ? '1' : false)
|
|
conf_data.set('MITSHM', build_mitshm ? '1' : false)
|
|
diff -ruwN xorg-server-21.1.16/meson.build source/meson.build
|
|
--- xorg-server-21.1.16/meson.build 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/meson.build 2025-05-03 11:28:37.267757875 -0600
|
|
@@ -753,7 +753,7 @@
|
|
subdir('hw')
|
|
|
|
if host_machine.system() != 'windows'
|
|
- subdir('test')
|
|
+ #subdir('test')
|
|
endif
|
|
|
|
install_man(configure_file(
|
|
diff -ruwN xorg-server-21.1.16/os/access.c source/os/access.c
|
|
--- xorg-server-21.1.16/os/access.c 2025-02-25 11:56:05.000000000 -0700
|
|
+++ source/os/access.c 2025-05-03 11:28:37.267757875 -0600
|
|
@@ -120,7 +120,7 @@
|
|
#include <sys/un.h>
|
|
#endif
|
|
|
|
-#if defined(SVR4) || (defined(SYSV) && defined(__i386__)) || defined(__GNU__)
|
|
+#if defined(SVR4) || (defined(SYSV) && defined(__i386__)) || defined(__GNU__) || defined(__redox__)
|
|
#include <sys/utsname.h>
|
|
#endif
|
|
#if defined(SYSV) && defined(__i386__)
|