forked from brl/citadel
Bruce Leidl
4831a46764
Recipes updated: adwaita-icon-theme 43 --> 46.0 cairomm 1.12.0 --> 1.18 gdm 42.0 --> 45.0 glibmm 2.62.0 --> 2.78.0 gjs 1.77.90 --> 1.80.0 gnome-backgrounds 45.0 --> 46.0 gnome-bluetooth 42.4 --> 46.0 gnome-control-center 45.0 --> 46.0 gnome-disk-utility 42.0 --> 46.0 gnome-session 42.0 --> 46.0 gnome-settings-daemon 45.0 --> 46.0 gnome-shell 45.0 --> 46.0 gnome-system-monitor 42.0 --> 46.0 gsettings-desktop-schemas 45.0 --> 46.0 gtk4 4.12.1 --> 4.14.1 gvfs 1.50.2 --> 1.54.0 libadwaita 1.4.0 --> 1.5.0 libgtop 2.40.0 --> 2.41.3 libgweather4 4.2.0 --> 4.4.2 libwacom 0.26 --> 2.8.0 mutter 45.0 --> 46.0 pangomm 2.46.2 --> 2.50.1 New recipes added: pipewire 1.0.4 wireplumber 0.5.0 doxygen 1.9.3 gcr 4.2.0 rtkit 0.13 libopus 1.5.1 libjxl 0.10.2 wayland gtkmm4 4.14.0
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 4bd15a419e892da843489c374c58c5b29c40b5d6 Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@smile.fr>
|
|
Date: Tue, 6 Feb 2024 09:47:09 +0100
|
|
Subject: [PATCH 1/2] drisw: fix build without dri3
|
|
|
|
commit 1887368df41 ("glx/sw: check for modifier support in the kopper path")
|
|
added dri3_priv.h header and dri3_check_multibuffer() function in drisw that
|
|
can be build without dri3.
|
|
|
|
i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver':
|
|
drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer'
|
|
collect2: error: ld returned 1 exit status
|
|
|
|
Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using
|
|
dri3_check_multibuffer().
|
|
|
|
Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path")
|
|
|
|
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
|
|
Signed-off-by: Romain Naour <romain.naour@smile.fr>
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
src/glx/drisw_glx.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
|
|
index 3d3f752..4b19e2d 100644
|
|
--- a/src/glx/drisw_glx.c
|
|
+++ b/src/glx/drisw_glx.c
|
|
@@ -32,7 +32,9 @@
|
|
#include <dlfcn.h>
|
|
#include "dri_common.h"
|
|
#include "drisw_priv.h"
|
|
+#ifdef HAVE_DRI3
|
|
#include "dri3_priv.h"
|
|
+#endif
|
|
#include <X11/extensions/shmproto.h>
|
|
#include <assert.h>
|
|
#include <vulkan/vulkan_core.h>
|
|
@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
|
|
goto handle_error;
|
|
}
|
|
|
|
+#ifdef HAVE_DRI3
|
|
if (pdpyp->zink) {
|
|
bool err;
|
|
psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err);
|
|
@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
|
|
goto handle_error;
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
glx_config_destroy_list(psc->base.configs);
|
|
psc->base.configs = configs;
|
|
--
|
|
2.44.0
|
|
|