head	1.1;
branch	1.1.1;
access;
symbols
	netbsd-11-0-RC4:1.1.1.1.2.2
	xorg-server-21-1-22:1.1.1.1
	netbsd-11-0-RC3:1.1.1.1.2.2
	netbsd-11-0-RC2:1.1.1.1.2.2
	netbsd-11-0-RC1:1.1.1.1.2.2
	netbsd-10:1.1.1.1.0.4
	xorg-server-21-1-21:1.1.1.1
	netbsd-11:1.1.1.1.0.2
	xorg-server-21-1-20:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2025.11.12.07.48.01;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;
commitid	2quyYgOcr86oJeiG;

1.1.1.1
date	2025.11.12.07.48.01;	author mrg;	state Exp;
branches
	1.1.1.1.2.1
	1.1.1.1.4.1;
next	;
commitid	2quyYgOcr86oJeiG;

1.1.1.1.2.1
date	2025.11.12.07.48.01;	author martin;	state dead;
branches;
next	1.1.1.1.2.2;
commitid	a6YkGTrCzIDQckjG;

1.1.1.1.2.2
date	2025.11.20.19.03.51;	author martin;	state Exp;
branches;
next	;
commitid	a6YkGTrCzIDQckjG;

1.1.1.1.4.1
date	2025.11.12.07.48.01;	author martin;	state dead;
branches;
next	1.1.1.1.4.2;
commitid	xLUpbQiNIqPAeVmG;

1.1.1.1.4.2
date	2025.12.18.18.51.13;	author martin;	state Exp;
branches;
next	;
commitid	xLUpbQiNIqPAeVmG;


desc
@@


1.1
log
@Initial revision
@
text
@xcb_dep = dependency('xcb', required: false)
xcb_image_dep = dependency('xcb-image', required: false)
xcb_util_dep = dependency('xcb-util', required: false)

if get_option('xvfb')
    xvfb_args = [
        xvfb_server.full_path(),
        '-screen',
        'scrn',
        '1280x1024x24'
    ]

    if xcb_dep.found() and xcb_image_dep.found() and xcb_util_dep.found() and get_option('xvfb') and get_option('xephyr') and build_glamor
        bug1354 = executable('bug1354', 'bug1354.c', dependencies: [xcb_dep, xcb_image_dep, xcb_util_dep])
        test('bug1354-gl',
                simple_xinit,
                args: [simple_xinit.full_path(),
                    bug1354.full_path(),
                    '-t',':201','-r',':200',
                    '----',
                    xephyr_server.full_path(),
                    '-glamor',
                    '-schedMax', '2000',
                    ':201',
                    '--',
                    xvfb_args,
                    ':200'
                    ],
                suite: 'xephyr-glamor',
                timeout: 300,
            )
        test('bug1354-gles',
                simple_xinit,
                args: [simple_xinit.full_path(),
                    bug1354.full_path(),
                    '-t',':199','-r',':198',
                    '----',
                    xephyr_server.full_path(),
                    '-glamor_gles2',
                    '-schedMax', '2000',
                    ':199',
                    '--',
                    xvfb_args,
                    ':198'
                    ],
                suite: 'xephyr-glamor-gles2',
                timeout: 300,
            )
    endif
endif@


1.1.1.1
log
@initial import of xorg-server-21.1.20
@
text
@@


1.1.1.1.4.1
log
@file meson.build was added on branch netbsd-10 on 2025-12-18 18:51:13 +0000
@
text
@d1 50
@


