xserver: Branch 'master'

[GitLab Mirror]

 dbe/meson.build       |    8 --------
 hw/xfree86/sdksyms.sh |    6 ------
 2 files changed, 14 deletions(-)

New commits:
commit 75cf29fe6c4728393ee0158360aaee512f2232d8
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 18 17:48:26 2024 +0100

    dbe: unexport dbestruct.h
    
    This include isn't used by any (known) driver nor included by any other
    public header, so no need to keep it in the public module API.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1422>

diff --git a/dbe/meson.build b/dbe/meson.build
index 2aa595aa3..e10bde199 100644
--- a/dbe/meson.build
+++ b/dbe/meson.build
@@ -3,16 +3,8 @@ srcs_dbe = [
 	'midbe.c',
 ]
 
-hdrs_dbe = [
-	'dbestruct.h',
-]
-
 libxserver_dbe = static_library('libxserver_dbe',
 	srcs_dbe,
 	include_directories: inc,
 	dependencies: common_dep,
 )
-
-if build_xorg
-    install_data(hdrs_dbe, install_dir: xorgsdkdir)
-endif
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 0ae78e92d..c3ed36401 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -208,12 +208,6 @@ cat > sdksyms.c << EOF
 #include "rrtransform.h"
 
 
-/* dbe/Makefile.am -- module */
-#ifdef DBE
-#include "dbestruct.h"
-#endif
-
-
 /* exa/Makefile.am -- module */
 /*
 #include "exa.h"