xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 hw/xfree86/common/meson.build        |    1 -
 hw/xfree86/common/xf86MatchDrivers.h |    2 ++
 hw/xfree86/common/xf86platformBus.h  |    5 -----
 3 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit cd52a8f8a44285c0144d595164c7294c1dc49157
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Feb 9 18:37:17 2024 +0100

    xfree86: common: dont install xf86MatchDrivers.h
    
    xf86MatchDrivers.h doesn't export any symbols, thus doesn't need to
    be installed.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1738>

diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index 7dc19c6f9..5cdb832e8 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -42,7 +42,6 @@ xorg_sdk_headers = [
     'xf86VGAarbiter.h',
     'xf86Optionstr.h',
     'xf86platformBus.h',
-    'xf86MatchDrivers.h',
     'xaarop.h',
 ]
 
commit 0b123a0413b9b8419ee946e7beae45bf6b0e128a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Oct 31 17:21:24 2024 +0100

    xfree86: unexport xf86PlatformMatchDriver()
    
    Not used by any drivers, so no need to keep it exported.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1738>

diff --git a/hw/xfree86/common/xf86MatchDrivers.h b/hw/xfree86/common/xf86MatchDrivers.h
index 4663af478..484863814 100644
--- a/hw/xfree86/common/xf86MatchDrivers.h
+++ b/hw/xfree86/common/xf86MatchDrivers.h
@@ -36,5 +36,7 @@ typedef struct _XF86MatchedDrivers {
  */
 void xf86AddMatchedDriver(XF86MatchedDrivers *, const char *);
 
+void xf86PlatformMatchDriver(XF86MatchedDrivers *);
+
 #endif                          /* _xf86_match_drivers_h */
 
diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h
index b9933f405..7d4852ee8 100644
--- a/hw/xfree86/common/xf86platformBus.h
+++ b/hw/xfree86/common/xf86platformBus.h
@@ -24,8 +24,6 @@
 #ifndef XF86_PLATFORM_BUS_H
 #define XF86_PLATFORM_BUS_H
 
-#include "xf86MatchDrivers.h"
-
 struct xf86_platform_device {
     struct OdevAttributes *attribs;
     /* for PCI devices */
@@ -128,9 +126,6 @@ _xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int at
 extern _X_EXPORT Bool
 xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid);
 
-extern _X_EXPORT void
-xf86PlatformMatchDriver(XF86MatchedDrivers *);
-
 extern void xf86platformVTProbe(void);
 extern void xf86platformPrimary(void);