head	1.1;
branch	1.1.1;
access;
symbols
	xorg-server-21-1-25:1.1.1.3
	netbsd-10-2-RELEASE:1.1.1.2
	netbsd-9-5-RELEASE:1.1.1.1
	netbsd-11-0-RELEASE:1.1.1.2
	netbsd-11-0-RC7:1.1.1.2
	xorg-server-21-1-24:1.1.1.2
	netbsd-11-0-RC6:1.1.1.2
	netbsd-11-0-RC5:1.1.1.2
	xorg-server-21-1-23:1.1.1.2
	netbsd-11-0-RC4:1.1.1.2
	xorg-server-21-1-22:1.1.1.2
	netbsd-11-0-RC3:1.1.1.2
	netbsd-11-0-RC2:1.1.1.2
	netbsd-11-0-RC1:1.1.1.2
	xorg-server-21-1-21:1.1.1.2
	xorg-server-21-1-20:1.1.1.2
	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.52;	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	2026.10.08.00.03.03;	author mrg;	state Exp;
branches;
next	;
commitid	FNpOCErpc4VeyBYG;

1.1.1.2.2.1
date	2026.10.08.19.07.20;	author martin;	state Exp;
branches;
next	;
commitid	GmNU6HRS3GEsSHYG;

1.1.1.2.4.1
date	2026.10.08.19.00.42;	author martin;	state Exp;
branches;
next	;
commitid	Cb4oe4LPARD0QHYG;


desc
@@


1.1
log
@Initial revision
@
text
@srcs_xorg_int10 = [
    'helper_exec.c',
    'helper_mem.c',
    'xf86int10.c',
    'xf86int10module.c',
]

int10_c_args = [xorg_c_args]
int10_link = []

if host_machine.cpu() == 'i386' or host_machine.cpu() == 'x86_64'
    int10_c_args += '-D_PC'
endif

if int10 == 'stub'
    srcs_xorg_int10 += 'stub.c'
    int10_c_args += '-D_VM86_LINUX'
endif

if int10 == 'x86emu'
    srcs_xorg_int10 += [
        'generic.c',
        'xf86x86emu.c',
        'x86emu.c',
    ]
    int10_c_args += '-D_X86EMU'
    int10_c_args += '-DNO_SYS_HEADERS'

    # Silence some useless warnings from x86emu
    if cc.has_argument('-Wno-format-nonliteral')
        int10_c_args += '-Wno-format-nonliteral'
    endif

    int10_link += xorg_x86emu
endif

if int10 == 'vm86'
    srcs_xorg_int10 += [
        'vm86/linux_vm86.c',
        'linux.c',
    ]
    int10_c_args += '-D_VM86_LINUX'
endif

xorg_int10 = shared_module('int10',
    srcs_xorg_int10,
    include_directories: [
        inc,
        xorg_inc,
        include_directories('../x86emu')
    ],
    dependencies: common_dep,
    link_with: int10_link,
    c_args: int10_c_args,

    install: true,
    install_dir: module_dir,
)