1.1.1.1.4.2
log
@Pull up the following, requested by mrg in ticket #1210:

	external/mit/xorg-server/dist/test/scripts/xephyr-glamor-gles2-piglit.sh up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/bug1354.c up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/meson.build up to 1.1.1.1
	external/mit/xorg-server/dist/COPYING           up to 1.1.1.7
	external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.31
	external/mit/xorg-server/dist/Makefile.in       up to 1.1.1.19
	external/mit/xorg-server/dist/aclocal.m4        up to 1.1.1.24
	external/mit/xorg-server/dist/compile           up to 1.1.1.14
	external/mit/xorg-server/dist/configure         up to 1.24
	external/mit/xorg-server/dist/configure.ac      up to 1.26
	external/mit/xorg-server/dist/depcomp           up to 1.1.1.12
	external/mit/xorg-server/dist/install-sh        up to 1.1.1.13
	external/mit/xorg-server/dist/meson.build       up to 1.1.1.21
	external/mit/xorg-server/dist/missing           up to 1.1.1.12
	external/mit/xorg-server/dist/test-driver       up to 1.1.1.10
	external/mit/xorg-server/dist/ylwrap            up to 1.1.1.12
	external/mit/xorg-server/dist/Xext/Makefile.in  up to 1.1.1.19
	external/mit/xorg-server/dist/Xext/panoramiX.c  up to 1.4
	external/mit/xorg-server/dist/Xext/shm.c        up to 1.10
	external/mit/xorg-server/dist/Xext/sync.c       up to 1.15
	external/mit/xorg-server/dist/Xext/vidmode.c    up to 1.5
	external/mit/xorg-server/dist/Xext/xres.c       up to 1.5
	external/mit/xorg-server/dist/Xext/xselinux_ext.c up to 1.1.1.7
	external/mit/xorg-server/dist/Xext/xselinux_label.c up to 1.1.1.4
	external/mit/xorg-server/dist/Xext/xtest.c      up to 1.10
	external/mit/xorg-server/dist/Xi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/Xi/exevents.c     up to 1.1.1.15
	external/mit/xorg-server/dist/Xi/getfctl.c      up to 1.1.1.6
	external/mit/xorg-server/dist/Xi/getprop.c      up to 1.1.1.7
	external/mit/xorg-server/dist/Xi/listdev.c      up to 1.1.1.8
	external/mit/xorg-server/dist/Xi/xibarriers.c   up to 1.6
	external/mit/xorg-server/dist/composite/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/config/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/damageext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/dbe/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/dix/Makefile.in   up to 1.1.1.20
	external/mit/xorg-server/dist/dix/dixfonts.c    up to 1.7
	external/mit/xorg-server/dist/dix/enterleave.c  up to 1.12
	external/mit/xorg-server/dist/dix/gestures.c    up to 1.1.1.2
	external/mit/xorg-server/dist/dix/property.c    up to 1.1.1.10
	external/mit/xorg-server/dist/dix/swaprep.c     up to 1.1.1.7
	external/mit/xorg-server/dist/dix/touch.c       up to 1.1.1.4
	external/mit/xorg-server/dist/dix/window.c      up to 1.13
	external/mit/xorg-server/dist/doc/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/doc/dtrace/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/dri3/Makefile.in  up to 1.1.1.13
	external/mit/xorg-server/dist/exa/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/fb/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/glamor/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/glamor/glamor.c   up to 1.1.1.9
	external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_copy.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_core.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_dash.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_egl.c up to 1.1.1.7
	external/mit/xorg-server/dist/glamor/glamor_glyphblt.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_gradient.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_lines.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_points.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_priv.h up to 1.1.1.7
	external/mit/xorg-server/dist/glamor/glamor_program.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_program.h up to 1.1.1.2
	external/mit/xorg-server/dist/glamor/glamor_rects.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_render.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_segs.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_spans.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_text.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_transfer.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_xv.c up to 1.1.1.4
	external/mit/xorg-server/dist/glx/Makefile.in   up to 1.1.1.18
	external/mit/xorg-server/dist/hw/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/kdrive/src/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/common/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xfree86/common/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c up to 1.19
	external/mit/xorg-server/dist/hw/xfree86/ddc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dixmods/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/doc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri2/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest/Makefile.in up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/hw/xfree86/exa/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/exa/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/hw/xfree86/i2c/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/int10/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/loader/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/man/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/man/xorg.conf.man up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/modes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c up to 1.4
	external/mit/xorg-server/dist/hw/xfree86/os-support/hurd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/linux/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/misc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/sun_init.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/os-support/stub/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/parser/Makefile.in up to 1.1.1.21
	external/mit/xorg-server/dist/hw/xfree86/ramdac/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/shadowfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/gtf/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/vgahw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/x86emu/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/xkb/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xnest/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xnest/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xquartz/GL/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/bundle/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/mach-startup/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/pbproxy/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/xpr/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xwin/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xwin/dri/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xwin/glx/Makefile.in up to 1.1.1.16
	external/mit/xorg-server/dist/hw/xwin/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xwin/winclipboard/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/include/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/include/fourcc.h  up to 1.1.1.2
	external/mit/xorg-server/dist/include/xkbsrv.h  up to 1.1.1.7
	external/mit/xorg-server/dist/man/Makefile.in   up to 1.1.1.13
	external/mit/xorg-server/dist/mi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/miext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/damage/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/rootless/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/shadow/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/sync/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/os/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/os/log.c          up to 1.1.1.11
	external/mit/xorg-server/dist/os/xsha1.c        up to 1.1.1.4
	external/mit/xorg-server/dist/present/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/present/present_notify.c up to 1.1.1.3
	external/mit/xorg-server/dist/pseudoramiX/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/randr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/record/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/picture.h  up to 1.4
	external/mit/xorg-server/dist/test/Makefile.am  up to 1.6
	external/mit/xorg-server/dist/test/Makefile.in  up to 1.1.1.16
	external/mit/xorg-server/dist/test/meson.build  up to 1.1.1.4
	external/mit/xorg-server/dist/xfixes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/xkb.c         up to 1.12
	external/mit/xorg-server/dist/xkb/xkbEvents.c   up to 1.1.1.6
	external/mit/xorg-server/include/dix-config.h   up to 1.57
	external/mit/xorg-server/include/version-config.h up to 1.27
	external/mit/xorg-server/include/xorg-config.h  up to 1.37
	external/mit/xorg-server/include/xorg-server.h  up to 1.37

