2

The per-driver jobs only need the SDK headers, so we can speed things up
and save a lot CPU time by not actually building the whole Xorg source.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

.gitlab-ci.yml

@@ -260,6 +260,8 @@ xf86-driver-build-test:
     script:
         # Install the server first
         - .gitlab-ci/meson-build.sh --skip-test --run-install
+        - find / -name "exa.h" || true
+        - find / -name "xf86Cursor.h" || true
         - unset MESON_EXTRA_ARGS
         - DRIVER=$(basename $REPO)
         - git clone "$REPO" "$DRIVER"
@@ -276,14 +278,7 @@ xf86-driver-build-test:
     variables:
         GIT_DEPTH: 1
         MESON_ARGS: -Dprefix=/usr/
-        MESON_EXTRA_ARGS: -Dxwayland=false -Dxnest=false -Dxvfb=false -Dxquartz=false -Ddocs=false
+        MESON_EXTRA_ARGS: -Dxwayland=false -Dxnest=false -Dxvfb=false -Dxquartz=false -Ddocs=false -Dxorg_sdk=true -Dxorg=false
-    rules:
-      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-        changes:
-          *dix_paths
-      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-        changes:
-          *xorg_paths
 
 #
 # Verify that commit messages are as expected

Xext/meson.build

@@ -73,6 +73,6 @@ libxserver_xext_vidmode = static_library('libxserver_xext_vidmode',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_xext, install_dir: xorgsdkdir)
 endif

composite/meson.build

@@ -16,6 +16,6 @@ libxserver_composite = static_library('libxserver_composite',
 	dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_composite, install_dir: xorgsdkdir)
 endif

dri3/meson.build

@@ -17,6 +17,6 @@ if build_dri3
         )
 endif
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_dri3, install_dir: xorgsdkdir)
 endif

exa/meson.build

@@ -19,6 +19,6 @@ libxserver_exa = static_library('libxserver_exa',
     c_args: '-DHAVE_XORG_CONFIG_H'
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data('exa.h', install_dir: xorgsdkdir)
 endif

fb/meson.build

@@ -55,6 +55,6 @@ libxserver_wfb = static_library('libxserver_wfb',
 	build_by_default: false,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_fb, install_dir: xorgsdkdir)
 endif

glamor/meson.build

@@ -50,7 +50,3 @@ glamor = static_library('glamor',
         epoxy_dep,
     ],
 )
-
-if build_xorg
-    install_data('glamor.h', install_dir: xorgsdkdir)
-endif

glx/extension_string.c

@@ -30,8 +30,8 @@
  *
  * \author Ian Romanick <idr@us.ibm.com>
  */
+#include <dix-config.h>
 
-#include "dix-config.h"
 #include "extension_string.h"
 #include "opaque.h"
 

glx/glxbyteorder.h

@@ -31,10 +31,6 @@
 #if !defined(__GLXBYTEORDER_H__)
 #define __GLXBYTEORDER_H__
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include "misc.h"
 
 #endif                          /* !defined(__GLXBYTEORDER_H__) */

glx/indirect_dispatch_swap.c

@@ -24,6 +24,7 @@
  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#include <dix-config.h>
 
 #include <inttypes.h>
 #include "glxserver.h"

glx/meson.build

@@ -79,7 +79,7 @@ if build_glx
         ],
     )
 
-    if build_xorg
+    if build_xorg_sdk
         install_data(hdrs_vnd, install_dir : xorgsdkdir)
     endif
 endif

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

hw/xfree86/common/meson.build

@@ -24,27 +24,7 @@ srcs_xorg_common = [
     'xf86Extensions.c',
 ]
 
-xorg_sdk_headers = [
+# xorg_sdk_headers is not in ../sdk
-    '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',
-]
 
 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)

hw/xfree86/os-support/meson.build

@@ -5,12 +5,6 @@ srcs_xorg_os_support = [
     'shared/vidmem.c',
 ]
 
