eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x11vulkan: Use the correct SONAME of libX11-xcb.so.1 on Linux, etc.

Browse source 
On most Unix platforms supported by SDL, the canonical name used to load
a library at runtime includes its ABI major version, and the name
without a version is not guaranteed to exist on non-developer systems.
libX11-xcb.so.1 is correct on Linux, and probably on other Unix
platforms like FreeBSD.

A notable exception is OpenBSD, which apparently does not use
ABI-suffixed names, so continue to use libX11-xcb.so there.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2024-09-09 19:56:25 +01:00 • committed by Sam Lantinga
parent 412a8244b6
commit 7713a7eec7
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/SDL3/SDL_hints.h
View file

@ -3979,7 +3979,7 @@ extern "C" {
/** /**
* Specify the XCB library to load for the X11 driver. * Specify the XCB library to load for the X11 driver.
* *
* This defaults to "libX11-xcb.so" * The default is platform-specific, often "libX11-xcb.so.1".
* *
* This hint should be set before initializing the video subsystem. * This hint should be set before initializing the video subsystem.
* *

4
src/video/x11/SDL_x11vulkan.c
View file

@ -33,8 +33,10 @@
#ifdef SDL_PLATFORM_OPENBSD #ifdef SDL_PLATFORM_OPENBSD
#define DEFAULT_VULKAN "libvulkan.so" #define DEFAULT_VULKAN "libvulkan.so"
#define DEFAULT_X11_XCB "libX11-xcb.so"
#else #else
#define DEFAULT_VULKAN "libvulkan.so.1" #define DEFAULT_VULKAN "libvulkan.so.1"
#define DEFAULT_X11_XCB "libX11-xcb.so.1"
#endif #endif
/* /*
@ -109,7 +111,7 @@ bool X11_Vulkan_LoadLibrary(SDL_VideoDevice *_this, const char *path)
} else { } else {
const char *libX11XCBLibraryName = SDL_GetHint(SDL_HINT_X11_XCB_LIBRARY); const char *libX11XCBLibraryName = SDL_GetHint(SDL_HINT_X11_XCB_LIBRARY);
if (!libX11XCBLibraryName || !*libX11XCBLibraryName) { if (!libX11XCBLibraryName || !*libX11XCBLibraryName) {
libX11XCBLibraryName = "libX11-xcb.so"; libX11XCBLibraryName = DEFAULT_X11_XCB;
} }
videoData->vulkan_xlib_xcb_library = SDL_LoadObject(libX11XCBLibraryName); videoData->vulkan_xlib_xcb_library = SDL_LoadObject(libX11XCBLibraryName);
if (!videoData->vulkan_xlib_xcb_library) { if (!videoData->vulkan_xlib_xcb_library) {