Import xorg-server 21.1.21
@
text
@a0 50
xcb_dep = dependency('xcb', required: false)
xcb_image_dep = dependency('xcb-image', required: false)
xcb_util_dep = dependency('xcb-util', required: false)

if get_option('xvfb')
    xvfb_args = [
        xvfb_server.full_path(),
        '-screen',
        'scrn',
        '1280x1024x24'
    ]

    if xcb_dep.found() and xcb_image_dep.found() and xcb_util_dep.found() and get_option('xvfb') and get_option('xephyr') and build_glamor
        bug1354 = executable('bug1354', 'bug1354.c', dependencies: [xcb_dep, xcb_image_dep, xcb_util_dep])
        test('bug1354-gl',
                simple_xinit,
                args: [simple_xinit.full_path(),
                    bug1354.full_path(),
                    '-t',':201','-r',':200',
                    '----',
                    xephyr_server.full_path(),
                    '-glamor',
                    '-schedMax', '2000',
                    ':201',
                    '--',
                    xvfb_args,
                    ':200'
                    ],
                suite: 'xephyr-glamor',
                timeout: 300,
            )
        test('bug1354-gles',
                simple_xinit,
                args: [simple_xinit.full_path(),
                    bug1354.full_path(),
                    '-t',':199','-r',':198',
                    '----',
                    xephyr_server.full_path(),
                    '-glamor_gles2',
                    '-schedMax', '2000',
                    ':199',
                    '--',
                    xvfb_args,
                    ':198'
                    ],
                suite: 'xephyr-glamor-gles2',
                timeout: 300,
            )
    endif
endif@


1.1.1.1.2.1
log
@file meson.build was added on branch netbsd-11 on 2025-11-20 19:03:50 +0000
@
text
@d1 50
@


