xserver: Branch 'master'

[GitLab Mirror]

 include/meson.build |    6 ++++++
 include/registry.h  |    8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 834acc88fb65958b3a7a85dd566fa33b91a36e6c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Jan 25 18:33:06 2024 +0100

    factor out X_REGISTRY_RESOURCE and X_REGISTRY_REQUEST to meson.build
    
    there are several feautures depending on LookupResourceName() et al,
    so set these symbole inside meson.build, instead of #define'ing them
    conditionally in registry.h
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1262>

diff --git a/include/meson.build b/include/meson.build
index 8d0194fcb..6ec1a96f8 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -242,6 +242,12 @@ conf_data.set('XV', build_xv ? '1' : false)
 conf_data.set('XvExtension', build_xv ? '1' : false)
 conf_data.set('XvMCExtension', build_xvmc ? '1' : false)
 
+# needed by several extensions
+build_registry_resource = (build_xselinux or build_res)
+conf_data.set('X_REGISTRY_RESOURCE', build_registry_resource ? '1' : false)
+build_registry_request = (build_xselinux or build_xsecurity or with_dtrace)
+conf_data.set('X_REGISTRY_REQUEST', build_registry_request ? '1' : false)
+
 conf_data.set('HAVE_SHA1_IN_' + sha1.to_upper(), '1', description: 'Use @0@ SHA1 functions'.format(sha1))
 conf_data.set('HAVE_LIBUNWIND', get_option('libunwind'))
 
diff --git a/include/registry.h b/include/registry.h
index f50fa7622..867a55d3f 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -20,14 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "resource.h"
 #include "extnsionst.h"
 
-#if defined(XSELINUX) || defined(RES)
-#define X_REGISTRY_RESOURCE       1
-#endif
-
-#if defined(XSELINUX) || defined(XCSECURITY) || defined(XSERVER_DTRACE)
-#define X_REGISTRY_REQUEST        1
-#endif
-
 /* Internal string registry - for auditing, debugging, security, etc. */
 
 #ifdef X_REGISTRY_RESOURCE