install_data('xf86int10.h', 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
@a1 2
    'vbe.c',
    'vbeModes.c',
a60 2
install_data('vbe.h', install_dir: xorgsdkdir)
install_data('vbeModes.h', install_dir: xorgsdkdir)
@


1.1.1.2.2.1
log
@Pull up the following, requested by mrg in ticket #1351:

	external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.35
	external/mit/xorg-server/dist/configure         up to 1.28
	external/mit/xorg-server/dist/configure.ac      up to 1.30
	external/mit/xorg-server/dist/meson.build       up to 1.1.1.25
	external/mit/xorg-server/dist/Xext/xtest.c      up to 1.11
	external/mit/xorg-server/dist/Xi/exevents.c     up to 1.1.1.16
	external/mit/xorg-server/dist/Xi/extinit.c      up to 1.1.1.10
	external/mit/xorg-server/dist/Xi/xibarriers.c   up to 1.7
	external/mit/xorg-server/dist/Xi/xipassivegrab.c up to 1.10
	external/mit/xorg-server/dist/Xi/xiquerydevice.c up to 1.6
	external/mit/xorg-server/dist/config/udev.c     up to 1.1.1.7
	external/mit/xorg-server/dist/dix/devices.c     up to 1.18
	external/mit/xorg-server/dist/dix/region.c      up to 1.5
	external/mit/xorg-server/dist/dri3/meson.build  up to 1.1.1.3
	external/mit/xorg-server/dist/exa/exa_accel.c   up to 1.8
	external/mit/xorg-server/dist/fb/fb.h           up to 1.4
	external/mit/xorg-server/dist/fb/fbgc.c         up to 1.1.1.6
	external/mit/xorg-server/dist/glamor/glamor_compositerects.c up to 1.1.1.2
	external/mit/xorg-server/dist/glx/glxcmds.c     up to 1.18
	external/mit/xorg-server/dist/hw/kdrive/src/kinput.c up to 1.1.1.10
	external/mit/xorg-server/dist/hw/xfree86/common/xf86.h up to 1.7
	external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c up to 1.14
	external/mit/xorg-server/dist/hw/xfree86/common/xf86fbman.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/common/xf86platformBus.c up to 1.1.1.4
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/dri2.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c up to 1.13
	external/mit/xorg-server/dist/hw/xfree86/int10/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/man/xorg.conf.man up to 1.1.1.8
	external/mit/xorg-server/dist/hw/xfree86/os-support/meson.build up to 1.1.1.4
	external/mit/xorg-server/dist/hw/xfree86/parser/Files.c up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/parser/Flags.c up to 1.1.1.9
	external/mit/xorg-server/dist/hw/xfree86/parser/scan.c up to 1.1.1.8
	external/mit/xorg-server/dist/hw/xquartz/X11Application.m up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xquartz/GL/indirect.c up to 1.1.1.9
	external/mit/xorg-server/dist/hw/xquartz/xpr/dri.c up to 1.1.1.7
	external/mit/xorg-server/dist/include/xkbstr.h  up to 1.1.1.5
	external/mit/xorg-server/dist/mi/miarc.c        up to 1.6
	external/mit/xorg-server/dist/miext/damage/damage.c up to 1.1.1.7
	external/mit/xorg-server/dist/miext/damage/damagestr.h up to 1.1.1.6
	external/mit/xorg-server/dist/os/utils.c        up to 1.16
	external/mit/xorg-server/dist/present/present_notify.c up to 1.1.1.5
	external/mit/xorg-server/dist/randr/rrproviderproperty.c up to 1.1.1.4
	external/mit/xorg-server/dist/render/glyph.c    up to 1.7
	external/mit/xorg-server/dist/test/string.c     up to 1.1.1.4
	external/mit/xorg-server/dist/test/xi2/protocol-eventconvert.c up to 1.1.1.6
	external/mit/xorg-server/dist/test/xi2/protocol-xiquerydevice.c up to 1.1.1.6
	external/mit/xorg-server/dist/xkb/XKBAlloc.c    up to 1.1.1.7
	external/mit/xorg-server/dist/xkb/XKBMAlloc.c   up to 1.1.1.9
	external/mit/xorg-server/dist/xkb/ddxBeep.c     up to 1.1.1.5
	external/mit/xorg-server/dist/xkb/xkb.c         up to 1.15
	external/mit/xorg-server/dist/xkb/xkbInit.c     up to 1.1.1.7
	external/mit/xorg-server/dist/xkb/xkbUtils.c    up to 1.1.1.11
	external/mit/xorg-server/dist/xkb/xkmread.c     up to 1.1.1.7
	external/mit/xorg-server/include/dix-config.h   up to 1.61
	external/mit/xorg-server/include/version-config.h up to 1.31
	external/mit/xorg-server/include/xorg-config.h  up to 1.41
	external/mit/xorg-server/include/xorg-server.h  up to 1.41

Import xorg-server 21.1.25
@
text
@d13 1
a13 1
if host_machine.cpu_family() == 'i386' or host_machine.cpu_family() == 'x86_64'
@


1.1.1.2.4.1
log
@Pull up the following, requested by mrg in ticket #512:

	external/mit/xorg-server/dist/ChangeLog         up to 1.1.1.35
	external/mit/xorg-server/dist/configure         up to 1.28
	external/mit/xorg-server/dist/configure.ac      up to 1.30
	external/mit/xorg-server/dist/meson.build       up to 1.1.1.25
	external/mit/xorg-server/dist/Xext/xtest.c      up to 1.11
	external/mit/xorg-server/dist/Xi/exevents.c     up to 1.1.1.16
	external/mit/xorg-server/dist/Xi/extinit.c      up to 1.1.1.10
	external/mit/xorg-server/dist/Xi/xibarriers.c   up to 1.7
	external/mit/xorg-server/dist/Xi/xipassivegrab.c up to 1.10
	external/mit/xorg-server/dist/Xi/xiquerydevice.c up to 1.6
	external/mit/xorg-server/dist/config/udev.c     up to 1.1.1.7
	external/mit/xorg-server/dist/dix/devices.c     up to 1.18
	external/mit/xorg-server/dist/dix/region.c      up to 1.5
	external/mit/xorg-server/dist/dri3/meson.build  up to 1.1.1.3
	external/mit/xorg-server/dist/exa/exa_accel.c   up to 1.8
	external/mit/xorg-server/dist/fb/fb.h           up to 1.4
	external/mit/xorg-server/dist/fb/fbgc.c         up to 1.1.1.6
	external/mit/xorg-server/dist/glamor/glamor_compositerects.c up to 1.1.1.2
	external/mit/xorg-server/dist/glx/glxcmds.c     up to 1.18
	external/mit/xorg-server/dist/hw/kdrive/src/kinput.c up to 1.1.1.10
	external/mit/xorg-server/dist/hw/xfree86/common/xf86.h up to 1.7
	external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c up to 1.14
	external/mit/xorg-server/dist/hw/xfree86/common/xf86fbman.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/common/xf86platformBus.c up to 1.1.1.4
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/dri2.c up to 1.1.1.6
	external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c up to 1.13
	external/mit/xorg-server/dist/hw/xfree86/int10/meson.build up to 1.1.1.3
	external/mit/xorg-server/dist/hw/xfree86/man/xorg.conf.man up to 1.1.1.8
	external/mit/xorg-server/dist/hw/xfree86/os-support/meson.build up to 1.1.1.4
	external/mit/xorg-server/dist/hw/xfree86/parser/Files.c up to 1.1.1.7
	external/mit/xorg-server/dist/hw/xfree86/parser/Flags.c up to 1.1.1.9
	external/mit/xorg-server/dist/hw/xfree86/parser/scan.c up to 1.1.1.8
	external/mit/xorg-server/dist/hw/xquartz/X11Application.m up to 1.1.1.12
	external/mit/xorg-server/dist/hw/xquartz/GL/indirect.c up to 1.1.1.9
	external/mit/xorg-server/dist/hw/xquartz/xpr/dri.c up to 1.1.1.7
	external/mit/xorg-server/dist/include/xkbstr.h  up to 1.1.1.5
	external/mit/xorg-server/dist/mi/miarc.c        up to 1.6
	external/mit/xorg-server/dist/miext/damage/damage.c up to 1.1.1.7
	external/mit/xorg-server/dist/miext/damage/damagestr.h up to 1.1.1.6
	external/mit/xorg-server/dist/os/utils.c        up to 1.16
	external/mit/xorg-server/dist/present/present_notify.c up to 1.1.1.5
	external/mit/xorg-server/dist/randr/rrproviderproperty.c up to 1.1.1.4
	external/mit/xorg-server/dist/render/glyph.c    up to 1.7
	external/mit/xorg-server/dist/test/string.c     up to 1.1.1.4
	external/mit/xorg-server/dist/test/xi2/protocol-eventconvert.c up to 1.1.1.6
	external/mit/xorg-server/dist/test/xi2/protocol-xiquerydevice.c up to 1.1.1.6
	external/mit/xorg-server/dist/xkb/XKBAlloc.c    up to 1.1.1.7
	external/mit/xorg-server/dist/xkb/XKBMAlloc.c   up to 1.1.1.9
	external/mit/xorg-server/dist/xkb/ddxBeep.c     up to 1.1.1.5
	external/mit/xorg-server/dist/xkb/xkb.c         up to 1.15
	external/mit/xorg-server/dist/xkb/xkbInit.c     up to 1.1.1.7
	external/mit/xorg-server/dist/xkb/xkbUtils.c    up to 1.1.1.11
	external/mit/xorg-server/dist/xkb/xkmread.c     up to 1.1.1.7
	external/mit/xorg-server/include/dix-config.h   up to 1.61
	external/mit/xorg-server/include/version-config.h up to 1.31
	external/mit/xorg-server/include/xorg-config.h  up to 1.41
	external/mit/xorg-server/include/xorg-server.h  up to 1.41

Import xorg-server-21.1.25
@
text
@d13 1
a13 1
if host_machine.cpu_family() == 'i386' or host_machine.cpu_family() == 'x86_64'
@


1.1.1.3
log
@initial import of xorg-server-21.1.25
@
text
@d13 1
a13 1
if host_machine.cpu_family() == 'i386' or host_machine.cpu_family() == 'x86_64'
@