head	1.1;
branch	1.1.1;
access;
symbols
	netbsd-11-0-RC5:1.1.1.2.4.1
	xorg-server-21-1-23:1.1.1.3
	netbsd-11-0-RC4:1.1.1.2.4.1
	xorg-server-21-1-22:1.1.1.3
	netbsd-11-0-RC3:1.1.1.2.4.1
	netbsd-11-0-RC2:1.1.1.2.4.1
	netbsd-11-0-RC1:1.1.1.2.4.1
	xorg-server-21-1-21:1.1.1.3
	xorg-server-21-1-20:1.1.1.3
	netbsd-11:1.1.1.2.0.4
	netbsd-11-base:1.1.1.2
	xorg-server-21-1-18:1.1.1.2
	xorg-server-21-1-16:1.1.1.2
	netbsd-10-1-RELEASE:1.1.1.2
	xorg-server-21-1-14:1.1.1.2
	xorg-server-21-1-13:1.1.1.2
	netbsd-9-4-RELEASE:1.1.1.1
	netbsd-10-0-RELEASE:1.1.1.2
	netbsd-10-0-RC6:1.1.1.2
	netbsd-10-0-RC5:1.1.1.2
	netbsd-10-0-RC4:1.1.1.2
	netbsd-10-0-RC3:1.1.1.2
	netbsd-10-0-RC2:1.1.1.2
	netbsd-10-0-RC1:1.1.1.2
	xorg-server-21-1-9:1.1.1.2
	xorg-server-21-1-8:1.1.1.2
	xorg-server-21-1-7:1.1.1.2
	xorg-server-21-1-6:1.1.1.2
	xorg-server-21-1-5:1.1.1.2
	netbsd-10:1.1.1.2.0.2
	netbsd-10-base:1.1.1.2
	netbsd-9-3-RELEASE:1.1.1.1
	xorg-server-21-1-4:1.1.1.2
	xorg-server-21-1-3:1.1.1.2
	xorg-server-1-20-13:1.1.1.1
	xorg-server-1-20-12:1.1.1.1
	netbsd-9-2-RELEASE:1.1.1.1
	xorg-server-1-20-11:1.1.1.1
	xorg-server-1-20-10:1.1.1.1
	netbsd-9-1-RELEASE:1.1.1.1
	xorg-server-1-20-6:1.1.1.1
	netbsd-9-0-RELEASE:1.1.1.1
	netbsd-9-0-RC2:1.1.1.1
	netbsd-9-0-RC1:1.1.1.1
	netbsd-9:1.1.1.1.0.2
	netbsd-9-base:1.1.1.1
	xorg-server-1-20-5:1.1.1.1
	xorg-server-1-20-4:1.1.1.1
	xorg-server-1-20-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2018.12.31.09.36.11;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;
commitid	Zot71fGCYSdHWV5B;

1.1.1.1
date	2018.12.31.09.36.11;	author mrg;	state Exp;
branches;
next	1.1.1.2;
commitid	Zot71fGCYSdHWV5B;

1.1.1.2
date	2022.07.15.02.12.51;	author mrg;	state Exp;
branches
	1.1.1.2.2.1
	1.1.1.2.4.1;
next	1.1.1.3;
commitid	gzj6xwMO9FqKXVLD;

1.1.1.3
date	2025.11.12.07.47.58;	author mrg;	state Exp;
branches;
next	;
commitid	2quyYgOcr86oJeiG;

1.1.1.2.2.1
date	2025.12.18.18.51.07;	author martin;	state Exp;
branches;
next	;
commitid	xLUpbQiNIqPAeVmG;

1.1.1.2.4.1
date	2025.11.20.19.03.44;	author martin;	state Exp;
branches;
next	;
commitid	a6YkGTrCzIDQckjG;


desc
@@


1.1
log
@Initial revision
@
text
@srcs_xorg_os_support = [
    'bus/nobus.c',
    'shared/posix_tty.c',
    'shared/sigio.c',
    'shared/vidmem.c',
]

hdrs_xorg_os_support = [
    'bus/xf86Pci.h',
    'xf86_OSlib.h',
    'xf86_OSproc.h'
]

os_support_flags = ['-DUSESTDRES']

if get_option('pciaccess')
    srcs_xorg_os_support += 'bus/Pci.c'
    if host_machine.system() != 'linux' and host_machine.system() != 'solaris'
        srcs_xorg_os_support += 'bus/bsd_pci.c'
    endif
    if host_machine.cpu() == 'sparc'
        srcs_xorg_os_support += 'bus/Sbus.c'
        install_data('bus/xf86Sbus.h', install_dir: xorgsdkdir)
    endif
endif

if host_machine.system() == 'linux'
    srcs_xorg_os_support += [
        'linux/lnx_agp.c',
        'linux/lnx_bell.c',
        'linux/lnx_init.c',
        'linux/lnx_kmod.c',
        'linux/lnx_platform.c',
        'linux/lnx_video.c',
        'misc/SlowBcopy.c',
        'shared/VTsw_usl.c',
    ]
    if build_systemd_logind
        srcs_xorg_os_support += 'linux/systemd-logind.c'
    endif

    # this is ugly because the code is also
    if build_apm or build_acpi
        srcs_xorg_os_support += 'linux/lnx_apm.c'
        if build_acpi
            srcs_xorg_os_support += 'linux/lnx_acpi.c'
        endif
    endif