-hdrs_xorg_os_support = [
-    'bus/xf86Pci.h',
-    'xf86_OSlib.h',
-    'xf86_OSproc.h'
-]
-
 os_dep = []
 os_c_args = []
 
@@ -164,5 +158,3 @@ xorg_os_support = static_library('xorg_os_support',
     ],
     c_args: xorg_c_args + os_c_args,
 )
-
-install_data(hdrs_xorg_os_support, install_dir: xorgsdkdir)

hw/xfree86/sdk/meson.build

@@ -0,0 +1,43 @@
+
+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',
+    '../os-support/bus/xf86Pci.h',
+    '../os-support/xf86_OSlib.h',
+    '../os-support/xf86_OSproc.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_glamor
+    xorg_sdk_headers += '../../../glamor/glamor.h'
+else
+    xorg_sdk_headers += '../../../glamor/glamor.h'
+endif
+
+if build_xorg_sdk
+    install_data(xorg_sdk_headers, install_dir: xorgsdkdir)
+endif

include/meson.build

@@ -333,7 +333,7 @@ configure_file(output : 'dix-config.h',
 configure_file(output : 'xorg-server.h',
                input : 'xorg-server.h.meson.in',
                configuration : conf_data,
-               install: build_xorg,
+               install: build_xorg_sdk,
                install_dir: xorgsdkdir)
 
 version_data = configuration_data()
@@ -438,7 +438,7 @@ if with_dtrace
     dtrace_hdr += dtrace_header.process(dtrace_tmpl)
 endif
 
-if build_xorg
+if build_xorg_sdk
     install_data(
         [
             'Xprintf.h',

meson.build

@@ -212,6 +212,11 @@ endif
 xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
 libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
 
+build_xorg_sdk = get_option('xorg_sdk') == 'true'
+if get_option('xorg_sdk') == 'auto'
+    build_xorg_sdk = build_xorg
+endif
+
 build_xwayland = false
 if (host_machine.system() != 'darwin' and
     host_machine.system() != 'windows' and
@@ -824,7 +829,7 @@ if host_machine.system() != 'windows'
     subdir('test')
 endif
 
-if build_xorg
+if build_xorg_sdk
     sdkconfig = configuration_data()
     awk = find_program('awk')
 

meson_options.txt

@@ -1,5 +1,7 @@
 option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
        description: 'Enable Xorg X Server')
+option('xorg_sdk', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+       description: 'Enable Xorg X Server SDK')
 option('xephyr', type: 'boolean', value: false,
        description: 'Enable Xephyr nested X server')
 option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',

mi/meson.build

@@ -49,6 +49,6 @@ libxserver_mi = static_library('libxserver_mi',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_mi, install_dir: xorgsdkdir)
 endif

miext/damage/meson.build

@@ -13,6 +13,6 @@ libxserver_miext_damage = static_library('libxserver_miext_damage',
 	dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_miext_damage, install_dir: xorgsdkdir)
 endif

miext/shadow/meson.build

@@ -35,6 +35,6 @@ libxserver_miext_shadow = static_library('libxserver_miext_shadow',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_miext_shadow, install_dir: xorgsdkdir)
 endif

miext/sync/meson.build

@@ -23,6 +23,6 @@ libxserver_miext_sync = static_library('libxserver_miext_sync',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_miext_sync, install_dir: xorgsdkdir)
 endif

present/meson.build

@@ -26,6 +26,6 @@ libxserver_present = static_library('libxserver_present',
     ],
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_present, install_dir: xorgsdkdir)
 endif

randr/meson.build

@@ -31,6 +31,6 @@ libxserver_randr = static_library('libxserver_randr',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_randr, install_dir: xorgsdkdir)
 endif

render/meson.build

@@ -25,6 +25,6 @@ libxserver_render = static_library('libxserver_render',
     dependencies: common_dep,
 )
 
-if build_xorg
+if build_xorg_sdk
     install_data(hdrs_render, install_dir: xorgsdkdir)
 endif