Sync with pkgsrc proper to prepare another update.
This commit is contained in:
Makoto Fujiwara
Thomas Klausner
parent
f7b34e0d63
commit
17252ea90f
21 changed files with 170 additions and 1228 deletions
|
|
@ -1,13 +1,14 @@
|
|||
# $NetBSD: Makefile,v 1.28 2012/10/23 10:23:06 thomasklausner Exp $
|
||||
# $NetBSD: Makefile,v 1.29 2013/08/16 11:47:35 makoto Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xorg-server-1.11.2
|
||||
DISTNAME= xorg-server-1.12.4
|
||||
PKGNAME= modular-${DISTNAME}
|
||||
PKGREVISION= 2
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= bjs@NetBSD.org
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://xorg.freedesktop.org/
|
||||
COMMENT= Modular X11 server from modular X.org
|
||||
|
||||
|
|
@ -16,6 +17,7 @@ SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
|
|||
GNU_CONFIGURE= yes
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= gmake pkg-config
|
||||
USE_LANGUAGES+= c99
|
||||
|
||||
PKGCONFIG_OVERRIDE+= xorg-server.pc.in
|
||||
SHLIBTOOL_OVERRIDE= # empty
|
||||
|
|
@ -31,7 +33,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
|
|||
CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
|
||||
|
||||
.if !empty(USE_TOOLS:Mauto*)
|
||||
BUILD_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
|
||||
TOOLS_DEPENDS+= xorg-util-macros>=1.1.5:../../devel/xorg-util-macros
|
||||
.endif
|
||||
|
||||
DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
|
||||
|
|
@ -39,22 +41,20 @@ DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config
|
|||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q}
|
||||
CONFIGURE_ARGS+= --with-vendor-name="The NetBSD Foundation"
|
||||
CONFIGURE_ARGS+= --with-vendor-name-short="pkgsrc"
|
||||
.if ${OPSYS} == "NetBSD"
|
||||
CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org"
|
||||
CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation"
|
||||
.endif
|
||||
.if ${OPSYS} == "FreeBSD"
|
||||
CONFIGURE_ARGS+= --without-dtrace
|
||||
# TLS is not supported by NetBSD<6
|
||||
. if !empty(OS_VERSION:M[0-5].*)
|
||||
CONFIGURE_ENV+= ac_cv_tls=no
|
||||
CONFIGURE_ARGS+= --disable-glx-tls
|
||||
. endif
|
||||
.endif
|
||||
CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
|
||||
CONFIGURE_ARGS+= --with-vendor-web="http://www.pkgsrc.org/"
|
||||
|
||||
CONFIGURE_ARGS+= --enable-xorg
|
||||
|
||||
CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts/X11
|
||||
CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11
|
||||
|
||||
LEGACY_FONT_PATH=
|
||||
DEFAULT_FONT_PATH=
|
||||
|
|
@ -68,20 +68,31 @@ CONFIGURE_ARGS+= --with-default-font-path=${FONT_PATH:ts,:Q}
|
|||
|
||||
CONFIGURE_ARGS+= --disable-config-hal
|
||||
CONFIGURE_ARGS+= --disable-dmx
|
||||
CONFIGURE_ARGS+= --disable-xprint
|
||||
CONFIGURE_ARGS+= --disable-xwin
|
||||
CONFIGURE_ARGS+= --disable-xephyr
|
||||
CONFIGURE_ARGS+= --disable-kdrive
|
||||
CONFIGURE_ARGS+= --disable-kdrive-vesa
|
||||
#CONFIGURE_ARGS+= --disable-kdrive-vesa
|
||||
CONFIGURE_ARGS+= --disable-xfake
|
||||
CONFIGURE_ARGS+= --disable-xsdl
|
||||
CONFIGURE_ARGS+= --disable-xfbdev
|
||||
CONFIGURE_ARGS+= --disable-kbd_mode # deprecated
|
||||
CONFIGURE_ARGS+= --disable-xorgcfg # deprecated
|
||||
|
||||
CONFIGURE_ARGS+= --with-int10=x86emu
|
||||
|
||||
CONFIGURE_ENV+= APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
|
||||
CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
|
||||
|
||||
PLIST_VARS+= sunos
|
||||
PLIST_SUBST+= SUNOS_ARCH=${SUNOS_ARCH}
|
||||
|
||||
.if ${OPSYS} == "SunOS"
|
||||
PLIST.sunos= yes
|
||||
. if ${MACHINE_ARCH} == "i386"
|
||||
SUNOS_ARCH= ia32
|
||||
. elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
|
||||
SUNOS_ARCH= amd64
|
||||
. elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
|
||||
SUNOS_ARCH= sparcv8plus
|
||||
. endif
|
||||
.endif
|
||||
|
||||
# Workaround for PR#41556.
|
||||
# Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
|
||||
|
|
@ -91,31 +102,38 @@ CONFIGURE_ENV+= ac_cv_header_sys_event_h=no
|
|||
|
||||
INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
|
||||
|
||||
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.7.0
|
||||
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
|
||||
BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
|
||||
BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
|
||||
BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.14
|
||||
BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5
|
||||
BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
|
||||
BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
|
||||
BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
|
||||
BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
|
||||
BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22
|
||||
BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
|
||||
BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
|
||||
BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
|
||||
BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
|
||||
BUILDLINK_API_DEPENDS.dri+= dri>=7.8
|
||||
BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
|
||||
BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
|
||||
BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
|
||||
BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
|
||||
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
|
||||
BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1
|
||||
BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3
|
||||
BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0
|
||||
BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
|
||||
BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
|
||||
BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
|
||||
BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
|
||||
|
||||
.include "../../mk/compiler.mk"
|
||||
.if empty(PKGSRC_COMPILER:Mgcc)
|
||||
CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
|
||||
.endif
|
||||
BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
|
||||
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
.include "../../devel/ncurses/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../fonts/libfontenc/buildlink3.mk"
|
||||
.include "../../wip/dri/buildlink3.mk" # graphics/dri
|
||||
.include "../../wip/gl/buildlink3.mk" # graphics/gl
|
||||
# .include "../../graphics/MesaLib/buildlink3.mk" # 7.4.4 is too old for this
|
||||
.include "../../graphics/MesaLib/buildlink3.mk"
|
||||
.include "../../security/openssl/buildlink3.mk"
|
||||
BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
|
||||
.include "../../sysutils/libpciaccess/buildlink3.mk"
|
||||
|
|
@ -151,6 +169,8 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1
|
|||
.include "../../x11/trapproto/buildlink3.mk"
|
||||
.include "../../x11/videoproto/buildlink3.mk"
|
||||
.include "../../x11/xcmiscproto/buildlink3.mk"
|
||||
.include "../../x11/xextproto/buildlink3.mk"
|
||||
.include "../../x11/kbproto/buildlink3.mk"
|
||||
.include "../../x11/xf86bigfontproto/buildlink3.mk"
|
||||
.include "../../x11/xf86dgaproto/buildlink3.mk"
|
||||
.include "../../x11/xf86driproto/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.12 2011/10/13 15:30:18 makoto Exp $
|
||||
@comment $NetBSD: PLIST,v 1.13 2013/08/16 11:47:35 makoto Exp $
|
||||
bin/X
|
||||
bin/Xnest
|
||||
bin/Xorg
|
||||
|
|
@ -32,8 +32,9 @@ include/xorg/dixfont.h
|
|||
include/xorg/dixfontstr.h
|
||||
include/xorg/dixgrabs.h
|
||||
include/xorg/dixstruct.h
|
||||
include/xorg/dri.h
|
||||
include/xorg/dristruct.h
|
||||
${PLIST.dri}include/xorg/dri.h
|
||||
include/xorg/dri2.h
|
||||
${PLIST.dri}include/xorg/dristruct.h
|
||||
include/xorg/edid.h
|
||||
include/xorg/events.h
|
||||
include/xorg/exa.h
|
||||
|
|
@ -81,6 +82,7 @@ include/xorg/miwideline.h
|
|||
include/xorg/mizerarc.h
|
||||
include/xorg/msp3430.h
|
||||
include/xorg/opaque.h
|
||||
include/xorg/optionstr.h
|
||||
include/xorg/os.h
|
||||
include/xorg/panoramiX.h
|
||||
include/xorg/panoramiXsrv.h
|
||||
|
|
@ -99,7 +101,7 @@ include/xorg/registry.h
|
|||
include/xorg/resource.h
|
||||
include/xorg/rgb.h
|
||||
include/xorg/rrtransform.h
|
||||
include/xorg/sarea.h
|
||||
${PLIST.dri}include/xorg/sarea.h
|
||||
include/xorg/screenint.h
|
||||
include/xorg/scrnintstr.h
|
||||
include/xorg/selection.h
|
||||
|
|
@ -108,6 +110,7 @@ include/xorg/shadow.h
|
|||
include/xorg/shadowfb.h
|
||||
include/xorg/shmint.h
|
||||
include/xorg/site.h
|
||||
${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
|
||||
include/xorg/swaprep.h
|
||||
include/xorg/swapreq.h
|
||||
include/xorg/syncsdk.h
|
||||
|
|
@ -123,9 +126,9 @@ include/xorg/vidmodeproc.h
|
|||
include/xorg/wfbrename.h
|
||||
include/xorg/window.h
|
||||
include/xorg/windowstr.h
|
||||
include/xorg/xaarop.h
|
||||
include/xorg/xaa.h
|
||||
include/xorg/xaalocal.h
|
||||
include/xorg/xaarop.h
|
||||
include/xorg/xace.h
|
||||
include/xorg/xacestr.h
|
||||
include/xorg/xf86.h
|
||||
|
|
@ -135,6 +138,7 @@ include/xorg/xf86DDC.h
|
|||
include/xorg/xf86Modes.h
|
||||
include/xorg/xf86Module.h
|
||||
include/xorg/xf86Opt.h
|
||||
include/xorg/xf86Optionstr.h
|
||||
include/xorg/xf86Optrec.h
|
||||
include/xorg/xf86Parser.h
|
||||
include/xorg/xf86Pci.h
|
||||
|
|
@ -169,11 +173,12 @@ include/xorg/xserver-properties.h
|
|||
include/xorg/xvdix.h
|
||||
include/xorg/xvmcext.h
|
||||
lib/pkgconfig/xorg-server.pc
|
||||
lib/xorg/modules/extensions/libdbe.la
|
||||
lib/xorg/modules/extensions/libdri.la
|
||||
lib/xorg/modules/extensions/libextmod.la
|
||||
lib/xorg/modules/extensions/libglx.la
|
||||
lib/xorg/modules/extensions/librecord.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/libdbe.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/libdri.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/libdri2.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/libextmod.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/libglx.la
|
||||
${PLIST.dri}lib/xorg/modules/extensions/librecord.la
|
||||
lib/xorg/modules/libexa.la
|
||||
lib/xorg/modules/libfb.la
|
||||
lib/xorg/modules/libfbdevhw.la
|
||||
|
|
@ -203,5 +208,6 @@ man/man4/fbdevhw.4
|
|||
man/man5/xorg.conf.5
|
||||
man/man5/xorg.conf.d.5
|
||||
share/aclocal/xorg-server.m4
|
||||
${PLIST.dtrace}share/doc/xorg-server/Xserver-DTrace.xml
|
||||
@pkgdir lib/xorg/modules/input
|
||||
@pkgdir lib/xorg/modules/drivers
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
-- Following's are to be imported
|
||||
wip/dri
|
||||
wip/gl
|
||||
-- Following PR to be applied
|
||||
o x11/xproto-7.0.22 [pkg/45465]
|
||||
-- Deal with http://secunia.com/advisories/47566/
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.8 2011/12/31 13:22:29 makoto Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.9 2013/08/16 11:47:35 makoto Exp $
|
||||
|
||||
BUILDLINK_TREE+= modular-xorg-server
|
||||
|
||||
.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK)
|
||||
MODULAR_XORG_SERVER_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.6.0
|
||||
BUILDLINK_ABI_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.6.5nb8
|
||||
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.0
|
||||
BUILDLINK_ABI_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.12.4
|
||||
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../wip/modular-xorg-server
|
||||
|
||||
.include "../../sysutils/libpciaccess/buildlink3.mk"
|
||||
|
|
@ -22,6 +22,7 @@ BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../wip/modular-xorg-server
|
|||
.include "../../x11/xextproto/buildlink3.mk"
|
||||
.include "../../x11/xf86driproto/buildlink3.mk"
|
||||
.include "../../x11/xproto/buildlink3.mk"
|
||||
.include "../../x11/xineramaproto/buildlink3.mk"
|
||||
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -modular-xorg-server
|
||||
|
|
|
|||
|
|
@ -1,17 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.25 2011/11/11 03:35:50 makoto Exp $
|
||||
$NetBSD: distinfo,v 1.26 2013/08/16 11:47:35 makoto Exp $
|
||||
|
||||
SHA1 (xorg-server-1.11.2.tar.bz2) = b4de5c599c90bd08d3122866ba68152cd59a880e
|
||||
RMD160 (xorg-server-1.11.2.tar.bz2) = cc69cfd86a5a870d1433262dd1445a8603a9266a
|
||||
Size (xorg-server-1.11.2.tar.bz2) = 4945939 bytes
|
||||
SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
|
||||
SHA1 (patch-ac) = ab74f292949196e878458afa2e354c73f4d9fd3f
|
||||
SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
|
||||
SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
|
||||
SHA1 (patch-al) = e1c4afc83eb7673c5208e30c9d0fc70de7aa8606
|
||||
SHA1 (patch-ba) = b758aab64fcba81ba33b7c425db6430757b2fd4b
|
||||
SHA1 (patch-bc) = f1ab56e8876ddc6bc0fe941a45ab2c7726c5cbf4
|
||||
SHA1 (patch-bi) = 52012af9c4bd2dab0e9d96cb1692a5e342737748
|
||||
SHA1 (patch-bj) = 3bea92151311028e9eeeacd441b1855a0d5f6867
|
||||
SHA1 (patch-sb) = 0129bb411da37208cafca0bf145e8e4b388dc380
|
||||
SHA1 (patch-sd) = 78fa38529b63f31b9c3e25a62c0914f8268b629d
|
||||
SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568
|
||||
SHA1 (xorg-server-1.12.4.tar.bz2) = 6d616874f9c7677bda08dc073c03f83e78fbc585
|
||||
RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
|
||||
Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes
|
||||
SHA1 (patch-configure) = 031bc0accf1dd71ed687e7aac3fcc9498cb06784
|
||||
SHA1 (patch-hw_xfree86_common_compiler.h) = 88de747715b80b22f448869ab32dce1641bcb6db
|
||||
SHA1 (patch-hw_xfree86_os-support_xf86__OSlib.h) = 7c2760509610b44915da077b22899bef9c338cc1
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# $NetBSD: options.mk,v 1.12 2012/06/12 15:46:34 thomasklausner Exp $
|
||||
# $NetBSD: options.mk,v 1.13 2013/08/16 11:47:35 makoto Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
|
||||
PKG_SUPPORTED_OPTIONS= dri inet6 debug
|
||||
PKG_SUPPORTED_OPTIONS= dri inet6 debug dtrace
|
||||
PKG_SUGGESTED_OPTIONS= dri inet6
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
PLIST_VARS+= dri
|
||||
PLIST_VARS+= dri dtrace
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mdri)
|
||||
PLIST.dri= yes
|
||||
|
|
@ -31,3 +31,11 @@ CONFIGURE_ARGS+= --disable-ipv6
|
|||
CONFIGURE_ARGS+= --enable-debug
|
||||
CFLAGS+= -ggdb
|
||||
.endif
|
||||
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mdtrace)
|
||||
PLIST.dtrace= yes
|
||||
CONFIGURE_ARGS+= --with-dtrace
|
||||
.else
|
||||
CONFIGURE_ARGS+= --without-dtrace
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-ab,v 1.9 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
--- hw/xfree86/xorgconf.cpp.orig 2009-05-19 13:58:11 +0300
|
||||
+++ hw/xfree86/xorgconf.cpp 2009-05-19 14:08:12 +0300
|
||||
@@ -602,3 +602,10 @@ Section "ServerLayout"
|
||||
InputDevice "Keyboard1" "CoreKeyboard"
|
||||
EndSection
|
||||
|
||||
+XCOMM Two experimental extensions are available -- Composite and XEVIE. Uncomment
|
||||
+XCOMM the section below to enable Composite. Many extensions can also be disabled
|
||||
+XCOMM in this manner.
|
||||
+
|
||||
+XCOMM Section "Extensions"
|
||||
+XCOMM Option "Composite" "Enable"
|
||||
+XCOMM EndSection
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.5 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
Fix build on DragonFly after header moved.
|
||||
|
||||
--- hw/xfree86/os-support/xf86_OSlib.h.orig 2010-10-30 02:24:29 +0200
|
||||
+++ hw/xfree86/os-support/xf86_OSlib.h 2010-10-30 02:25:03 +0200
|
||||
@@ -346,7 +346,7 @@
|
||||
# include <dev/wscons/wsdisplay_usl_io.h>
|
||||
# endif /* WSCONS_SUPPORT */
|
||||
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
||||
-# if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
|
||||
+# if (defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)) || (defined(__DragonFly_version) && (__DragonFly_version >= 200900))
|
||||
# include <sys/mouse.h>
|
||||
# else
|
||||
# undef MOUSE_GETINFO
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-af,v 1.9 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2008-06-10 19:57:19.000000000 +0200
|
||||
+++ hw/xfree86/os-support/bsd/bsd_init.c
|
||||
@@ -589,6 +589,7 @@ xf86OpenPcvt()
|
||||
xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
|
||||
pcvt_version.rmajor, pcvt_version.rminor);
|
||||
#endif
|
||||
+ xf86Msg(X_PROBED, "using VT number %d\n\n", xf86Info.vtno);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
$NetBSD: patch-ak,v 1.8 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
Changes from NetBSD xsrc/external/mit/xorg-server/dist/\
|
||||
hw/xfree86/xaa/xaaInitAccel.c
|
||||
|
||||
----------------------------
|
||||
revision 1.2
|
||||
date: 2009/02/19 20:02:02; author: macallan; state: Exp; lines: +13 -0
|
||||
Actually use scanline image writes to upload images if available
|
||||
----------------------------
|
||||
|
||||
--- hw/xfree86/xaa/xaaInitAccel.c.orig 2009-03-14 11:23:10.000000000 +0200
|
||||
+++ hw/xfree86/xaa/xaaInitAccel.c
|
||||
@@ -821,6 +821,19 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoR
|
||||
infoRec->FillImageWriteRectsFlags = infoRec->ImageWriteFlags;
|
||||
}
|
||||
|
||||
+ /**** FillScanlineImageWriteRects ****/
|
||||
+
|
||||
+ if(!infoRec->FillImageWriteRects) {
|
||||
+ if(HaveScanlineImageWriteRect &&
|
||||
+ (infoRec->ScanlineImageWriteFlags &
|
||||
+ LEFT_EDGE_CLIPPING_NEGATIVE_X) &&
|
||||
+ (infoRec->ScanlineImageWriteFlags & LEFT_EDGE_CLIPPING)) {
|
||||
+ infoRec->FillImageWriteRects = XAAFillScanlineImageWriteRects;
|
||||
+ infoRec->FillImageWriteRectsFlags =
|
||||
+ infoRec->ScanlineImageWriteFlags;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
/**** WriteBitmap ****/
|
||||
|
||||
if(infoRec->WriteBitmap &&
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
$NetBSD: patch-al,v 1.6 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
Changes from NetBSD xsrc/external/mit/xorg-server/dist/\
|
||||
hw/xfree86/xaa/xaalocal.h
|
||||
|
||||
----------------------------
|
||||
revision 1.2
|
||||
date: 2009/02/19 20:02:02; author: macallan; state: Exp; lines: +11 -0
|
||||
Actually use scanline image writes to upload images if available
|
||||
----------------------------
|
||||
--- hw/xfree86/xaa/xaalocal.h.orig 2011-03-02 13:09:33.000000000 +0900
|
||||
+++ hw/xfree86/xaa/xaalocal.h 2011-10-13 20:22:03.000000000 +0900
|
||||
@@ -595,6 +595,18 @@
|
||||
PixmapPtr pPix
|
||||
);
|
||||
|
||||
+void
|
||||
+XAAFillScanlineImageWriteRects(
|
||||
+ ScrnInfoPtr pScrn,
|
||||
+ int rop,
|
||||
+ unsigned int planemask,
|
||||
+ int nBox,
|
||||
+ BoxPtr pBox,
|
||||
+ int xorg, int yorg,
|
||||
+ PixmapPtr pPix
|
||||
+);
|
||||
+
|
||||
+
|
||||
extern _X_EXPORT void
|
||||
XAAPolyFillRect(
|
||||
DrawablePtr pDraw,
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
$NetBSD: patch-ba,v 1.4 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
--- include/dix-config.h.in.orig 2009-10-12 02:52:40.000000000 +0000
|
||||
+++ include/dix-config.h.in
|
||||
@@ -3,6 +3,13 @@
|
||||
#ifndef _DIX_CONFIG_H_
|
||||
#define _DIX_CONFIG_H_
|
||||
|
||||
+#ifndef HAVE_XNEST_CONFIG_H
|
||||
+#define Status int
|
||||
+typedef struct {} Display;
|
||||
+typedef struct {} XImage;
|
||||
+typedef struct {} Visual;
|
||||
+#endif
|
||||
+
|
||||
/* Support BigRequests extension */
|
||||
#undef BIGREQS
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
$NetBSD: patch-bc,v 1.5 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
--- mi/miscrinit.c.orig 2009-10-12 02:52:40.000000000 +0000
|
||||
+++ mi/miscrinit.c
|
||||
@@ -29,6 +29,7 @@ from The Open Group.
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
+#include <gcstruct.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "servermd.h"
|
||||
|
|
@ -1,499 +0,0 @@
|
|||
$NetBSD: patch-bi,v 1.4 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
--- /dev/null 2010-03-23 17:09:47.000000000 +0000
|
||||
+++ Xext/syncstr_old.h
|
||||
@@ -0,0 +1,494 @@
|
||||
+/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
|
||||
+/*
|
||||
+
|
||||
+Copyright 1991, 1993, 1994, 1998 The Open Group
|
||||
+
|
||||
+Permission to use, copy, modify, distribute, and sell this software and its
|
||||
+documentation for any purpose is hereby granted without fee, provided that
|
||||
+the above copyright notice appear in all copies and that both that
|
||||
+copyright notice and this permission notice appear in supporting
|
||||
+documentation.
|
||||
+
|
||||
+The above copyright notice and this permission notice shall be included in
|
||||
+all copies or substantial portions of the Software.
|
||||
+
|
||||
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
+
|
||||
+Except as contained in this notice, the name of The Open Group shall not be
|
||||
+used in advertising or otherwise to promote the sale, use or other dealings
|
||||
+in this Software without prior written authorization from The Open Group.
|
||||
+
|
||||
+*/
|
||||
+
|
||||
+/***********************************************************
|
||||
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||
+and Olivetti Research Limited, Cambridge, England.
|
||||
+
|
||||
+ All Rights Reserved
|
||||
+
|
||||
+Permission to use, copy, modify, and distribute this software and its
|
||||
+documentation for any purpose and without fee is hereby granted,
|
||||
+provided that the above copyright notice appear in all copies and that
|
||||
+both that copyright notice and this permission notice appear in
|
||||
+supporting documentation, and that the names of Digital or Olivetti
|
||||
+not be used in advertising or publicity pertaining to distribution of the
|
||||
+software without specific, written prior permission.
|
||||
+
|
||||
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
||||
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
|
||||
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
+PERFORMANCE OF THIS SOFTWARE.
|
||||
+
|
||||
+******************************************************************/
|
||||
+/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
|
||||
+
|
||||
+#ifndef _SYNCSTR_H_
|
||||
+#define _SYNCSTR_H_
|
||||
+
|
||||
+#include "sync_old.h"
|
||||
+
|
||||
+#ifndef _SYNC_OS
|
||||
+
|
||||
+/* cover up types from sync.h to make sure they're the right size for
|
||||
+ * protocol packaging. These will be undef'ed after all the protocol
|
||||
+ * structures are defined.
|
||||
+ */
|
||||
+#define XSyncCounter CARD32
|
||||
+#define XSyncAlarm CARD32
|
||||
+
|
||||
+/*
|
||||
+ * Initialize
|
||||
+ */
|
||||
+typedef struct _xSyncInitialize {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ CARD8 majorVersion;
|
||||
+ CARD8 minorVersion;
|
||||
+ CARD16 pad B16;
|
||||
+} xSyncInitializeReq;
|
||||
+#define sz_xSyncInitializeReq 8
|
||||
+
|
||||
+typedef struct {
|
||||
+ BYTE type;
|
||||
+ CARD8 unused;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ CARD32 length B32;
|
||||
+ CARD8 majorVersion;
|
||||
+ CARD8 minorVersion;
|
||||
+ CARD16 pad B16;
|
||||
+ CARD32 pad0 B32;
|
||||
+ CARD32 pad1 B32;
|
||||
+ CARD32 pad2 B32;
|
||||
+ CARD32 pad3 B32;
|
||||
+ CARD32 pad4 B32;
|
||||
+} xSyncInitializeReply;
|
||||
+#define sz_xSyncInitializeReply 32
|
||||
+
|
||||
+/*
|
||||
+ * ListSystemCounters
|
||||
+ */
|
||||
+typedef struct _xSyncListSystemCounters
|
||||
+{
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+} xSyncListSystemCountersReq;
|
||||
+#define sz_xSyncListSystemCountersReq 4
|
||||
+
|
||||
+typedef struct {
|
||||
+ BYTE type;
|
||||
+ CARD8 unused;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ CARD32 length B32;
|
||||
+ INT32 nCounters B32;
|
||||
+ CARD32 pad0 B32;
|
||||
+ CARD32 pad1 B32;
|
||||
+ CARD32 pad2 B32;
|
||||
+ CARD32 pad3 B32;
|
||||
+ CARD32 pad4 B32;
|
||||
+} xSyncListSystemCountersReply;
|
||||
+#define sz_xSyncListSystemCountersReply 32
|
||||
+
|
||||
+typedef struct {
|
||||
+ XSyncCounter counter B32;
|
||||
+ INT32 resolution_hi B32;
|
||||
+ CARD32 resolution_lo B32;
|
||||
+ CARD16 name_length B16;
|
||||
+} xSyncSystemCounter;
|
||||
+#define sz_xSyncSystemCounter 14
|
||||
+
|
||||
+/*
|
||||
+ * Create Counter
|
||||
+ */
|
||||
+typedef struct _xSyncCreateCounterReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncCounter cid B32;
|
||||
+ INT32 initial_value_hi B32;
|
||||
+ CARD32 initial_value_lo B32;
|
||||
+} xSyncCreateCounterReq;
|
||||
+#define sz_xSyncCreateCounterReq 16
|
||||
+
|
||||
+/*
|
||||
+ * Change Counter
|
||||
+ */
|
||||
+typedef struct _xSyncChangeCounterReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncCounter cid B32;
|
||||
+ INT32 value_hi B32;
|
||||
+ CARD32 value_lo B32;
|
||||
+} xSyncChangeCounterReq;
|
||||
+#define sz_xSyncChangeCounterReq 16
|
||||
+
|
||||
+/*
|
||||
+ * Set Counter
|
||||
+ */
|
||||
+typedef struct _xSyncSetCounterReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncCounter cid B32;
|
||||
+ INT32 value_hi B32;
|
||||
+ CARD32 value_lo B32;
|
||||
+} xSyncSetCounterReq;
|
||||
+#define sz_xSyncSetCounterReq 16
|
||||
+
|
||||
+/*
|
||||
+ * Destroy Counter
|
||||
+ */
|
||||
+typedef struct _xSyncDestroyCounterReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncCounter counter B32;
|
||||
+} xSyncDestroyCounterReq;
|
||||
+#define sz_xSyncDestroyCounterReq 8
|
||||
+
|
||||
+/*
|
||||
+ * Query Counter
|
||||
+ */
|
||||
+typedef struct _xSyncQueryCounterReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncCounter counter B32;
|
||||
+} xSyncQueryCounterReq;
|
||||
+#define sz_xSyncQueryCounterReq 8
|
||||
+
|
||||
+
|
||||
+typedef struct {
|
||||
+ BYTE type;
|
||||
+ CARD8 unused;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ CARD32 length B32;
|
||||
+ INT32 value_hi B32;
|
||||
+ CARD32 value_lo B32;
|
||||
+ CARD32 pad0 B32;
|
||||
+ CARD32 pad1 B32;
|
||||
+ CARD32 pad2 B32;
|
||||
+ CARD32 pad3 B32;
|
||||
+} xSyncQueryCounterReply;
|
||||
+#define sz_xSyncQueryCounterReply 32
|
||||
+
|
||||
+/*
|
||||
+ * Await
|
||||
+ */
|
||||
+typedef struct _xSyncAwaitReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+} xSyncAwaitReq;
|
||||
+#define sz_xSyncAwaitReq 4
|
||||
+
|
||||
+typedef struct _xSyncWaitCondition {
|
||||
+ XSyncCounter counter B32;
|
||||
+ CARD32 value_type B32;
|
||||
+ INT32 wait_value_hi B32;
|
||||
+ CARD32 wait_value_lo B32;
|
||||
+ CARD32 test_type B32;
|
||||
+ INT32 event_threshold_hi B32;
|
||||
+ CARD32 event_threshold_lo B32;
|
||||
+} xSyncWaitCondition;
|
||||
+#define sz_xSyncWaitCondition 28
|
||||
+
|
||||
+/*
|
||||
+ * Create Alarm
|
||||
+ */
|
||||
+typedef struct _xSyncCreateAlarmReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncAlarm id B32;
|
||||
+ CARD32 valueMask B32;
|
||||
+} xSyncCreateAlarmReq;
|
||||
+#define sz_xSyncCreateAlarmReq 12
|
||||
+
|
||||
+/*
|
||||
+ * Destroy Alarm
|
||||
+ */
|
||||
+typedef struct _xSyncDestroyAlarmReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncAlarm alarm B32;
|
||||
+} xSyncDestroyAlarmReq;
|
||||
+#define sz_xSyncDestroyAlarmReq 8
|
||||
+
|
||||
+/*
|
||||
+ * Query Alarm
|
||||
+ */
|
||||
+typedef struct _xSyncQueryAlarmReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncAlarm alarm B32;
|
||||
+} xSyncQueryAlarmReq;
|
||||
+#define sz_xSyncQueryAlarmReq 8
|
||||
+
|
||||
+typedef struct {
|
||||
+ BYTE type;
|
||||
+ CARD8 unused;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ CARD32 length B32;
|
||||
+ XSyncCounter counter B32;
|
||||
+ CARD32 value_type B32;
|
||||
+ INT32 wait_value_hi B32;
|
||||
+ CARD32 wait_value_lo B32;
|
||||
+ CARD32 test_type B32;
|
||||
+ INT32 delta_hi B32;
|
||||
+ CARD32 delta_lo B32;
|
||||
+ BOOL events;
|
||||
+ BYTE state;
|
||||
+ BYTE pad0;
|
||||
+ BYTE pad1;
|
||||
+} xSyncQueryAlarmReply;
|
||||
+#define sz_xSyncQueryAlarmReply 40
|
||||
+
|
||||
+/*
|
||||
+ * Change Alarm
|
||||
+ */
|
||||
+typedef struct _xSyncChangeAlarmReq {
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ XSyncAlarm alarm B32;
|
||||
+ CARD32 valueMask B32;
|
||||
+} xSyncChangeAlarmReq;
|
||||
+#define sz_xSyncChangeAlarmReq 12
|
||||
+
|
||||
+/*
|
||||
+ * SetPriority
|
||||
+ */
|
||||
+typedef struct _xSyncSetPriority{
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ CARD32 id B32;
|
||||
+ INT32 priority B32;
|
||||
+} xSyncSetPriorityReq;
|
||||
+#define sz_xSyncSetPriorityReq 12
|
||||
+
|
||||
+/*
|
||||
+ * Get Priority
|
||||
+ */
|
||||
+typedef struct _xSyncGetPriority{
|
||||
+ CARD8 reqType;
|
||||
+ CARD8 syncReqType;
|
||||
+ CARD16 length B16;
|
||||
+ CARD32 id B32; /*XXX XID? */
|
||||
+} xSyncGetPriorityReq;
|
||||
+#define sz_xSyncGetPriorityReq 8
|
||||
+
|
||||
+typedef struct {
|
||||
+ BYTE type;
|
||||
+ CARD8 unused;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ CARD32 length B32;
|
||||
+ INT32 priority B32;
|
||||
+ CARD32 pad0 B32;
|
||||
+ CARD32 pad1 B32;
|
||||
+ CARD32 pad2 B32;
|
||||
+ CARD32 pad3 B32;
|
||||
+ CARD32 pad4 B32;
|
||||
+} xSyncGetPriorityReply;
|
||||
+#define sz_xSyncGetPriorityReply 32
|
||||
+
|
||||
+/*
|
||||
+ * Events
|
||||
+ */
|
||||
+
|
||||
+typedef struct _xSyncCounterNotifyEvent {
|
||||
+ BYTE type;
|
||||
+ BYTE kind;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ XSyncCounter counter B32;
|
||||
+ INT32 wait_value_hi B32;
|
||||
+ CARD32 wait_value_lo B32;
|
||||
+ INT32 counter_value_hi B32;
|
||||
+ CARD32 counter_value_lo B32;
|
||||
+ CARD32 time B32;
|
||||
+ CARD16 count B16;
|
||||
+ BOOL destroyed;
|
||||
+ BYTE pad0;
|
||||
+} xSyncCounterNotifyEvent;
|
||||
+
|
||||
+typedef struct _xSyncAlarmNotifyEvent {
|
||||
+ BYTE type;
|
||||
+ BYTE kind;
|
||||
+ CARD16 sequenceNumber B16;
|
||||
+ XSyncAlarm alarm B32;
|
||||
+ INT32 counter_value_hi B32;
|
||||
+ CARD32 counter_value_lo B32;
|
||||
+ INT32 alarm_value_hi B32;
|
||||
+ CARD32 alarm_value_lo B32;
|
||||
+ CARD32 time B32;
|
||||
+ CARD8 state;
|
||||
+ BYTE pad0;
|
||||
+ BYTE pad1;
|
||||
+ BYTE pad2;
|
||||
+} xSyncAlarmNotifyEvent;
|
||||
+
|
||||
+#undef XSyncCounter
|
||||
+#undef XSyncAlarm
|
||||
+
|
||||
+#endif /* _SYNC_OS */
|
||||
+
|
||||
+#ifdef _SYNC_SERVER
|
||||
+
|
||||
+#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
|
||||
+
|
||||
+typedef struct _SyncCounter {
|
||||
+ ClientPtr client; /* Owning client. 0 for system counters */
|
||||
+ XSyncCounter id; /* resource ID */
|
||||
+ CARD64 value; /* counter value */
|
||||
+ struct _SyncTriggerList *pTriglist; /* list of triggers */
|
||||
+ Bool beingDestroyed; /* in process of going away */
|
||||
+ struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
|
||||
+} SyncCounter;
|
||||
+
|
||||
+/*
|
||||
+ * The System Counter interface
|
||||
+ */
|
||||
+
|
||||
+typedef enum {
|
||||
+ XSyncCounterNeverChanges,
|
||||
+ XSyncCounterNeverIncreases,
|
||||
+ XSyncCounterNeverDecreases,
|
||||
+ XSyncCounterUnrestricted
|
||||
+} SyncCounterType;
|
||||
+
|
||||
+typedef struct _SysCounterInfo {
|
||||
+ char *name;
|
||||
+ CARD64 resolution;
|
||||
+ CARD64 bracket_greater;
|
||||
+ CARD64 bracket_less;
|
||||
+ SyncCounterType counterType; /* how can this counter change */
|
||||
+ void (*QueryValue)(
|
||||
+ pointer /*pCounter*/,
|
||||
+ CARD64 * /*freshvalue*/
|
||||
+);
|
||||
+ void (*BracketValues)(
|
||||
+ pointer /*pCounter*/,
|
||||
+ CARD64 * /*lessthan*/,
|
||||
+ CARD64 * /*greaterthan*/
|
||||
+);
|
||||
+} SysCounterInfo;
|
||||
+
|
||||
+
|
||||
+
|
||||
+typedef struct _SyncTrigger {
|
||||
+ SyncCounter *pCounter;
|
||||
+ CARD64 wait_value; /* wait value */
|
||||
+ unsigned int value_type; /* Absolute or Relative */
|
||||
+ unsigned int test_type; /* transition or Comparision type */
|
||||
+ CARD64 test_value; /* trigger event threshold value */
|
||||
+ Bool (*CheckTrigger)(
|
||||
+ struct _SyncTrigger * /*pTrigger*/,
|
||||
+ CARD64 /*newval*/
|
||||
+ );
|
||||
+ void (*TriggerFired)(
|
||||
+ struct _SyncTrigger * /*pTrigger*/
|
||||
+ );
|
||||
+ void (*CounterDestroyed)(
|
||||
+ struct _SyncTrigger * /*pTrigger*/
|
||||
+ );
|
||||
+} SyncTrigger;
|
||||
+
|
||||
+typedef struct _SyncTriggerList {
|
||||
+ SyncTrigger *pTrigger;
|
||||
+ struct _SyncTriggerList *next;
|
||||
+} SyncTriggerList;
|
||||
+
|
||||
+typedef struct _SyncAlarmClientList {
|
||||
+ ClientPtr client;
|
||||
+ XID delete_id;
|
||||
+ struct _SyncAlarmClientList *next;
|
||||
+} SyncAlarmClientList;
|
||||
+
|
||||
+typedef struct _SyncAlarm {
|
||||
+ SyncTrigger trigger;
|
||||
+ ClientPtr client;
|
||||
+ XSyncAlarm alarm_id;
|
||||
+ CARD64 delta;
|
||||
+ int events;
|
||||
+ int state;
|
||||
+ SyncAlarmClientList *pEventClients;
|
||||
+} SyncAlarm;
|
||||
+
|
||||
+typedef struct {
|
||||
+ ClientPtr client;
|
||||
+ CARD32 delete_id;
|
||||
+ int num_waitconditions;
|
||||
+} SyncAwaitHeader;
|
||||
+
|
||||
+typedef struct {
|
||||
+ SyncTrigger trigger;
|
||||
+ CARD64 event_threshold;
|
||||
+ SyncAwaitHeader *pHeader;
|
||||
+} SyncAwait;
|
||||
+
|
||||
+typedef union {
|
||||
+ SyncAwaitHeader header;
|
||||
+ SyncAwait await;
|
||||
+} SyncAwaitUnion;
|
||||
+
|
||||
+
|
||||
+extern pointer SyncCreateSystemCounter(
|
||||
+ char * /* name */,
|
||||
+ CARD64 /* inital_value */,
|
||||
+ CARD64 /* resolution */,
|
||||
+ SyncCounterType /* change characterization */,
|
||||
+ void (* /*QueryValue*/ ) (
|
||||
+ pointer /* pCounter */,
|
||||
+ CARD64 * /* pValue_return */), /* XXX prototype */
|
||||
+ void (* /*BracketValues*/) (
|
||||
+ pointer /* pCounter */,
|
||||
+ CARD64 * /* pbracket_less */,
|
||||
+ CARD64 * /* pbracket_greater */)
|
||||
+);
|
||||
+
|
||||
+extern void SyncChangeCounter(
|
||||
+ SyncCounter * /* pCounter*/,
|
||||
+ CARD64 /* new_value */
|
||||
+);
|
||||
+
|
||||
+extern void SyncDestroySystemCounter(
|
||||
+ pointer pCounter
|
||||
+);
|
||||
+extern void InitServertime(void);
|
||||
+
|
||||
+#endif /* _SYNC_SERVER */
|
||||
+
|
||||
+#endif /* _SYNCSTR_H_ */
|
||||
|
|
@ -1,474 +0,0 @@
|
|||
$NetBSD: patch-bj,v 1.4 2011/10/13 15:30:18 makoto Exp $
|
||||
|
||||
--- /dev/null 2010-03-23 17:10:01.000000000 +0000
|
||||
+++ Xext/sync_old.h
|
||||
@@ -0,0 +1,469 @@
|
||||
+/* $Xorg: sync.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
|
||||
+/*
|
||||
+
|
||||
+Copyright 1991, 1993, 1994, 1998 The Open Group
|
||||
+
|
||||
+Permission to use, copy, modify, distribute, and sell this software and its
|
||||
+documentation for any purpose is hereby granted without fee, provided that
|
||||
+the above copyright notice appear in all copies and that both that
|
||||
+copyright notice and this permission notice appear in supporting
|
||||
+documentation.
|
||||
+
|
||||
+The above copyright notice and this permission notice shall be included in
|
||||
+all copies or substantial portions of the Software.
|
||||
+
|
||||
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
+
|
||||
+Except as contained in this notice, the name of The Open Group shall not be
|
||||
+used in advertising or otherwise to promote the sale, use or other dealings
|
||||
+in this Software without prior written authorization from The Open Group.
|
||||
+
|
||||
+*/
|
||||
+
|
||||
+/***********************************************************
|
||||
+Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
|
||||
+and Olivetti Research Limited, Cambridge, England.
|
||||
+
|
||||
+ All Rights Reserved
|
||||
+
|
||||
+Permission to use, copy, modify, and distribute this software and its
|
||||
+documentation for any purpose and without fee is hereby granted,
|
||||
+provided that the above copyright notice appear in all copies and that
|
||||
+both that copyright notice and this permission notice appear in
|
||||
+supporting documentation, and that the names of Digital or Olivetti
|
||||
+not be used in advertising or publicity pertaining to distribution of the
|
||||
+software without specific, written prior permission.
|
||||
+
|
||||
+DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
||||
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
+FITNESS, IN NO EVENT SHALL THEY BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
|
||||
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
+PERFORMANCE OF THIS SOFTWARE.
|
||||
+
|
||||
+******************************************************************/
|
||||
+/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
|
||||
+
|
||||
+#ifndef _SYNC_H_
|
||||
+#define _SYNC_H_
|
||||
+
|
||||
+#include <X11/Xfuncproto.h>
|
||||
+
|
||||
+_XFUNCPROTOBEGIN
|
||||
+
|
||||
+#define SYNC_NAME "SYNC"
|
||||
+
|
||||
+#define SYNC_MAJOR_VERSION 3
|
||||
+#define SYNC_MINOR_VERSION 0
|
||||
+
|
||||
+#define X_SyncInitialize 0
|
||||
+#define X_SyncListSystemCounters 1
|
||||
+#define X_SyncCreateCounter 2
|
||||
+#define X_SyncSetCounter 3
|
||||
+#define X_SyncChangeCounter 4
|
||||
+#define X_SyncQueryCounter 5
|
||||
+#define X_SyncDestroyCounter 6
|
||||
+#define X_SyncAwait 7
|
||||
+#define X_SyncCreateAlarm 8
|
||||
+#define X_SyncChangeAlarm 9
|
||||
+#define X_SyncQueryAlarm 10
|
||||
+#define X_SyncDestroyAlarm 11
|
||||
+#define X_SyncSetPriority 12
|
||||
+#define X_SyncGetPriority 13
|
||||
+
|
||||
+#define XSyncCounterNotify 0
|
||||
+#define XSyncAlarmNotify 1
|
||||
+#define XSyncAlarmNotifyMask (1L << XSyncAlarmNotify)
|
||||
+
|
||||
+#define XSyncNumberEvents 2L
|
||||
+
|
||||
+#define XSyncBadCounter 0L
|
||||
+#define XSyncBadAlarm 1L
|
||||
+#define XSyncNumberErrors (XSyncBadAlarm + 1)
|
||||
+
|
||||
+/*
|
||||
+ * Flags for Alarm Attributes
|
||||
+ */
|
||||
+#define XSyncCACounter (1L<<0)
|
||||
+#define XSyncCAValueType (1L<<1)
|
||||
+#define XSyncCAValue (1L<<2)
|
||||
+#define XSyncCATestType (1L<<3)
|
||||
+#define XSyncCADelta (1L<<4)
|
||||
+#define XSyncCAEvents (1L<<5)
|
||||
+
|
||||
+/*
|
||||
+ * Constants for the value_type argument of various requests
|
||||
+ */
|
||||
+typedef enum {
|
||||
+ XSyncAbsolute,
|
||||
+ XSyncRelative
|
||||
+} XSyncValueType;
|
||||
+
|
||||
+/*
|
||||
+ * Alarm Test types
|
||||
+ */
|
||||
+typedef enum {
|
||||
+ XSyncPositiveTransition,
|
||||
+ XSyncNegativeTransition,
|
||||
+ XSyncPositiveComparison,
|
||||
+ XSyncNegativeComparison
|
||||
+} XSyncTestType;
|
||||
+
|
||||
+/*
|
||||
+ * Alarm state constants
|
||||
+ */
|
||||
+typedef enum {
|
||||
+ XSyncAlarmActive,
|
||||
+ XSyncAlarmInactive,
|
||||
+ XSyncAlarmDestroyed
|
||||
+} XSyncAlarmState;
|
||||
+
|
||||
+
|
||||
+typedef XID XSyncCounter;
|
||||
+typedef XID XSyncAlarm;
|
||||
+typedef struct _XSyncValue {
|
||||
+ int hi;
|
||||
+ unsigned int lo;
|
||||
+} XSyncValue;
|
||||
+
|
||||
+/*
|
||||
+ * Macros/functions for manipulating 64 bit values
|
||||
+ */
|
||||
+
|
||||
+/* have to put these prototypes before the corresponding macro definitions */
|
||||
+
|
||||
+extern void XSyncIntToValue(
|
||||
+ XSyncValue* /*pv*/,
|
||||
+ int /*i*/
|
||||
+);
|
||||
+
|
||||
+extern void XSyncIntsToValue(
|
||||
+ XSyncValue* /*pv*/,
|
||||
+ unsigned int /*l*/,
|
||||
+ int /*h*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueGreaterThan(
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueLessThan(
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueGreaterOrEqual(
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueLessOrEqual(
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueEqual(
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueIsNegative(
|
||||
+ XSyncValue /*v*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueIsZero(
|
||||
+ XSyncValue /*a*/
|
||||
+);
|
||||
+
|
||||
+extern Bool XSyncValueIsPositive(
|
||||
+ XSyncValue /*v*/
|
||||
+);
|
||||
+
|
||||
+extern unsigned int XSyncValueLow32(
|
||||
+ XSyncValue /*v*/
|
||||
+);
|
||||
+
|
||||
+extern int XSyncValueHigh32(
|
||||
+ XSyncValue /*v*/
|
||||
+);
|
||||
+
|
||||
+extern void XSyncValueAdd(
|
||||
+ XSyncValue* /*presult*/,
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/,
|
||||
+ int* /*poverflow*/
|
||||
+);
|
||||
+
|
||||
+extern void XSyncValueSubtract(
|
||||
+ XSyncValue* /*presult*/,
|
||||
+ XSyncValue /*a*/,
|
||||
+ XSyncValue /*b*/,
|
||||
+ int* /*poverflow*/
|
||||
+);
|
||||
+
|
||||
+extern void XSyncMaxValue(
|
||||
+ XSyncValue* /*pv*/
|
||||
+);
|
||||
+
|
||||
+extern void XSyncMinValue(
|
||||
+ XSyncValue* /*pv*/
|
||||
+);
|
||||
+
|
||||
+_XFUNCPROTOEND
|
||||
+
|
||||
+/* The _XSync macros below are for library internal use only. They exist
|
||||
+ * so that if we have to make a fix, we can change it in this one place
|
||||
+ * and have both the macro and function variants inherit the fix.
|
||||
+ */
|
||||
+
|
||||
+#define _XSyncIntToValue(pv, i) ((pv)->hi=((i<0)?~0:0),(pv)->lo=(i))
|
||||
+#define _XSyncIntsToValue(pv, l, h) ((pv)->lo = (l), (pv)->hi = (h))
|
||||
+#define _XSyncValueGreaterThan(a, b)\
|
||||
+ ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>(b).lo))
|
||||
+#define _XSyncValueLessThan(a, b)\
|
||||
+ ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<(b).lo))
|
||||
+#define _XSyncValueGreaterOrEqual(a, b)\
|
||||
+ ((a).hi>(b).hi || ((a).hi==(b).hi && (a).lo>=(b).lo))
|
||||
+#define _XSyncValueLessOrEqual(a, b)\
|
||||
+ ((a).hi<(b).hi || ((a).hi==(b).hi && (a).lo<=(b).lo))
|
||||
+#define _XSyncValueEqual(a, b) ((a).lo==(b).lo && (a).hi==(b).hi)
|
||||
+#define _XSyncValueIsNegative(v) (((v).hi & 0x80000000) ? 1 : 0)
|
||||
+#define _XSyncValueIsZero(a) ((a).lo==0 && (a).hi==0)
|
||||
+#define _XSyncValueIsPositive(v) (((v).hi & 0x80000000) ? 0 : 1)
|
||||
+#define _XSyncValueLow32(v) ((v).lo)
|
||||
+#define _XSyncValueHigh32(v) ((v).hi)
|
||||
+#define _XSyncValueAdd(presult,a,b,poverflow) {\
|
||||
+ int t = (a).lo;\
|
||||
+ Bool signa = XSyncValueIsNegative(a);\
|
||||
+ Bool signb = XSyncValueIsNegative(b);\
|
||||
+ ((presult)->lo = (a).lo + (b).lo);\
|
||||
+ ((presult)->hi = (a).hi + (b).hi);\
|
||||
+ if (t>(presult)->lo) (presult)->hi++;\
|
||||
+ *poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
|
||||
+ }
|
||||
+#define _XSyncValueSubtract(presult,a,b,poverflow) {\
|
||||
+ int t = (a).lo;\
|
||||
+ Bool signa = XSyncValueIsNegative(a);\
|
||||
+ Bool signb = XSyncValueIsNegative(b);\
|
||||
+ ((presult)->lo = (a).lo - (b).lo);\
|
||||
+ ((presult)->hi = (a).hi - (b).hi);\
|
||||
+ if (t>(presult)->lo) (presult)->hi--;\
|
||||
+ *poverflow = ((signa == signb) && !(signa == XSyncValueIsNegative(*presult)));\
|
||||
+ }
|
||||
+#define _XSyncMaxValue(pv) ((pv)->hi = 0x7fffffff, (pv)->lo = 0xffffffff)
|
||||
+#define _XSyncMinValue(pv) ((pv)->hi = 0x80000000, (pv)->lo = 0)
|
||||
+
|
||||
+/*
|
||||
+ * These are the publically usable macros. If you want the function version
|
||||
+ * of one of these, just #undef the macro to uncover the function.
|
||||
+ * (This is the same convention that the ANSI C library uses.)
|
||||
+ */
|
||||
+
|
||||
+#define XSyncIntToValue(pv, i) _XSyncIntToValue(pv, i)
|
||||
+#define XSyncIntsToValue(pv, l, h) _XSyncIntsToValue(pv, l, h)
|
||||
+#define XSyncValueGreaterThan(a, b) _XSyncValueGreaterThan(a, b)
|
||||
+#define XSyncValueLessThan(a, b) _XSyncValueLessThan(a, b)
|
||||
+#define XSyncValueGreaterOrEqual(a, b) _XSyncValueGreaterOrEqual(a, b)
|
||||
+#define XSyncValueLessOrEqual(a, b) _XSyncValueLessOrEqual(a, b)
|
||||
+#define XSyncValueEqual(a, b) _XSyncValueEqual(a, b)
|
||||
+#define XSyncValueIsNegative(v) _XSyncValueIsNegative(v)
|
||||
+#define XSyncValueIsZero(a) _XSyncValueIsZero(a)
|
||||
+#define XSyncValueIsPositive(v) _XSyncValueIsPositive(v)
|
||||
+#define XSyncValueLow32(v) _XSyncValueLow32(v)
|
||||
+#define XSyncValueHigh32(v) _XSyncValueHigh32(v)
|
||||
+#define XSyncValueAdd(presult,a,b,poverflow) _XSyncValueAdd(presult,a,b,poverflow)
|
||||
+#define XSyncValueSubtract(presult,a,b,poverflow) _XSyncValueSubtract(presult,a,b,poverflow)
|
||||
+#define XSyncMaxValue(pv) _XSyncMaxValue(pv)
|
||||
+#define XSyncMinValue(pv) _XSyncMinValue(pv)
|
||||
+
|
||||
+#ifndef _SYNC_SERVER
|
||||
+
|
||||
+typedef struct _XSyncSystemCounter {
|
||||
+ char *name; /* null-terminated name of system counter */
|
||||
+ XSyncCounter counter; /* counter id of this system counter */
|
||||
+ XSyncValue resolution; /* resolution of this system counter */
|
||||
+} XSyncSystemCounter;
|
||||
+
|
||||
+
|
||||
+typedef struct {
|
||||
+ XSyncCounter counter; /* counter to trigger on */
|
||||
+ XSyncValueType value_type; /* absolute/relative */
|
||||
+ XSyncValue wait_value; /* value to compare counter to */
|
||||
+ XSyncTestType test_type; /* pos/neg comparison/transtion */
|
||||
+} XSyncTrigger;
|
||||
+
|
||||
+typedef struct {
|
||||
+ XSyncTrigger trigger; /* trigger for await */
|
||||
+ XSyncValue event_threshold; /* send event if past threshold */
|
||||
+} XSyncWaitCondition;
|
||||
+
|
||||
+
|
||||
+typedef struct {
|
||||
+ XSyncTrigger trigger;
|
||||
+ XSyncValue delta;
|
||||
+ Bool events;
|
||||
+ XSyncAlarmState state;
|
||||
+} XSyncAlarmAttributes;
|
||||
+
|
||||
+/*
|
||||
+ * Events
|
||||
+ */
|
||||
+
|
||||
+typedef struct {
|
||||
+ int type; /* event base + XSyncCounterNotify */
|
||||
+ unsigned long serial; /* # of last request processed by server */
|
||||
+ Bool send_event; /* true if this came from a SendEvent request */
|
||||
+ Display *display; /* Display the event was read from */
|
||||
+ XSyncCounter counter; /* counter involved in await */
|
||||
+ XSyncValue wait_value; /* value being waited for */
|
||||
+ XSyncValue counter_value; /* counter value when this event was sent */
|
||||
+ Time time; /* milliseconds */
|
||||
+ int count; /* how many more events to come */
|
||||
+ Bool destroyed; /* True if counter was destroyed */
|
||||
+} XSyncCounterNotifyEvent;
|
||||
+
|
||||
+typedef struct {
|
||||
+ int type; /* event base + XSyncCounterNotify */
|
||||
+ unsigned long serial; /* # of last request processed by server */
|
||||
+ Bool send_event; /* true if this came from a SendEvent request */
|
||||
+ Display *display; /* Display the event was read from */
|
||||
+ XSyncAlarm alarm; /* alarm that triggered */
|
||||
+ XSyncValue counter_value; /* value that triggered the alarm */
|
||||
+ XSyncValue alarm_value; /* test value of trigger in alarm */
|
||||
+ Time time; /* milliseconds */
|
||||
+ XSyncAlarmState state; /* new state of alarm */
|
||||
+} XSyncAlarmNotifyEvent;
|
||||
+
|
||||
+/*
|
||||
+ * Errors
|
||||
+ */
|
||||
+
|
||||
+typedef struct {
|
||||
+ int type;
|
||||
+ Display *display; /* Display the event was read from */
|
||||
+ XSyncAlarm alarm; /* resource id */
|
||||
+ unsigned long serial; /* serial number of failed request */
|
||||
+ unsigned char error_code; /* error base + XSyncBadAlarm */
|
||||
+ unsigned char request_code; /* Major op-code of failed request */
|
||||
+ unsigned char minor_code; /* Minor op-code of failed request */
|
||||
+} XSyncAlarmError;
|
||||
+
|
||||
+typedef struct {
|
||||
+ int type;
|
||||
+ Display *display; /* Display the event was read from */
|
||||
+ XSyncCounter counter; /* resource id */
|
||||
+ unsigned long serial; /* serial number of failed request */
|
||||
+ unsigned char error_code; /* error base + XSyncBadCounter */
|
||||
+ unsigned char request_code; /* Major op-code of failed request */
|
||||
+ unsigned char minor_code; /* Minor op-code of failed request */
|
||||
+} XSyncCounterError;
|
||||
+
|
||||
+/*
|
||||
+ * Prototypes
|
||||
+ */
|
||||
+
|
||||
+_XFUNCPROTOBEGIN
|
||||
+
|
||||
+extern Status XSyncQueryExtension(
|
||||
+ Display* /*dpy*/,
|
||||
+ int* /*event_base_return*/,
|
||||
+ int* /*error_base_return*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncInitialize(
|
||||
+ Display* /*dpy*/,
|
||||
+ int* /*major_version_return*/,
|
||||
+ int* /*minor_version_return*/
|
||||
+);
|
||||
+
|
||||
+extern XSyncSystemCounter *XSyncListSystemCounters(
|
||||
+ Display* /*dpy*/,
|
||||
+ int* /*n_counters_return*/
|
||||
+);
|
||||
+
|
||||
+extern void XSyncFreeSystemCounterList(
|
||||
+ XSyncSystemCounter* /*list*/
|
||||
+);
|
||||
+
|
||||
+extern XSyncCounter XSyncCreateCounter(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncValue /*initial_value*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncSetCounter(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncCounter /*counter*/,
|
||||
+ XSyncValue /*value*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncChangeCounter(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncCounter /*counter*/,
|
||||
+ XSyncValue /*value*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncDestroyCounter(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncCounter /*counter*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncQueryCounter(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncCounter /*counter*/,
|
||||
+ XSyncValue* /*value_return*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncAwait(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncWaitCondition* /*wait_list*/,
|
||||
+ int /*n_conditions*/
|
||||
+);
|
||||
+
|
||||
+extern XSyncAlarm XSyncCreateAlarm(
|
||||
+ Display* /*dpy*/,
|
||||
+ unsigned long /*values_mask*/,
|
||||
+ XSyncAlarmAttributes* /*values*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncDestroyAlarm(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncAlarm /*alarm*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncQueryAlarm(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncAlarm /*alarm*/,
|
||||
+ XSyncAlarmAttributes* /*values_return*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncChangeAlarm(
|
||||
+ Display* /*dpy*/,
|
||||
+ XSyncAlarm /*alarm*/,
|
||||
+ unsigned long /*values_mask*/,
|
||||
+ XSyncAlarmAttributes* /*values*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncSetPriority(
|
||||
+ Display* /*dpy*/,
|
||||
+ XID /*client_resource_id*/,
|
||||
+ int /*priority*/
|
||||
+);
|
||||
+
|
||||
+extern Status XSyncGetPriority(
|
||||
+ Display* /*dpy*/,
|
||||
+ XID /*client_resource_id*/,
|
||||
+ int* /*return_priority*/
|
||||
+);
|
||||
+
|
||||
+#endif /* _SYNC_SERVER */
|
||||
+
|
||||
+_XFUNCPROTOEND
|
||||
+
|
||||
+#endif /* _SYNC_H_ */
|
||||
14
modular-xorg-server/patches/patch-configure
Normal file
14
modular-xorg-server/patches/patch-configure
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-configure,v 1.1 2013/08/16 11:47:36 makoto Exp $
|
||||
|
||||
Allow x86_64 as a SunOS arch.
|
||||
--- configure.orig 2009-10-12 05:04:15.000000000 +0000
|
||||
+++ configure
|
||||
@@ -18293,7 +18293,7 @@ fi
|
||||
sparc*)
|
||||
SOLARIS_INOUT_ARCH="sparcv8plus"
|
||||
;;
|
||||
- i*86)
|
||||
+ i*86|x86_64)
|
||||
if test x$SOLARIS_64 = xyes ; then
|
||||
SOLARIS_INOUT_ARCH="amd64"
|
||||
else
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
$NetBSD: patch-hw_xfree86_common_compiler.h,v 1.1 2013/08/16 11:47:36 makoto Exp $
|
||||
|
||||
--- hw/xfree86/common/compiler.h.orig 2013-05-21 17:33:57.000000000 +0000
|
||||
+++ hw/xfree86/common/compiler.h
|
||||
@@ -1392,26 +1392,26 @@ inl(unsigned short port)
|
||||
static __inline__ void
|
||||
outb(unsigned short port, unsigned char val)
|
||||
{
|
||||
- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
|
||||
+ __asm__ __volatile__("outb %0, %1"::"a"(val), "d"(port));
|
||||
}
|
||||
|
||||
static __inline__ void
|
||||
outw(unsigned short port, unsigned short val)
|
||||
{
|
||||
- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
|
||||
+ __asm__ __volatile__("outw %0, %1"::"a"(val), "d"(port));
|
||||
}
|
||||
|
||||
static __inline__ void
|
||||
outl(unsigned short port, unsigned int val)
|
||||
{
|
||||
- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
|
||||
+ __asm__ __volatile__("outl %0, %1"::"a"(val), "d"(port));
|
||||
}
|
||||
|
||||
static __inline__ unsigned int
|
||||
inb(unsigned short port)
|
||||
{
|
||||
unsigned char ret;
|
||||
- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
|
||||
+ __asm__ __volatile__("inb %1, %0":"=a"(ret):"d"(port));
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1420,7 +1420,7 @@ static __inline__ unsigned int
|
||||
inw(unsigned short port)
|
||||
{
|
||||
unsigned short ret;
|
||||
- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
|
||||
+ __asm__ __volatile__("inw %1, %0":"=a"(ret):"d"(port));
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1429,7 +1429,7 @@ static __inline__ unsigned int
|
||||
inl(unsigned short port)
|
||||
{
|
||||
unsigned int ret;
|
||||
- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
|
||||
+ __asm__ __volatile__("inl %1, %0":"=a"(ret):"d"(port));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-hw_xfree86_os-support_xf86__OSlib.h,v 1.1 2013/08/16 11:47:36 makoto Exp $
|
||||
|
||||
* treat DragonFly same as newer FreeBSD.
|
||||
|
||||
--- hw/xfree86/os-support/xf86_OSlib.h.orig 2012-05-17 17:09:03.000000000 +0000
|
||||
+++ hw/xfree86/os-support/xf86_OSlib.h
|
||||
@@ -277,7 +277,7 @@ struct pcvtid {
|
||||
#include <dev/wscons/wsdisplay_usl_io.h>
|
||||
#endif /* WSCONS_SUPPORT */
|
||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
|
||||
-#if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
|
||||
+#if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013) || defined(__DragonFly__)
|
||||
#include <sys/mouse.h>
|
||||
#else
|
||||
#undef MOUSE_GETINFO
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD: patch-sb,v 1.1.1.1 2011/10/13 14:57:02 makoto Exp $
|
||||
|
||||
|
||||
--- hw/xfree86/common/xf86Configure.c.orig 2011-08-01 08:44:54.000000000 +0900
|
||||
+++ hw/xfree86/common/xf86Configure.c 2011-10-13 20:09:35.000000000 +0900
|
||||
@@ -90,7 +90,7 @@
|
||||
case BUS_PCI:
|
||||
ret = xf86PciConfigure(busData, DevToConfig[i].pVideo);
|
||||
break;
|
||||
-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
|
||||
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
||||
case BUS_SBUS:
|
||||
ret = xf86SbusConfigure(busData, DevToConfig[i].sVideo);
|
||||
break;
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
$NetBSD: patch-sd,v 1.1.1.1 2011/10/13 14:57:02 makoto Exp $
|
||||
|
||||
Temporary disable Sbus suport.
|
||||
|
||||
--- hw/xfree86/common/xf86Bus.c.orig 2011-03-02 13:09:32.000000000 +0900
|
||||
+++ hw/xfree86/common/xf86Bus.c 2011-10-13 20:32:01.000000000 +0900
|
||||
@@ -196,7 +196,7 @@
|
||||
xf86BusProbe(void)
|
||||
{
|
||||
xf86PciProbe();
|
||||
-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
|
||||
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
||||
xf86SbusProbe();
|
||||
#endif
|
||||
}
|
||||
@@ -506,7 +506,7 @@
|
||||
int i;
|
||||
|
||||
if (fbSlotClaimed && (pciSlotClaimed
|
||||
-#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
|
||||
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
||||
|| sbusSlotClaimed
|
||||
#endif
|
||||
))
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-se,v 1.1.1.1 2011/10/13 14:57:02 makoto Exp $
|
||||
|
||||
--- hw/xfree86/os-support/bus/xf86Sbus.h.orig 2007-08-16 20:39:11.000000000 +0200
|
||||
+++ hw/xfree86/os-support/bus/xf86Sbus.h
|
||||
@@ -38,6 +38,8 @@
|
||||
#include <sys/openpromio.h>
|
||||
#elif defined(__OpenBSD__) && defined(__sparc64__)
|
||||
/* XXX */
|
||||
+#elif defined(__NetBSD__)
|
||||
+/* XXX */
|
||||
#elif defined(CSRG_BASED)
|
||||
#if defined(__FreeBSD__)
|
||||
#include <sys/types.h>
|
||||
Loading…
Reference in a new issue