From 8e32cec2048165f9d56d323d7c12ee6547d99b6e Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 30 Apr 2024 13:25:27 +0200
Subject: [PATCH] xv: move noXvExtension to xvmain.c

It's more appropriate having those kind of flags in the corresponding
extension.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
---
 Xext/xvmain.c | 2 ++
 os/utils.c    | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 937f2893b..5cc3a6487 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -108,6 +108,8 @@ SOFTWARE.
 
 static DevPrivateKeyRec XvScreenKeyRec;
 
+Bool noXvExtension = FALSE;
+
 #define XvScreenKey (&XvScreenKeyRec)
 unsigned long XvExtensionGeneration = 0;
 unsigned long XvScreenGeneration = 0;
diff --git a/os/utils.c b/os/utils.c
index ebd3ece60..6879e334d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -173,9 +173,6 @@ Bool noXFixesExtension = FALSE;
 /* Xinerama is disabled by default unless enabled via +xinerama */
 Bool noPanoramiXExtension = TRUE;
 #endif
-#ifdef XV
-Bool noXvExtension = FALSE;
-#endif
 #ifdef DRI2
 Bool noDRI2Extension = FALSE;
 #endif