Author	SHA1	Message	Date
Jeremy Huddleston Sequoia	dd5edd037b	rootless: Remove ROOTLESS_WORKAROUND ... XQuartz was the last consumer of this 2007 workaround, which made getDrawableDamageRef() route a non-viewable window's damage to the screen damage list instead of the window pixmap's. Because the answer then changed as a window's viewability changed, it was a source of exactly the register/unregister list mismatch the previous commit addresses -- CrushTree() clears ->viewable before unrealizing, so a window's damage was inserted on one list and looked for on another during teardown. It was disabled for XWin in 20701522be for breaking Composite and removed entirely in c89f0521044083a11d538ebfeaabee6fc7fb9a03, but that removal was reverted in de32d4dcf5 after a regression report, pending a proper fix in the damage layer. That fix is now in place, so drop the workaround. Fixes: https://github.com/XQuartz/XQuartz/issues/406 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2277> (cherry picked from commit cfbc5224a6) (cherry picked from commit 029735e8a254ed2dd5c565878eb946f1ef684fa1) (cherry picked from commit 0939e0d745c0ee86e603b23b09cac7ea5e632801) Port notes ---------- This brings our tree in line with xorg/main, where ROOTLESS_WORKAROUND no longer occurs at all. Jeremy Huddleston removed it there; this is that change, not a new proposal. Scope: the define is set only under `if build_rootless`, and build_rootless is set only for build_xquartz (meson.build). In a normal -Dwerror=true build of this tree the generated dix-config.h contains no ROOTLESS_WORKAROUND, so the #ifdef block in miext/damage/damage.c does not compile there. The affected configuration is macOS XQuartz. History: the removal was reverted in de32d4dcf5 after a regression report, pending a proper fix in the damage layer. That fix has since landed as #3793 ("use drawable pointer instead of list head pointer"), which is what the original commit message above refers to. Nothing re-established the workaround's necessity afterwards: it returned in 2019 only because ecf62b7ba6 added the meson build and carried the define over from configure.ac, without referring to the 2011 report. Not verified here: that XQuartz on macOS runs without the workaround. applewm is not available on this Linux host and no CI lane exercises it. Not a backport candidate: this removes a workaround rather than fixing a defect. It corrects no crash, no memory error and no security issue, so it must not be carried to release/25.2, 25.1 or 25.0. Per the backport policy a release branch takes bugfixes, not cleanups. If a release branch ever needs this, it has to be a deliberate maintainer decision with its own justification - not a consequence of this port.	2026-10-02 16:58:01 +02:00
Alan Coopersmith	131a22e1ca	xf86: mark wasset unused in xf86UnblockSIGIO() compatibility wrapper ... Avoids a gcc warning in every file that includes it, whether in the server or drivers: /usr/include/xorg/xf86.h: In function ‘xf86UnblockSIGIO’: /usr/include/xorg/xf86.h:86:55: warning: unused parameter ‘wasset’ [-Wunused-parameter] 86 | static inline _X_DEPRECATED void xf86UnblockSIGIO(int wasset) { input_unlock(); } | ~~~~^~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2323> (cherry picked from commit 306071c0b9) (cherry picked from commit acb4f9e13d0e5a6528935e1c599dc55797c723d6) (cherry picked from commit 9450835d68ce2cc767325f46d90d8343fd30fa3b)	2026-10-02 12:52:06 +02:00
Alan Coopersmith	4c537f6d82	meson: convert remaining foo == a or foo == b to foo in [a, b] style ... Make our checks more consistent, readable, and modern-meson idiomatic Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2313> (cherry picked from commit 3983c7408c) (cherry picked from commit acb16385e95d611a83209a26e31e9bcd68df7069) (cherry picked from commit ca1d1442ce2ef7f28607db0bfd505ff59264523f)	2026-10-02 10:07:37 +02:00
Enrico Weigelt, metux IT consult	ccfc4797cf	miext: damage: use drawable pointer instead of list head pointer to avoid realloc() UAF ... The original fix (*1) introduced a use-after-free vulnerability by caching a pointer into a realloc()able privates array (pListHead). This fix replaces the pListHead pointer with pListDrawable, storing the drawable pointer at insertion time and re-deriving the list head at removal time via getDrawableDamageRef(), avoiding the realloc() UAF. The fix: 1. Changes pListHead (DamagePtr *) to pListDrawable (DrawablePtr) in damagestr.h 2. Updates damageInsertDamage to store pDamage->pDrawable instead of the list head pointer 3. Updates damageRemoveDamage to take a DrawablePtr and re-derive the list head via getDrawableDamageRef() 4. Updates all call sites to pass the drawable pointer instead of the list head pointer 5. Fixes damagePixmapDestroy to pass the pixmap as the drawable *1) da72833185 Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-10-02 02:53:47 +02:00
Jeremy Huddleston Sequoia	a319ce535b	damage: Unlink a damage from the list it was actually inserted on ... DamageRegister() chooses which list a damage is linked onto via getDrawableDamageRef(), but DamageUnregister() and damageSetWindowPixmap() re-derived that list at removal time. For a window the answer depends on the window pixmap, which changes while the damage is registered (Composite redirection, rootless drawing and Present flips all swap it), so the removal could consult a different list than the one the damage was inserted onto. It then silently found nothing -- DAMAGE_VALIDATE_ENABLE is off, so the diagnostic is compiled out -- and left an unregistered, often freed, damage linked where damageRegionAppend() would later dereference its NULL pDrawable and crash. Record the list head when linking a damage and always unlink from that, which also drops a use-after-free read of the old window pixmap in damageSetWindowPixmap(): rootless frees its scratch pixmap before restoring the pre-drawing window pixmaps, so the pixmap consulted there had already been destroyed. Fixes: https://github.com/XQuartz/XQuartz/issues/406 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2277> (cherry picked from commit da72833185) (cherry picked from commit 07df8459788fa1f73ff173cb4dbd8233a69fddf4) (cherry picked from commit 3df8dc189e3982038a8672639ab6bffbf6e32ad4)	2026-10-02 02:53:47 +02:00
Enrico Weigelt, metux IT consult	427470cead	meson: only install dri3.h if building dri3 support ... Reported-by: Thomas Klausner <wiz@gatalith.at> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-10-01 19:28:51 +02:00
Alan Coopersmith	2bbea240f3	Handle -Wimplicit-fallthrough warnings from gcc 16.1 ... Gets rid of 36 -Wimplicit-fallthrough warnings Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2272>	2026-09-30 21:03:21 +02:00
Peter Hutterer	7770acd009	Disable font server connections by default ... At this point, allowing X Font Server connections just introduces us to possible security issues since the code effectively trusts any font server and few checks are in place. Since font servers also haven't been used for ages, let's disable them by default. Use-cases that require them will have to pass +fontserverconnections on the commandline and/or set the corresponding ServerFlags option. The tests are a bit hacky: Debian builds libXfont2 with --disable-fc so we need to cater for the case where the X server enables fontserver support but libXfont then blocks it and we still need to treat this as success. Assisted-by: Claude:claude-opus-4-6 Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2263> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-09-29 18:24:47 +02:00
Enrico Weigelt, metux IT consult	c933897bc9	dix: CreateConnectionBlock(): record number of roots ... When Xinerama is enabled, the number of user-visible roots (screens) isn't equal to number of actual server screens anymore. Instead of having #ifdef's in several places, let the connection block renderer record the number of roots actually processed. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-09-25 21:27:00 +02:00
Enrico Weigelt, metux IT consult	9ba1d707b8	xfree86: fix NetBSD/OpenBSD build - don't enable syscons here ... a) NetBSD and OpenBSD use wscons (WSCONS_SUPPORT) instead of syscons. sys/console.h exists only on FreeBSD/DragonFlyBSD. b) Several platform specific build symbols (eg. SYSCONS_SUPPORT, etc) have been set in the wrong way: they really be based on probe results and defined the same way in the SDK config header, too. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-09-18 20:58:19 +02:00
Enrico Weigelt, metux IT consult	468b86a562	SDK: define BSD console macros unconditionally for driver builds ... When building the xserver SDK on Linux (e.g. GitHub Actions Ubuntu runners), the BSD console macros (CONFIG_BSD_CONSOLE, CSRG_BASED, PCVT_SUPPORT, SYSCONS_SUPPORT, WSCONS_SUPPORT) were not defined because they were gated on host_machine.system(). This caused driver builds (e.g. xf86-input-keyboard) to fail when building against the SDK, as they reference xf86Info.consType and the PCCONS/SYSCONS/PCVT/WSCONS constants. Fix by defining these macros unconditionally in conf_data and xorg_data when build_xorg_sdk is true, so the installed SDK headers contain them regardless of the build platform. For non-SDK builds, keep the platform-appropriate conditional values. Also add CONFIG_BSD_CONSOLE to the xlibre-server.h template. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-09-07 10:59:54 +02:00
kaolinite7	2b7cbdda1a	Add Support for DPI Auto-Detection ... This PR re-adds support for DPI Auto-Detection which was available in X.Org till 21.1, but was removed. This reverts commit 35af1299 and allows to get Auto DPI Detection back only when specified by user as: $ X -dpi auto	2026-08-31 14:37:35 +02:00
Tautvis	2d72f9e192	xfree86: ddc: parse CTA-861-G HDR static metadata + colorimetry data blocks ... Add xf86DoInterpretHDRMetadata(), which walks the EDID's CTA/CEA extension data blocks and fills in a new struct monitor_hdr_data (tail-appended field xf86Monitor::hdr) from the two blocks a display uses to advertise HDR support: - the Colorimetry Data Block (tag 5): which extended gamuts/transfer spaces the display accepts (BT.2020 RGB/YCC/cYCC, opRGB, xvYCC, ICtCp, ...), exposed via is_CTA_CDB_*() bit-test macros. - the HDR Static Metadata Data Block (tag 6): supported EOTFs (traditional SDR/HDR gamma, SMPTE ST.2084/PQ, HLG) plus the desired content min/max/max-frame-average luminance, decoded with the CTA-861-G power-law formulas. Covered by a new EDID unit test (test/ddc-tests.c) using real captured EDIDs from four displays (Samsung Q800T, MSI MAG321CURV, HP 27 QD, and a QEMU virtual display as the "no HDR block present" negative case), asserting the parsed colorimetry/luminance values match known-good figures for each. This is a standalone prerequisite for HDR support, independent of any particular rendering-pipeline design: cepelinas9000's HDR work (https://github.com/cepelinas9000/xserver/tree/wip/x11hdrV2) needs to know a display's HDR/colorimetry capabilities before doing anything else, and this is useful on its own for any HDR/wide-gamut detection regardless of how the rest of the pipeline ends up looking. Extracted (with typo/whitespace cleanup, no logic changes) from cepelinas9000's wip/x11hdrV2 branch, commit 159a6f484a, for standalone review ahead of the larger HDR effort. Note for review: struct monitor_hdr_data is added as a new field at the tail of the public xf86Monitor struct (include/edid.h) - additive only, no existing field shifts. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-24 13:50:42 +02:00
Enrico Weigelt, metux IT consult	33b79c397c	include: compiler.h: ppc64el eieio barrier fallback for GCC 12.2 ... __builtin_ppc_eieio() is not available on ppc64le (little-endian) with GCC 12.2 ("implicit declaration of function '__builtin_ppc_eieio'"), breaking the CI native build lanes for ppc64el. Use an asm("eieio") fallback on ppc64 (and whenever __has_builtin cannot confirm the builtin), and route the xf86WriteMmio* barriers through write_mem_barrier() so there is a single arch-correct place. Validated: powerpc64le-linux-gnu-gcc-12 -fsyntax-only passes with the fix and fails with "implicit declaration" without it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 14:02:59 +02:00
Enrico Weigelt, metux IT consult	cd3fb8ba8e	include: compiler.h: switch ioBase to void * ... ioBase is an opaque mmap() result; nothing in-tree dereferences it or does pointer arithmetic on it — all MMIO access goes through the xf86Read/WriteMmio* helpers. Making it void *: - removes the discarded-qualifiers warnings at the munmap() call sites in lnx_video.c and ppc_video.c - drops the now-redundant (void *) casts in the inb/outb wrappers in compiler.h - fixes the BSD/ppc munmap path that referenced the (undefined) __DEVOLATILE/__UNVOLATILE macros ABI-neutral: the exported data symbol keeps its size and address. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 13:08:37 +02:00
Enrico Weigelt, metux IT consult	20d1a1c3d9	include: compiler.h: consolidate alpha specific defines ... consolidate the alpha specific defines into one defined(__alpha__) block. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 12:34:34 +02:00
Enrico Weigelt, metux IT consult	2872956b02	include: compiler.h: drop not needed 'extern' on function prototypes ... function prototypes are always 'extern' if not stated otherwise. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 11:49:12 +02:00
Enrico Weigelt, metux IT consult	c2b55a78fc	include: compiler.h: use internally ... since 17227134f8 we have our new xlibre_mem_barrier_(read|write) functions, which are wrapped by the old mem_barrier() and write_mem_barrier() functions. Not it's a good time for getting rid of that indirection within the header. The wrappers are still available for driver compat. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 11:47:55 +02:00
Enrico Weigelt, metux IT consult	0ab6a5d3f2	include: compiler.h: consolidate ifdef's within __alpha__ branch ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 11:47:40 +02:00
Enrico Weigelt, metux IT consult	206b468a63	xfree86: int10: move private definitions out of public header ... the definitions gated behind _INT10_PRIVATE define aren't accessible to any external driver (neither are they used by proprietary Nvidia driver), so no need to keep them in a public header file. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 11:47:23 +02:00
Enrico Weigelt, metux IT consult	f2a5eda29c	include: drop obsolete client.h ... This file isn't included by anybody anymode, so let's get rid of it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-07 11:46:59 +02:00
Enrico Weigelt, metux IT consult	d497b720fb	include: compiler.h: restore MIPS port I/O port access (12-year-old bug) ... With commit b5141a1fab (2014-07-22, "xfree86: Simplify a bunch of OS and arch conditionals"), the MIPS port I/O and MMIO code has been incorrectly nested inside the `#elif defined(__arm32__) && !defined(__linux__)` - thus impossible to ever become active. Ergo: MIPS support was broken all the time, Xservers compiled on MIPS lacked basic IO support. Fixes: b5141a1fab Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 16:29:12 +02:00
Enrico Weigelt, metux IT consult	3e7faaf43a	sparc: rename ASI_PL to __XLIBRE_SPARC_ASI_PRIMAY_LE ... This define may also be set by (OS specific) system headers on Sparc machines and just holds the adress space identifier bitmask for accessing in PRIMARY address space (normal userspace) with automatic LE conversion. The value physically constant, defined by the instruction set itself, thus no need to rely on external headers at all. In order to prevent header possible conflicts, make a private and temporary #define here. Note: we could just write the 0x88 here, but for readability, let's leave a define with some actually telling name in here. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 16:05:58 +02:00
Enrico Weigelt, metux IT consult	7b814e62c4	include: compiler.h: replace alpha MMIO_(IN|OUT)* by inline functions ... These macros currently doing nothing else than mapping to the corresponding (alpha-specific) xf86(Read|Write)Mmio* inline functions. And those aren't referenced directly by any drivers, neither are they actual symbols (since they're inlined). Thus, let's lighten the wood a bit by just renaming those functions to MMIO_(IN|OUT)* and drop the extra macros. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 15:02:24 +02:00
Enrico Weigelt, metux IT consult	8bf1079f25	include: compiler.h: use <sys/mman.h> instead of MAP_FAILED fallback in powerpc branch ... MAP_FAILED is POSIX-mandated and provided by <sys/mman.h> on every powerpc platform the server builds on (Linux, the BSDs, Darwin). The hand-rolled #ifndef MAP_FAILED fallback dates back to XFree86 4.3 and only exists to support antique C libraries; drop it and take the authoritative system definition instead. The include is scoped to the powerpc branch, the only branch whose in/out accessors compare ioBase against MAP_FAILED. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 14:52:08 +02:00
Enrico Weigelt, metux IT consult	55317228e9	include: compiler.h: inline PORT_SIZE define ... It's only relevant in the __arm32__ && non-linux branch, and always define as `long`, so no need for an extra macro - we can directly write `long` in all call sites. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 13:17:04 +02:00
Enrico Weigelt, metux IT consult	17227134f8	include: new header for arch specific membarrier inline functions ... replace the macro wood in compiler.h by a set of inline functions, placed in a separate header file. for backwards compat, compiler.h will always include that new header, and the header defines inline's providing the old names. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 13:11:34 +02:00
Enrico Weigelt, metux IT consult	bbdbe39370	include: compiler.h: inline sparc barrier() macro ... This macro is only defined on sparc and used in sparc-specific inline functions, so we can directly inline that one line into those inline functions. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 12:38:57 +02:00
Enrico Weigelt, metux IT consult	7f52b99a31	compiler: include: replace eieio() by __builtin_ppc_eieio() ... * we're only supporting (non-ancient) GCC and Clang compilers * those define __builtin_ppc_eieio(), but not eieio() * the eieio() macros once was defined on ancient linux headers, but had been removed long ago Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 11:51:14 +02:00
Enrico Weigelt, metux IT consult	1202a81832	include: compiler.h: document MMIO_IS_BE and (SPARC|PPC)_MMIO_IS_BE ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-06 10:13:52 +02:00
Enrico Weigelt, metux IT consult	1c3e1c2085	include: compiler.h: document MMIO_IS_BE and (SPARC|PPC)_MMIO_IS_BE ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-05 20:18:02 +02:00
Enrico Weigelt, metux IT consult	ed3befc01a	include: compiler.h: drop noop for barrier(), mem_barrier(), write_mem_barrier() ... These are fallback definitions for the case we're on some platform that doesn't have them defined above. While it seens comfortable to do so, it has the big drawback that we don't see if some platform is missing here. Therefore, drop them, so we'll actually see FTBS on unsupported platform and then implement the necessary pieces. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-05 20:16:09 +02:00
Enrico Weigelt, metux IT consult	90877ec460	include: compiler.h: drop obsolete quirks for ancient proprietary Intel compiler ... We're not using ancient compilers back from the 80s anymore, so no need to keep those quirks. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-05 19:26:15 +02:00
Enrico Weigelt, metux IT consult	1c357e8501	include: compiler.h: drop dead NDS32 support ... NDS32 was an obscure risc platform, which never made it into actual desktop or tablet machines. It's found in many deeply embedded chips, eg. storage or audio controllers, but nothing that might wanna run an Xserver. These pieces of experimental support in here came from some PoC done by the silicon vendor (Andes Technology), which never actually made it into production. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-05 17:56:01 +02:00
Enrico Weigelt, metux IT consult	5933b64d90	Revert "meson.build: Use a disabler for the gbm dependency" ... This reverts commit a1acf90c52. Using the disabler() in meson.build had unexpected side effects: some neccessary glamor pieces aren't built anymore at all, causing the tests to fail. This was just cosmetics, and master branch should never break the CI, so doing a quick revert here and leave a clean solution for later. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-08-04 11:33:44 +02:00
stefan11111	a1acf90c52	meson.build: Use a disabler for the gbm dependency ... Fix an instance of `gbm_dep.found()` being used instead of `build_gbm` Signed-off-by: stefan11111 <stefan11111github@gmail.com>	2026-08-03 13:26:03 +02:00
Enrico Weigelt, metux IT consult	b7e34ad985	dix: add new lookup functions for input devices via config_string ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-31 16:06:26 +02:00
Enrico Weigelt, metux IT consult	e82d96875b	include: optionstr.h: drop unnecessary include of "list.h" ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-31 15:36:08 +02:00
Enrico Weigelt, metux IT consult	e9b532fd12	compiler.h: replace legacy __inline__/__inline with standard C99 inline ... __inline__ and __inline are GCC legacy keywords. The X server already requires C99 (inline is a standard keyword). Every supported compiler (GCC, Clang) defines __GNUC__ which guarantees built-in support for inline, so the fallback blocks in compiler.h are redundant. Replace all uses of static __inline__ with static inline in: - include/compiler.h (80+ occurrences in arch port I/O/MMIO) - hw/xfree86/int10/generic.c - hw/xfree86/x86emu/sys.c - hw/xquartz/xpr/x-hash.h Remove the #ifndef __inline__ / __inline fallback blocks entirely. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-29 17:29:01 +02:00
Enrico Weigelt, metux IT consult	b40d0ec6fd	license: add X11 OR MIT OR AGPL-3.0-or-later to Enrico Weigelt's source files ... Update SPDX-License-Identifier from MIT OR X11 (or MIT OR X11 OR AGPLv3+ variants) to the canonical X11 OR MIT OR AGPL-3.0-or-later on 95 existing source files. Add the triple-license header to 33 newly-identified files authored by Enrico Weigelt that were missing SPDX headers entirely. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-29 10:02:59 +02:00
Tautvis	9b74a3a7f9	Xext/glx: exports symbols to make extension shared ... In a987fc7c36 commit glx library is statically linked which makes all glx library variables dublicated in glx.so and glamoregl.so files and leads 'split-brain' problem where same symbols exist in different depending on context (this evident when it called using functions with static attribute). This patch exports neccesary glx symbols for glamor library. Signed-off-by: Tautvis <gtautvis@gmail.com>	2026-07-28 12:31:45 +02:00
Enrico Weigelt, metux IT consult	64fe9bc3b7	drop ifdef's on RANDR_12_INTERFACE ... It's always defined by aeons, so no need for the extra ifdef's. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-27 19:34:52 +02:00
Enrico Weigelt, metux IT consult	4ebdb499dd	Xext: remove the XF86-BigFont extension ... XF86-BigFont lets local clients share font-metrics arrays via SysV shared memory (and compresses them for remote clients) -- a local-only optimization dating back to ancient XFree86. It hasn't been built by default for really long time. Enabling it in our CI immediately exposed that the code has bit-rotted on 7 non-Linux CI lanes (macOS/BSD: including a nonexistent Linux-only header; Solaris: an ARRAY_SIZE redefinition pulled in via its system headers; mingw32: implicit geteuid()/getegid() plus an unused variable). Concrete evidence that this extension currently has no real users exercising it, since none of that breakage was ever noticed. Therefore no practical need for carrying it around any longer. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-27 18:31:44 +02:00
Enrico Weigelt, metux IT consult	9b7d25945f	os: drop xstrcasestr() ... Windows is the only platform not providing strcasestr, and it's only user is the xfree86 DDX, which only runs on Unix. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 14:35:08 +02:00
Enrico Weigelt, metux IT consult	6b1a33e91e	Revert "include: move CONFIG_BSD_CONSOLE into xlibre-xserver.h" ... This reverts commit cbbac38918. It was a dead end: the symbol already *has* been in xlibre-xserver.h, but that change moved it into the private xorg-config.h. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 10:45:23 +02:00
Enrico Weigelt, metux IT consult	cbbac38918	include: move CONFIG_BSD_CONSOLE into xlibre-xserver.h ... the classic keyboard driver needs it defined on BSD systems. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-13 12:49:52 +02:00
Enrico Weigelt, metux IT consult	4016148b81	os: gate SVR4-only socket headers on HAVE_SYS_*_H, not SVR4 ... <sys/filio.h>, <sys/sockio.h> and <sys/stropts.h> were included under the grab-bag SVR4 / __SVR4 OS macro. Whether these headers exist is a per-header question, so probe them directly: - conf_data gains HAVE_SYS_FILIO_H / HAVE_SYS_SOCKIO_H / HAVE_SYS_STROPTS_H via cc.has_header (alongside the other HAVE_SYS_*_H checks), - os/Xtranssock.c gates <sys/filio.h> on HAVE_SYS_FILIO_H, - os/access.c gates <sys/sockio.h> on HAVE_SYS_SOCKIO_H and <sys/stropts.h> on HAVE_SYS_STROPTS_H (split into independent guards since they are now independent probes). <sys/stropts.h> is SVR4/Solaris-only, so its check is exactly equivalent to the old SVR4 guard. <sys/filio.h> and <sys/sockio.h> also exist on the BSDs, so they are now correctly included there too (they provide the FIO*/SIOC* ioctls and are idempotent — the BSD <sys/ioctl.h> already pulls them in), which is the intended "include it where it exists" behaviour rather than "only on SVR4". Verified: Linux -Dwerror=true build gets all three as #undef (none of the headers exist there, identical to SVR4 being undefined) and links Xvfb and Xnest cleanly. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-07 13:29:44 +02:00
Enrico Weigelt, metux IT consult	6efb6f85de	xf86: drop dead #define termio termios ... The SysV `struct termio` type is used nowhere in the tree — the only `termio` occurrence is the unrelated `#include <termio.h>` in the SVR4/Sun block — so this BSD-only alias mapping `termio` to `termios` under `#ifdef CSRG_BASED` is dead code and can be removed. The rest of the `#ifdef CSRG_BASED` block is left intact: it is a legitimate structural BSD-header block, to be dealt with in a later xf86_OSlib.h restructure. The CSRG_BASED block isn't compiled on Linux; a `-Dwerror=true` Linux build links Xvfb and Xnest cleanly, confirming no accidental damage. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-02 13:23:11 +02:00
Enrico Weigelt, metux IT consult	b9d651f800	os: gate <sys/param.h> on HAVE_SYS_PARAM_H, not CSRG_BASED ... Whether <sys/param.h> is available is a header question, not an OS-family question. Both os/connection.c and os/access.c included it under `#ifdef CSRG_BASED` (i.e. "is this a BSD-derived system or Darwin?") — a grab-bag OS macro standing in for the concrete fact that actually matters. Replace it with a proper feature check. Add HAVE_SYS_PARAM_H via cc.has_header('sys/param.h') to conf_data (alongside the other HAVE_SYS_*_H probes) and switch both includes to it. This is behaviour-preserving: - On the BSD/Darwin systems where CSRG_BASED was set, sys/param.h exists, so the header is still included. - In os/access.c the inner `#if (BSD >= 199103)` guard is unchanged: BSD is only defined by sys/param.h itself (on real BSD), so on other platforms it stays undefined and VARIABLE_IFREQ is not defined — exactly as before. - On platforms that always have sys/param.h (e.g. glibc/Linux) the header is now also included, which is harmless. Verified: Linux build with -Dwerror=true configures and links Xvfb and Xnest cleanly (no MIN/MAX or other redefinition from the widened include). First step of replacing the tree's grab-bag OS-family #ifdefs (CSRG_BASED, SVR4, ...) with concrete, meson-detectable feature flags. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-02 11:42:50 +02:00
Enrico Weigelt, metux IT consult	7103c74da1	xf86: gate consType on CONFIG_BSD_CONSOLE, not CSRG_BASED ... The xf86Info.consType field and the BSD console-driver-type constants (PCCONS/SYSCONS/PCVT/WSCONS/...) are the BSD console machinery consumed by hw/xfree86/os-support/bsd/console_*.c and bsd_VTsw.c. They were gated on the opaque grab-bag macro CSRG_BASED ("Computer Systems Research Group", i.e. BSD-derived) OR'd with __FreeBSD_kernel__. Introduce a self-documenting meson flag CONFIG_BSD_CONSOLE (following the existing CONFIG_WSCONS/CONFIG_UDEV/... convention) set to exactly `csrg_based or host_machine.system() == 'kfreebsd'` — i.e. the same set of platforms the old `CSRG_BASED || __FreeBSD_kernel__` guard matched — and use it at all three sites (struct field, constants, initializer). Behaviour / ABI: - The flag is true on precisely the same platforms as before, so the xf86InfoRec layout is unchanged everywhere. On Linux (and every non-BSD target) CONFIG_BSD_CONSOLE is undefined just as CSRG_BASED was, so consType stays absent and the struct offsets — hence the driver ABI, incl. the nvidia blob — are untouched. - Fixes a latent inconsistency on GNU/kFreeBSD: the struct field was present there (via __FreeBSD_kernel__) but xf86Globals.c initialised .consType only under #ifdef CSRG_BASED, so it defaulted to 0 instead of -1. Both are now driven by the single CONFIG_BSD_CONSOLE flag, so field presence and initialiser always agree. Verified: Linux -Dwerror=true build configures (dix-config.h gets `#undef CONFIG_BSD_CONSOLE`) and links Xorg cleanly. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-02 11:42:00 +02:00