xserver: Branch 'server-21.1-branch' - 5 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Jun 26 10:07:50 UTC 2022
hw/xfree86/ddc/print_edid.c | 2 +-
hw/xfree86/drivers/inputtest/xf86-input-inputtest.c | 12 ++++++++++++
hw/xfree86/meson.build | 2 +-
hw/xquartz/bundle/meson.build | 1 -
hw/xquartz/mach-startup/meson.build | 11 +++++++++++
meson.build | 6 ++----
test/meson.build | 2 ++
7 files changed, 29 insertions(+), 7 deletions(-)
New commits:
commit 66ac50090dd191f1b16daf338ca3b46d9147fbbd
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Jun 26 02:40:20 2022 -0700
XQuartz: Build the bundle trampoline when using meson
This brings the change for e1fdc856aedfcb4788011415930a0c6861df5123 into meson based builds
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit b00cf4aef881e00533f995c141c3586749cd7ca1)
diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build
index 20afb96ea..1305ccf23 100644
--- a/hw/xquartz/bundle/meson.build
+++ b/hw/xquartz/bundle/meson.build
@@ -57,7 +57,6 @@ install_data('PkgInfo',
install_mode: 'rw-r--r--')
install_data('X11.sh',
- rename: 'X11',
install_dir: join_paths(bundle_root, 'Contents/MacOS'),
install_mode: 'rwxr-xr-x')
diff --git a/hw/xquartz/mach-startup/meson.build b/hw/xquartz/mach-startup/meson.build
index a1c782b1f..2f7694252 100644
--- a/hw/xquartz/mach-startup/meson.build
+++ b/hw/xquartz/mach-startup/meson.build
@@ -70,6 +70,17 @@ x11_bin = executable('X11.bin',
install_dir: x11appdir,
)
+# X11 (Bundle trampoline)
+x11 = executable('X11',
+ [
+ 'bundle_trampoline.c',
+ ],
+ c_args: xquartz_defs,
+ link_args: ['-Objc'],
+ install: true,
+ install_dir: x11appdir,
+)
+
# Xquartz
xquartz_deps = [
dependency('CoreServices', method: 'extraframework'),
commit 033d93a021e86dd5ce9b2b3a1554a72c7031a7f2
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Jun 20 17:08:53 2022 -0700
meson: Support building Xnest and Xorg on darwin
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit ef8101560eefd6160df6d4b57ddb65ea2328c441)
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 29ea31568..c4db85cdb 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -75,7 +75,7 @@ endif
if host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
linker_export_flags = '-Wl,--export-all-symbols'
-elif host_machine.system() == 'sunos'
+elif host_machine.system() == 'sunos' or host_machine.system() == 'darwin'
linker_export_flags = []
else
linker_export_flags = '-Wl,--export-dynamic'
diff --git a/meson.build b/meson.build
index 9ea7e1d76..64d82fe23 100644
--- a/meson.build
+++ b/meson.build
@@ -184,8 +184,7 @@ if with_dtrace
endif
build_xorg = false
-if (host_machine.system() != 'darwin' and
- host_machine.system() != 'windows')
+if (host_machine.system() != 'windows')
if get_option('xorg') == 'auto'
build_xorg = (host_machine.system() != 'darwin' and
host_machine.system() != 'windows')
@@ -197,8 +196,7 @@ xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
libxcvt_dep = dependency('libxcvt', required: build_xorg)
build_xnest = false
-if (host_machine.system() != 'darwin' and
- host_machine.system() != 'windows')
+if (host_machine.system() != 'windows')
if get_option('xnest') != 'false'
xnest_required = get_option('xnest') == 'true'
commit 433f53a1a08390a038176b7c1207512cf1dd3f44
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Jun 20 20:19:06 2022 -0700
tests: Fix build failure from missing micmap.c
FAILED: test/tests
clang -o test/tests test/tests.p/.._mi_miinitext.c.o test/tests.p/fixes.c.o test/tests.p/input.c.o test/tests.p/list.c.o test/tests.p/misc.c.o test/tests.p/signal-logging.c.o test/tests.p/string.c.o test/tests.p/test_xkb.c.o test/tests.p/tests-common.c.o test/tests.p/tests.c.o test/tests.p/touch.c.o test/tests.p/xfree86.c.o test/tests.p/xtest.c.o test/tests.p/hashtabletest.c.o -Wl,-dead_strip_dylibs -Wl,-headerpad_max_install_names -Wl,-undefined,error -fvisibility=hidden -O0 -g3 -gdwarf-2 -mmacosx-version-min=10.9 -Werror=unguarded-availability-new -Werror=format -Werror=objc-method-access -Werror=incompatible-pointer-types -F/Applications/Utilities/XQuartz.app/Contents/Frameworks -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.13.sdk -arch x86_64 -O0 -g3 -gdwarf-2 -mmacosx-version-min=10.9 -Werror=unguarded-availability-new -Werror=format -Werror=objc-method-access -Werror=incompatible-pointer-types -F/Applications/Utilities/XQuartz.app/Contents/Frameworks -isysroo
t /Library/Developer/CommandLineTools/SDKs/MacOSX10.13.sdk -arch x86_64 -Wl,-rpath,/opt/X11/lib mi/liblibxserver_mi.a dix/liblibxserver_dix.a composite/liblibxserver_composite.a damageext/liblibxserver_damageext.a dbe/liblibxserver_dbe.a randr/liblibxserver_randr.a miext/damage/liblibxserver_miext_damage.a render/liblibxserver_render.a present/liblibxserver_present.a Xext/liblibxserver_xext.a miext/sync/liblibxserver_miext_sync.a xfixes/liblibxserver_xfixes.a Xi/liblibxserver_xi.a xkb/liblibxserver_xkb.a record/liblibxserver_record.a os/liblibxserver_os.a os/liblibxlibc.a glx/liblibglxvnd.a hw/xfree86/common/libxorg_common.a hw/xfree86/loader/libxorg_loader.a hw/xfree86/ddc/libxorg_ddc.a hw/xfree86/xkb/libxorg_xkb.a hw/xfree86/i2c/libxorg_i2c.a hw/xfree86/modes/libxorg_modes.a hw/xfree86/os-support/libxorg_os_support.a hw/xfree86/parser/libxorg_parser.a hw/xfree86/ramdac/libxorg_ramdac.a fb/liblibxserver_fb.a Xext/liblibxserver_xext_vidmode.a dix/liblibxserver_main.a config/liblibxs
erver_config.a /opt/X11/lib/libpixman-1.dylib /opt/X11/lib/libxcvt.dylib /opt/X11/lib/libxkbfile.dylib /opt/X11/lib/libXfont2.dylib /opt/X11/lib/libXdmcp.dylib -lm /opt/X11/lib/libxshmfence.dylib -ldl -lpthread /opt/X11/lib/libXau.dylib /opt/X11/lib/libGL.dylib
Undefined symbols for architecture x86_64:
"_micmapScrPrivateKeyRec", referenced from:
_DGAInstallCmap in libxorg_common.a(xf86DGA.c.o)
_xf86HandleColormaps in libxorg_common.a(xf86cmap.c.o)
_CMapInstallColormap in libxorg_common.a(xf86cmap.c.o)
_CMapEnterVT in libxorg_common.a(xf86cmap.c.o)
_CMapSwitchMode in libxorg_common.a(xf86cmap.c.o)
_CMapSetDGAMode in libxorg_common.a(xf86cmap.c.o)
_CMapChangeGamma in libxorg_common.a(xf86cmap.c.o)
...
ld: symbol(s) not found for architecture x86_64
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit 6645ff59069d603806d749e8af73893cf88d2c06)
diff --git a/test/meson.build b/test/meson.build
index beeeaf840..7cd636939 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -110,6 +110,8 @@ if build_xorg
unit_sources = [
'../mi/miinitext.c',
'../mi/miinitext.h',
+ '../mi/micmap.c',
+ '../mi/micmap.h',
'fixes.c',
'input.c',
'list.c',
commit 3868f364728ae0cc35621bbfdd36bfa2e3f09fda
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Jun 20 20:05:46 2022 -0700
xf86-input-inputtest: Fix build on systems without SOCK_NONBLOCK
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit 707f23dab8787b4154011186206dc9964e2ebc11)
diff --git a/hw/xfree86/drivers/inputtest/xf86-input-inputtest.c b/hw/xfree86/drivers/inputtest/xf86-input-inputtest.c
index 70f8fe964..63a48522a 100644
--- a/hw/xfree86/drivers/inputtest/xf86-input-inputtest.c
+++ b/hw/xfree86/drivers/inputtest/xf86-input-inputtest.c
@@ -1005,7 +1005,19 @@ pre_init(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
unlink(driver_data->socket_path);
+#ifdef SOCK_NONBLOCK
driver_data->socket_fd = socket(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
+#else
+ int fd = socket(PF_UNIX, SOCK_STREAM, 0);
+ if (fd >= 0) {
+ flags = fcntl(fd, F_GETFL, 0);
+ if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+ fd = -1;
+ }
+ }
+ driver_data->socket_fd = fd;
+#endif
+
if (driver_data->socket_fd < 0) {
xf86IDrvMsg(pInfo, X_ERROR, "Failed to create a socket for communication: %s\n",
strerror(errno));
commit afcaaac96767d773422512e755e5ad3691a0627c
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Jun 20 19:51:39 2022 -0700
print_edid: Fix a format string error
../hw/xfree86/ddc/print_edid.c:511:20: error: format specifies type 'unsigned short' but the argument has type 'int' [-Werror,-Wformat]
det_mon->type - DS_VENDOR);
^~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit 199b8c0853c92ce19a589186f326621477401b74)
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 699cbe11d..f5215bd1c 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -507,7 +507,7 @@ handle_detailed_print(struct detailed_monitor_section *det_mon, void *data)
}
if (det_mon->type >= DS_VENDOR && det_mon->type <= DS_VENDOR_MAX) {
xf86DrvMsg(scrnIndex, X_INFO,
- "Unknown vendor-specific block %hx\n",
+ "Unknown vendor-specific block %x\n",
det_mon->type - DS_VENDOR);
}
More information about the xorg-commit
mailing list