From fefa6aa899d05911e2de39c672f9d9c37ddd04e2 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 3 Jul 2025 07:17:42 -0700 Subject: [PATCH] dri2: Finish removing the now-unused dep_xcb_dri2. Part-of: --- meson.build | 2 -- src/egl/meson.build | 2 +- src/gallium/frontends/va/meson.build | 2 +- src/gallium/frontends/vdpau/meson.build | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 4fa27e1b26b..d187e18968e 100644 --- a/meson.build +++ b/meson.build @@ -2022,7 +2022,6 @@ dep_x11_xcb = null_dep dep_xcb = null_dep dep_xcb_keysyms = null_dep dep_xcb_glx = null_dep -dep_xcb_dri2 = null_dep dep_xcb_dri3 = null_dep dep_glproto = null_dep dep_xxf86vm = null_dep @@ -2035,7 +2034,6 @@ dep_xcb_shm = null_dep dep_xlib_xrandr = null_dep dep_glproto_version = '>= 1.4.14' -dep_xcb_dri2_version = '>= 1.8' dep_xcb_dri3_version = '>= 1.13' dep_xcb_glx_version = '>= 1.8.1' dep_xcb_present_version = '>= 1.13' diff --git a/src/egl/meson.build b/src/egl/meson.build index da1d360683e..b49c5ece3a0 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -104,7 +104,7 @@ if with_dri files_egl += files('drivers/dri2/platform_x11_dri3.c') link_for_egl += [libloader_x11] endif - deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xrandr, dep_xcb_xfixes, dep_xcb_shm] + deps_for_egl += [dep_x11_xcb, dep_xcb_xrandr, dep_xcb_xfixes, dep_xcb_shm] endif if with_gbm and not with_platform_android files_egl += files('drivers/dri2/platform_drm.c') diff --git a/src/gallium/frontends/va/meson.build b/src/gallium/frontends/va/meson.build index ff5e7995575..c190bac2517 100644 --- a/src/gallium/frontends/va/meson.build +++ b/src/gallium/frontends/va/meson.build @@ -20,7 +20,7 @@ libva_st = static_library( gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : [ - dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, + dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri3, dep_libdrm, idep_mesautil, ], ) diff --git a/src/gallium/frontends/vdpau/meson.build b/src/gallium/frontends/vdpau/meson.build index 0ef39dfc55b..ca334a8ca43 100644 --- a/src/gallium/frontends/vdpau/meson.build +++ b/src/gallium/frontends/vdpau/meson.build @@ -18,5 +18,5 @@ libvdpau_st = static_library( include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux, ], - dependencies : [dep_vdpau, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm, idep_mesautil], + dependencies : [dep_vdpau, dep_xcb, dep_x11_xcb, dep_libdrm, idep_mesautil], )