| 24 Dec 2025 |
K900 | For some reason they have two copies of xorg as a submodule | 07:34:30 |
K900 | One here: https://github.com/XQuartz/XQuartz/tree/main/src/xquartz | 07:34:33 |
K900 | And one here: https://github.com/XQuartz/XQuartz/tree/main/src/xorg | 07:34:37 |
K900 | And they're different | 07:34:42 |
K900 | Homebrew does not patch anything: https://github.com/Homebrew/homebrew-core/blob/6f4574dcadcbbcae28dce35c1fafa6d83fb7411d/Formula/x/xorg-server.rb | 07:37:09 |
K900 | Maybe we just yeet the patches and see what happens? | 07:38:18 |
K900 | OK so it does build without the patches at least | 07:42:00 |
emily | it's likely they can be dropped, but it'd be good to know which non-upstreamed patches still remain from https://github.com/XQuartz/xorg-server/commits/XQuartz-2.8.6_beta2/ | 10:11:57 |
emily | since it looks like we were applying the stack from a years older XQuartz release | 10:12:18 |
emily | it's possible it's all been upstreamed | 10:12:27 |
emily | I doubt anyone is using it anyway though, so... | 10:13:16 |
K900 | ❯ git log ..XQuartz-2.8.6_beta2 --oneline
bc1e86979 (tag: XQuartz-2.8.6_beta2, xquartz/server-21.1-apple) Revert "os/WaitFor: Check timers on every iteration"
b3ed8b8f3 randr: Initialize RandR even if there are currently no screens attached
cb70d9dba glx: Initialize glx even if there are currently no screens attached
ef3d57a50 Set thread priorities to user interactive or user initiated as appropriate
4f2e68644 rootless: Use screen_x and screen_y instead of pixmap pointer hacks
d6b3d426d rootless: Dead code removal (RootlessResizeCopyWindow)
dc63398b4 rootless: Remove an unnecessary memory copy when handling resize with gravity RL_GRAVITY_NONE (border width changes)
9369b19b4 rootless: Dead code removal (resize_after in StartFrameResize / FinishFrameResize)
3a7095578 rootless: Remove the special case for northwest gravity in StartFrameResize
10a00957c rootless: Use RL_GRAVITY_NORTH_WEST for min/max/zoom resizing
98a76f843 rootless: Ensure gResizeDeathPix is stored in locally-managed memory rather than re-using the implementation's backing store
a1839893f rootless: Remove option to disable ROOTLESS_RESIZE_GRAVITY
3abd32a08 rootless: Fixup some format errors in debug logging
| 11:24:51 |
K900 | @emily ^ | 11:24:54 |
K900 | I am not qualified to know if any of this matters | 11:26:15 |
emily | I don't think this is querying what you think | 11:27:11 |
emily | since the commits would get a different hash if upstreamed | 11:27:24 |
K900 | The diffs are also real and relevant | 11:27:33 |
K900 | dix/dispatch.c | 2 +-
exa/exa.c | 2 +-
exa/exa_accel.c | 2 +-
fb/fb.h | 2 +-
fb/fbpixmap.c | 2 +-
fb/fbwindow.c | 2 +-
glamor/glamor_copy.c | 2 +-
glamor/glamor_pixmap.c | 2 +-
glx/glxext.c | 22 -----
hw/xquartz/X11Application.m | 3 +
hw/xquartz/darwinEvents.c | 3 +
hw/xquartz/quartzStartup.c | 3 +
include/pixmapstr.h | 2 +-
mi/miexpose.c | 2 +-
miext/damage/damage.c | 8 +-
miext/rootless/README.txt | 8 --
miext/rootless/rootless.h | 3 +-
miext/rootless/rootlessCommon.h | 19 ++---
miext/rootless/rootlessConfig.h | 4 -
miext/rootless/rootlessGC.c | 8 +-
miext/rootless/rootlessWindow.c | 387 +++++++++--------------------------------------------------------------------------
os/WaitFor.c | 3 +-
os/inputthread.c | 6 ++
present/present_scmd.c | 2 +-
randr/randr.c | 3 -
| 11:28:05 |
emily | after cherry-picking? | 11:28:06 |
K900 | This is diffstat from a merge | 11:28:08 |
emily | I checked one at random days ago and it had been upstreamed | 11:28:22 |
K900 | https://github.com/K900/xserver/commits/xquartz-rebase/ | 11:31:08 |
K900 | Here's the xquartz tag rebased on current latest release | 11:31:16 |
| 25 Dec 2025 |
| Tim joined the room. | 20:36:11 |
| 26 Dec 2025 |
Randy Eckenrode | https://github.com/KhronosGroup/MoltenVK/issues/2679 | 02:48:20 |
Randy Eckenrode | A thing to keep in mind with Open Core Legacy Patcher. | 02:48:45 |
Randy Eckenrode | * | 02:48:53 |
kfiz |  Download image.png | 03:38:21 |
kfiz | well ... | 03:38:26 |
kfiz | ? | 03:38:36 |