xserver: Branch 'master'

[GitLab Mirror]

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

New commits:
commit bfd15d6e5a8f1e416708dd81d9ba6831edcbe43d
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jun 22 09:17:25 2025 -0700

    Revert "xvmc: move over protocol version defines into xvmc.c"
    
    This reverts commit a33639f975e60a7d9bb00ec77837c4b6aa36f3d5
    
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2034>

diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 282c304d5..277da1d0e 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -20,6 +20,7 @@
 #include <X11/extensions/Xvproto.h>
 #include <X11/extensions/XvMCproto.h>
 #include "xvmcext.h"
+#include "protocol-versions.h"
 
 #ifdef HAS_XVMCSHM
 #include <sys/ipc.h>
@@ -27,9 +28,6 @@
 #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 7c52473cc..677b02ab7 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -157,4 +157,8 @@
 #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