xserver: Branch 'master'

[GitLab Mirror]

 Xext/xvdix.h                 |    9 +++++++++
 Xext/xvdix_priv.h            |    9 ---------
 hw/xfree86/common/xf86xvmc.c |   10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 8539f35818f5a62d4293712a2b94d2fa472cd1cb
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Sep 6 21:32:47 2024 +0200

    Revert "xv: unexport XvScreenRec and XvScreenPtr"
    
    This reverts commit 58a2fb8b6fe8d1d9cd5f42911abbf23f8a22c060.
    
    Needed by xf86-video-intel driver. Didn't get noticed, because we don't
    have this driver in our CI yet.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1772>

diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index e2646bbfb..0ead1c80a 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -169,6 +169,15 @@ typedef struct _XvPortRec {
     DevUnion devPriv;
 } XvPortRec, *XvPortPtr;
 
+typedef struct {
+    int version, revision;
+    int nAdaptors;
+    XvAdaptorPtr pAdaptors;
+    DestroyWindowProcPtr DestroyWindow;
+    DestroyPixmapProcPtr DestroyPixmap;
+    CloseScreenProcPtr CloseScreen;
+} XvScreenRec, *XvScreenPtr;
+
 extern _X_EXPORT int XvScreenInit(ScreenPtr);
 extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
 extern _X_EXPORT unsigned long XvGetRTPort(void);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 5bd08e334..d1ddb68f2 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -22,15 +22,6 @@
 
 #define _XvBadPort (XvBadPort+XvErrorBase)
 
-typedef struct {
-    int version, revision;
-    int nAdaptors;
-    XvAdaptorPtr pAdaptors;
-    DestroyWindowProcPtr DestroyWindow;
-    DestroyPixmapProcPtr DestroyPixmap;
-    CloseScreenProcPtr CloseScreen;
-} XvScreenRec, *XvScreenPtr;
-
 typedef struct _XvPortNotifyRec {
     struct _XvPortNotifyRec *next;
     ClientPtr client;
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index 747085dbe..c67418bf4 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -25,21 +25,21 @@
  * the sale, use or other dealings in this Software without prior written
  * authorization from the copyright holder(s) and author(s).
  */
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
 
-#include <X11/X.h>
-#include <X11/Xproto.h>
-
-#include "Xext/xvdix_priv.h"
-
 #include "misc.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "scrnintstr.h"
 #include "resource.h"
 #include "dixstruct.h"
+
 #include "xf86xvpriv.h"
 #include "xf86xvmc.h"