diff options
author | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2019-03-19 20:11:10 (GMT) |
commit | 73cfb83a5baecfe0529fda59ca57233d8843f783 (patch) | |
tree | 2dba2103a6f6e43912fc645ca8b48a85ab500ad2 /abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch | |
parent | 7b41a9288f5d1332c8136df798bb8ca2465bc21c (diff) | |
parent | 448cb8d0708224d78c24ce3615dc7eef44d4689b (diff) | |
download | linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.zip linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.gz linhes_pkgbuild-73cfb83a5baecfe0529fda59ca57233d8843f783.tar.bz2 |
Merge branch 'testing'
Diffstat (limited to 'abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch')
-rw-r--r-- | abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch b/abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch deleted file mode 100644 index 4041e6c..0000000 --- a/abs/extra/libva/not-finding-wl-drm-interface-with-libglvnd.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b832b37c6a6f7ff69a4ea4656007827a1b7e67e8 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 15 Feb 2017 15:18:44 +0100 -Subject: [PATCH] Wayland-drm: Fix not finding wl_drm_interface on systems with - libglvnd - -We do not want just any libEGL.so.1 we want mesa's libEGL.so.1 as that -is the only way which defines the wl_drm_interface symbol we need, -one systems with libglvnd libEGL.so.1 is a dispatcher library provided -by libglvnd and the actual mesa libEGL we want is named libEGL_mesa.so.0 -so try that first. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - va/wayland/va_wayland_drm.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/va/wayland/va_wayland_drm.c b/va/wayland/va_wayland_drm.c -index 958ea85..2ff19f5 100644 ---- a/va/wayland/va_wayland_drm.c -+++ b/va/wayland/va_wayland_drm.c -@@ -38,7 +38,10 @@ - #include "wayland-drm-client-protocol.h" - - /* XXX: Wayland/DRM support currently lives in Mesa libEGL.so.* library */ --#define LIBWAYLAND_DRM_NAME "libEGL.so.1" -+/* First try the soname of a glvnd enabled mesa build */ -+#define LIBWAYLAND_DRM_NAME "libEGL_mesa.so.0" -+/* Then fallback to plain libEGL.so.1 (which might not be mesa) */ -+#define LIBWAYLAND_DRM_NAME_FALLBACK "libEGL.so.1" - - typedef struct va_wayland_drm_context { - struct va_wayland_context base; -@@ -207,8 +210,11 @@ va_wayland_drm_create(VADisplayContextP pDisplayContext) - vtable->has_prime_sharing = 0; - - wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL); -- if (!wl_drm_ctx->handle) -- return false; -+ if (!wl_drm_ctx->handle) { -+ wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME_FALLBACK, RTLD_LAZY|RTLD_LOCAL); -+ if (!wl_drm_ctx->handle) -+ return false; -+ } - - wl_drm_ctx->drm_interface = - dlsym(wl_drm_ctx->handle, "wl_drm_interface"); - |