1.1.1.1.2.2
log
@Pullup the following, requested by mrg in ticket #91:

	external/mit/xorg-server/dist/test/scripts/xephyr-glamor-gles2-piglit.sh up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/bug1354.c up to 1.1.1.1
	external/mit/xorg-server/dist/test/bugs/meson.build up to 1.1.1.1
	external/mit/xorg-server/dist/glamor/glamor_glx_provider.c up to 1.1.1.1
	external/mit/xorg-server/dist/glamor/glamor_glx_provider.h up to 1.1.1.1
	external/mit/xorg-server/dist/COPYING           up to 1.1.1.7
	external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.30
	external/mit/xorg-server/dist/Makefile.in       up to 1.1.1.19
	external/mit/xorg-server/dist/aclocal.m4        up to 1.1.1.24
	external/mit/xorg-server/dist/compile           up to 1.1.1.14
	external/mit/xorg-server/dist/configure         up to 1.23
	external/mit/xorg-server/dist/configure.ac      up to 1.25
	external/mit/xorg-server/dist/depcomp           up to 1.1.1.12
	external/mit/xorg-server/dist/install-sh        up to 1.1.1.13
	external/mit/xorg-server/dist/meson.build       up to 1.1.1.20
	external/mit/xorg-server/dist/missing           up to 1.1.1.12
	external/mit/xorg-server/dist/test-driver       up to 1.1.1.10
	external/mit/xorg-server/dist/ylwrap            up to 1.1.1.12
	external/mit/xorg-server/dist/Xext/Makefile.in  up to 1.1.1.19
	external/mit/xorg-server/dist/Xext/panoramiX.c  up to 1.4
	external/mit/xorg-server/dist/Xext/shm.c        up to 1.10
	external/mit/xorg-server/dist/Xext/sync.c       up to 1.15
	external/mit/xorg-server/dist/Xext/vidmode.c    up to 1.5
	external/mit/xorg-server/dist/Xext/xres.c       up to 1.5
	external/mit/xorg-server/dist/Xext/xselinux_ext.c up to 1.1.1.7
	external/mit/xorg-server/dist/Xext/xselinux_label.c up to 1.1.1.4
	external/mit/xorg-server/dist/Xext/xtest.c      up to 1.10
	external/mit/xorg-server/dist/Xi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/Xi/exevents.c     up to 1.1.1.15
	external/mit/xorg-server/dist/Xi/getfctl.c      up to 1.1.1.6
	external/mit/xorg-server/dist/Xi/getprop.c      up to 1.1.1.7
	external/mit/xorg-server/dist/Xi/listdev.c      up to 1.1.1.8
	external/mit/xorg-server/dist/Xi/xibarriers.c   up to 1.6
	external/mit/xorg-server/dist/composite/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/config/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/damageext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/dbe/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/dix/Makefile.in   up to 1.1.1.20
	external/mit/xorg-server/dist/dix/dixfonts.c    up to 1.7
	external/mit/xorg-server/dist/dix/enterleave.c  up to 1.12
	external/mit/xorg-server/dist/dix/gestures.c    up to 1.1.1.2
	external/mit/xorg-server/dist/dix/property.c    up to 1.1.1.10
	external/mit/xorg-server/dist/dix/swaprep.c     up to 1.1.1.7
	external/mit/xorg-server/dist/dix/touch.c       up to 1.1.1.4
	external/mit/xorg-server/dist/dix/window.c      up to 1.13
	external/mit/xorg-server/dist/doc/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/doc/dtrace/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/dri3/Makefile.in  up to 1.1.1.13
	external/mit/xorg-server/dist/exa/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/fb/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/glamor/Makefile.am up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/glamor/glamor.c   up to 1.1.1.8
	external/mit/xorg-server/dist/glamor/glamor.h   up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_copy.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_core.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_dash.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_egl.c up to 1.1.1.6
	external/mit/xorg-server/dist/glamor/glamor_glyphblt.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_gradient.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_lines.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_points.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_priv.h up to 1.1.1.6
	external/mit/xorg-server/dist/glamor/glamor_program.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_program.h up to 1.1.1.2
	external/mit/xorg-server/dist/glamor/glamor_rects.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_render.c up to 1.1.1.5
	external/mit/xorg-server/dist/glamor/glamor_segs.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_spans.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_text.c up to 1.1.1.3
	external/mit/xorg-server/dist/glamor/glamor_transfer.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/glamor_xv.c up to 1.1.1.4
	external/mit/xorg-server/dist/glamor/meson.build up to 1.1.1.2
	external/mit/xorg-server/dist/glx/Makefile.in   up to 1.1.1.18
	external/mit/xorg-server/dist/hw/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/kdrive/ephyr/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/kdrive/src/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/vfb/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/common/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xfree86/common/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c up to 1.19
	external/mit/xorg-server/dist/hw/xfree86/ddc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dixmods/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/doc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/dri2/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xfree86/dri2/pci_ids/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/drivers/inputtest/Makefile.in up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/Makefile.in up to 1.1.1.14
	external/mit/xorg-server/dist/hw/xfree86/exa/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/exa/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/fbdevhw/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.am up to 1.1.1.2
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/glamor_egl/meson.build up to 1.1.1.2
	external/mit/xorg-server/dist/hw/xfree86/i2c/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/int10/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/loader/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/man/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/man/xorg.conf.man up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/modes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/bus/Sbus.c up to 1.4
	external/mit/xorg-server/dist/hw/xfree86/os-support/hurd/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/linux/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/misc/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/os-support/solaris/sun_init.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/os-support/stub/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/hw/xfree86/parser/Makefile.in up to 1.1.1.21
	external/mit/xorg-server/dist/hw/xfree86/ramdac/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/shadowfb/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/gtf/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/utils/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xfree86/vgahw/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/x86emu/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xfree86/xkb/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xnest/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xnest/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/Makefile.in up to 1.1.1.20
	external/mit/xorg-server/dist/hw/xquartz/GL/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/bundle/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xquartz/mach-startup/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xquartz/pbproxy/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xquartz/xpr/Makefile.in up to 1.1.1.18
	external/mit/xorg-server/dist/hw/xwin/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/hw/xwin/dri/Makefile.in up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xwin/glx/Makefile.in up to 1.1.1.16
	external/mit/xorg-server/dist/hw/xwin/man/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/hw/xwin/winclipboard/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/include/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/include/fourcc.h  up to 1.1.1.2
	external/mit/xorg-server/dist/include/xkbsrv.h  up to 1.1.1.7
	external/mit/xorg-server/dist/man/Makefile.in   up to 1.1.1.13
	external/mit/xorg-server/dist/mi/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/miext/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/damage/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/rootless/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/shadow/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/miext/sync/Makefile.in up to 1.1.1.15
	external/mit/xorg-server/dist/os/Makefile.in    up to 1.1.1.19
	external/mit/xorg-server/dist/os/log.c          up to 1.1.1.11
	external/mit/xorg-server/dist/os/xsha1.c        up to 1.1.1.4
	external/mit/xorg-server/dist/present/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/present/present_notify.c up to 1.1.1.3
	external/mit/xorg-server/dist/pseudoramiX/Makefile.in up to 1.1.1.13
	external/mit/xorg-server/dist/randr/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/record/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/render/picture.h  up to 1.4
	external/mit/xorg-server/dist/test/Makefile.am  up to 1.6
	external/mit/xorg-server/dist/test/Makefile.in  up to 1.1.1.16
	external/mit/xorg-server/dist/test/meson.build  up to 1.1.1.4
	external/mit/xorg-server/dist/xfixes/Makefile.in up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/Makefile.in   up to 1.1.1.19
	external/mit/xorg-server/dist/xkb/xkb.c         up to 1.12
	external/mit/xorg-server/dist/xkb/xkbEvents.c   up to 1.1.1.6
	external/mit/xorg-server/include/dix-config.h   up to 1.56
	external/mit/xorg-server/include/version-config.h up to 1.26
	external/mit/xorg-server/include/xorg-config.h  up to 1.36
	external/mit/xorg-server/include/xorg-server.h  up to 1.36

