From 29f601863e0fd35c9d773440ef5b40111849d9eb Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 28 Jun 2024 23:19:34 +0200
Subject: [PATCH] (submit/miext-extinit) Xext: xv: move noXvExtension into
 extension

Those flags are better off in the corresponding extension instead
of the OS layer.

Still needs to remain exported, at least for the Intel driver.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/xvmain.c     | 2 ++
 include/extinit.h | 1 +
 os/utils.c        | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 937f2893b..581fb0147 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -106,6 +106,8 @@ SOFTWARE.
 #endif
 #include "xvdisp.h"
 
+Bool noXvExtension = FALSE;
+
 static DevPrivateKeyRec XvScreenKeyRec;
 
 #define XvScreenKey (&XvScreenKeyRec)
diff --git a/include/extinit.h b/include/extinit.h
index 8f29a430b..3df0fef85 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -62,6 +62,7 @@ extern _X_EXPORT Bool noCompositeExtension;
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
 
+/* required by: intel_drv */
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;
 #endif
diff --git a/os/utils.c b/os/utils.c
index cc6d0a7a0..d0fa27224 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -132,9 +132,6 @@ Bool noXFree86DRIExtension = FALSE;
 #ifdef XF86VIDMODE
 Bool noXFree86VidModeExtension = FALSE;
 #endif
-#ifdef XV
-Bool noXvExtension = FALSE;
-#endif
 #ifdef DRI2
 Bool noDRI2Extension = FALSE;
 #endif