xserver: Branch 'master'

[GitLab Mirror]

 Xext/xvmc.c                 |    4 +++-
 include/protocol-versions.h |    4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a33639f975e60a7d9bb00ec77837c4b6aa36f3d5
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Sep 13 14:41:39 2024 +0200

    xvmc: move over protocol version defines into xvmc.c
    
    These are exclusively used in one source file, so no need to keep them
    in a global header.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1693>

diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 277da1d0e..282c304d5 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -20,7 +20,6 @@
 #include <X11/extensions/Xvproto.h>
 #include <X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
-#include "protocol-versions.h"
 
 #ifdef HAS_XVMCSHM
 #include <sys/ipc.h>
@@ -28,6 +27,9 @@
 #include <sys/shm.h>
 #endif                          /* HAS_XVMCSHM */
 
+#define SERVER_XVMC_MAJOR_VERSION               1
+#define SERVER_XVMC_MINOR_VERSION               1
+
 #define DR_CLIENT_DRIVER_NAME_SIZE 48
 #define DR_BUSID_SIZE 48
 
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index 677b02ab7..7c52473cc 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -157,8 +157,4 @@
 #define SERVER_XRES_MAJOR_VERSION		1
 #define SERVER_XRES_MINOR_VERSION		2
 
-/* XvMC */
-#define SERVER_XVMC_MAJOR_VERSION		1
-#define SERVER_XVMC_MINOR_VERSION		1
-
 #endif