From 07eb5c713d7e4ef845f74fdcf69e3eb85ebc6189 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 14 Oct 2024 20:27:33 +0200
Subject: [PATCH] 1

---
 hw/meson.build                |  4 ++++
 hw/xfree86/common/meson.build | 26 +-------------------------
 hw/xfree86/sdk/meson.build    | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 25 deletions(-)
 create mode 100644 hw/xfree86/sdk/meson.build

diff --git a/hw/meson.build b/hw/meson.build
index 0f43ab6e2..572780b9b 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -14,6 +14,10 @@ if build_xorg
     subdir('xfree86')
 endif
 
+if build_xorg_sdk
+    subdir('xfree86/sdk')
+endif
+
 if build_xquartz
     subdir('xquartz')
 endif
diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index 7dc19c6f9..f67a0514b 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -24,27 +24,7 @@ srcs_xorg_common = [
     'xf86Extensions.c',
 ]
 
-xorg_sdk_headers = [
-    'compiler.h',
-    'xf86.h',
-    'xf86Module.h',
-    'xf86Opt.h',
-    'xf86PciInfo.h',
-    'xf86Priv.h',
-    'xf86Privstr.h',
-    'xf86cmap.h',
-    'xf86fbman.h',
-    'xf86str.h',
-    'xf86Xinput.h',
-    'xisb.h',
-    'xorgVersion.h',
-    'xf86sbusBus.h',
-    'xf86VGAarbiter.h',
-    'xf86Optionstr.h',
-    'xf86platformBus.h',
-    'xf86MatchDrivers.h',
-    'xaarop.h',
-]
+# xorg_sdk_headers is not in ../sdk
 
 fallback_driver = get_option('fallback_input_driver')
 if fallback_driver == 'auto'
@@ -57,12 +37,10 @@ endif
 
 if build_dga
     srcs_xorg_common += 'xf86DGA.c'
-    xorg_sdk_headers += 'dgaproc.h'
 endif
 
 if build_xv
     srcs_xorg_common += ['xf86xv.c', 'xf86xvmc.c']
-    xorg_sdk_headers += ['xf86xv.h', 'xf86xvmc.h', 'xf86xvpriv.h']
 endif
 
 if build_udev
@@ -99,5 +77,3 @@ xorg_common = static_library('xorg_common',
         '-DFALLBACK_INPUT_DRIVER="@0@"'.format(fallback_driver)
     ],
 )
-
-install_data(xorg_sdk_headers, install_dir: xorgsdkdir)
diff --git a/hw/xfree86/sdk/meson.build b/hw/xfree86/sdk/meson.build
new file mode 100644
index 000000000..eeb2b9fc0
--- /dev/null
+++ b/hw/xfree86/sdk/meson.build
@@ -0,0 +1,34 @@
+
+xorg_sdk_headers = [
+    '../common/compiler.h',
+    '../common/xf86.h',
+    '../common/xf86Module.h',
+    '../common/xf86Opt.h',
+    '../common/xf86PciInfo.h',
+    '../common/xf86Priv.h',
+    '../common/xf86Privstr.h',
+    '../common/xf86cmap.h',
+    '../common/xf86fbman.h',
+    '../common/xf86str.h',
+    '../common/xf86Xinput.h',
+    '../common/xisb.h',
+    '../common/xorgVersion.h',
+    '../common/xf86sbusBus.h',
+    '../common/xf86VGAarbiter.h',
+    '../common/xf86Optionstr.h',
+    '../common/xf86platformBus.h',
+    '../common/xf86MatchDrivers.h',
+    '../common/xaarop.h',
+]
+
+if build_dga
+    xorg_sdk_headers += '../common/dgaproc.h'
+endif
+
+if build_xv
+    xorg_sdk_headers += ['../common/xf86xv.h', '../common/xf86xvmc.h', '../common/xf86xvpriv.h']
+endif
+
+if build_xorg_sdk
+    install_data(xorg_sdk_headers, install_dir: xorgsdkdir)
+endif