import of xorg-server-21.1.20
@
text
@a0 50
xcb_dep = dependency('xcb', required: false)
xcb_image_dep = dependency('xcb-image', required: false)
xcb_util_dep = dependency('xcb-util', required: false)

if get_option('xvfb')
    xvfb_args = [
        xvfb_server.full_path(),
        '-screen',
        'scrn',
        '1280x1024x24'
    ]

    if xcb_dep.found() and xcb_image_dep.found() and xcb_util_dep.found() and get_option('xvfb') and get_option('xephyr') and build_glamor
        bug1354 = executable('bug1354', 'bug1354.c', dependencies: [xcb_dep, xcb_image_dep, xcb_util_dep])
        test('bug1354-gl',
                simple_xinit,
                args: [simple_xinit.full_path(),
                    bug1354.full_path(),
                    '-t',':201','-r',':200',
                    '----',
                    xephyr_server.full_path(),
                    '-glamor',
                    '-schedMax', '2000',
                    ':201',
                    '--',
                    xvfb_args,
                    ':200'
                    ],
                suite: 'xephyr-glamor',
                timeout: 300,
            )
        test('bug1354-gles',
                simple_xinit,
                args: [simple_xinit.full_path(),
                    bug1354.full_path(),
                    '-t',':199','-r',':198',
                    '----',
                    xephyr_server.full_path(),
                    '-glamor_gles2',
                    '-schedMax', '2000',
                    ':199',
                    '--',
                    xvfb_args,
                    ':198'
                    ],
                suite: 'xephyr-glamor-gles2',
                timeout: 300,
            )
    endif
endif@


