2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-12-30 06:30:06 -07:00

intel-vaapi-driver: make call to wl_drm optional

per #200
This commit is contained in:
Owen Rafferty 2024-12-08 16:44:43 -06:00
parent 35dddd70ea
commit 0fe8bb9c5c
No known key found for this signature in database
4 changed files with 37 additions and 0 deletions

View File

@ -1,5 +1,7 @@
#!/bin/sh -e
patch -p1 < wl_drm-optional.patch
export DESTDIR="$1"
meson setup \

View File

@ -1 +1,2 @@
0cae7a2d39fe72ec01461d49133e2660d34fe43aaba904b679b1f12664d07a852b
66dbb0a67dede66d0ce91c5456b05ca7655031c43a86ed70c504268462ed2ef300

View File

@ -0,0 +1,33 @@
diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c
index a6120b7b2..a002cae5b 100644
--- a/src/i965_output_wayland.c
+++ b/src/i965_output_wayland.c
@@ -154,7 +154,7 @@ registry_handle_global(
struct va_wl_output * const wl_output = i965->wl_output;
struct wl_vtable * const wl_vtable = &wl_output->vtable;
- if (strcmp(interface, "wl_drm") == 0) {
+ if (strcmp(interface, "wl_drm") == 0 && wl_vtable->drm_interface) {
wl_output->wl_drm_name = name;
wl_output->wl_drm = registry_bind(wl_vtable, wl_output->wl_registry,
name, wl_vtable->drm_interface,
@@ -472,6 +472,7 @@ i965_output_wayland_init(VADriverContextP ctx)
wl_vtable = &i965->wl_output->vtable;
+ /* drm_interface is optional */
if (vtable->wl_interface)
wl_vtable->drm_interface = vtable->wl_interface;
else {
@@ -483,9 +484,8 @@ i965_output_wayland_init(VADriverContextP ctx)
}
dso_handle = i965->wl_output->libegl_handle;
- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
- libegl_symbols))
- goto error;
+ dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
+ libegl_symbols);
}
i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME);

View File

@ -1 +1,2 @@
https://github.com/intel/intel-vaapi-driver/archive/2.4.1.tar.gz
patches/wl_drm-optional.patch