elif host_machine.system() == 'solaris'
    srcs_xorg_os_support += [
        'solaris/sun_apm.c',
        'solaris/sun_bell.c',
        'solaris/sun_init.c',
        'solaris/sun_vid.c',
        'shared/kmod_noop.c',
    ]

    if cc.has_header('sys/vt.h')
        srcs_xorg_os_support += 'solaris/sun_VTsw.c'
    else
        srcs_xorg_os_support += 'shared/VTsw_noop.c'
    endif

    if cc.has_header('sys/agpio.h') or cc.has_header('sys/agpgart.h')
        srcs_xorg_os_support += 'solaris/sun_agp.c'
    else
        srcs_xorg_os_support += 'shared/agp_noop.c'
    endif

    if host_machine.cpu_family() == 'sparc'
        srcs_xorg_os_support += 'solaris/solaris-sparcv8plus.S'
    elif host_machine.cpu_family() == 'x86_64'
        srcs_xorg_os_support += 'solaris/solaris-amd64.S'
    elif host_machine.cpu_family() == 'x86'
        srcs_xorg_os_support += 'solaris/solaris-ia32.S'
    else
        error('Unknown CPU family for Solaris build')
    endif

elif host_machine.system().endswith('bsd')
    srcs_xorg_os_support += [
        'bsd/bsd_VTsw.c',
        'bsd/bsd_bell.c',
        'bsd/bsd_init.c',
    ]

    # XXX: APM

    if host_machine.cpu_family() == 'x86_64'
        srcs_xorg_os_support += 'bsd/i386_video.c'
    elif host_machine.cpu_family() == 'x86'
        srcs_xorg_os_support += 'bsd/i386_video.c'
    elif host_machine.cpu_family() == 'arm'
        srcs_xorg_os_support += 'bsd/arm_video.c'
    elif host_machine.cpu_family() == 'powerpc'
        srcs_xorg_os_support += 'bsd/ppc_video.c'
    elif host_machine.cpu_family() == 'sparc64'
        srcs_xorg_os_support += 'bsd/sparc64_video.c'
        srcs_xorg_os_support += 'shared/ioperm_noop.c'
    elif host_machine.cpu_family() == 'alpha'
        srcs_xorg_os_support += 'bsd/alpha_video.c'
    endif

    if host_machine.system() == 'freebsd'
        srcs_xorg_os_support += 'bsd/bsd_kmod.c'
    else
        srcs_xorg_os_support += 'shared/kmod_noop.c'
    endif

    if cc.has_header('sys/agpio.h') or cc.has_header('sys/agpgart.h')
        srcs_xorg_os_support += 'linux/lnx_agp.c'
    else
        srcs_xorg_os_support += 'shared/agp_noop.c'
    endif
else
    # stub ossupport
    srcs_xorg_os_support += [
        'shared/VTsw_noop.c',
        'shared/agp_noop.c',
        'shared/ioperm_noop.c',
        'shared/kmod_noop.c',
        'shared/pm_noop.c',
        'shared/vidmem.c',
        'shared/posix_tty.c',
        'shared/sigio.c',
        'stub/stub_bell.c',
        'stub/stub_init.c',
        'stub/stub_video.c',
    ]
endif

xorg_os_support = static_library('xorg_os_support',
    srcs_xorg_os_support,
    include_directories: [inc, xorg_inc],
    dependencies: [
        common_dep,
        dbus_dep,
        libdrm_dep,
    ],
    c_args: xorg_c_args,
)

install_data(hdrs_xorg_os_support, install_dir: xorgsdkdir)
@


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


1.1.1.2
log
@initial import of xorg-server-21.1.3
@
text
@d14 1
a14 2
os_dep = []
os_c_args = []
d18 1
a18 1
    if host_machine.system() != 'linux'
d21 1
a21 1
    if host_machine.cpu() == 'sparc' or host_machine.cpu() == 'sparc64'
a26 6
if get_option('agp') == 'auto'
    build_agp = cc.has_header('sys/agpio.h') or cc.has_header('sys/agpgart.h') or cc.has_header('linux/agpgart.h')
else
    build_agp = get_option('agp') == 'true'
endif

d29 1
a37 5
    if build_agp
        srcs_xorg_os_support += 'linux/lnx_agp.c'
    else
        srcs_xorg_os_support += 'shared/agp_noop.c'
    endif
a47 2
    else
        srcs_xorg_os_support += 'shared/pm_noop.c'
d50 1
a50 1
elif host_machine.system() == 'sunos'
d65 1
a65 1
    if build_agp
a85 1
	'shared/pm_noop.c'
d88 2
a91 5
        if host_machine.system() == 'netbsd'
            os_dep += cc.find_library('x86_64')
        elif host_machine.system() == 'openbsd'
            os_dep += cc.find_library('amd64')
        endif
a93 3
        if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
            os_dep += cc.find_library('i386')
        endif
a102 5
        if host_machine.system() == 'freebsd'
            os_dep += cc.find_library('io')
        elif host_machine.system() == 'netbsd'
            os_c_args += '-DUSE_ALPHA_PIO'
        endif
d111 1
a111 1
    if build_agp
a139 1
        os_dep,
d141 1
a141 1
    c_args: xorg_c_args + os_c_args,
@


1.1.1.2.2.1
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
@d22 1
a22 1
    if host_machine.cpu_family() in ['sparc', 'sparc64']
d84 1
a84 1
    if host_machine.cpu_family() in ['sparc', 'sparc64']
@


1.1.1.2.4.1
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
@d22 1
a22 1
    if host_machine.cpu_family() in ['sparc', 'sparc64']
d84 1
a84 1
    if host_machine.cpu_family() in ['sparc', 'sparc64']
@


1.1.1.3
log
@initial import of xorg-server-21.1.20
@
text
@d22 1
a22 1
    if host_machine.cpu_family() in ['sparc', 'sparc64']
d84 1
a84 1
    if host_machine.cpu_family() in ['sparc', 'sparc64']
@