diff options
| author | richard <richard@pkgsrc.org> | 2013-05-16 05:38:31 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-05-16 05:38:31 +0000 |
| commit | e236febcfd8dc2b103fbad68eda274d017224bb5 (patch) | |
| tree | 6a3f4f9b0967767e541d06175a67936a4125ae51 /x11/modular-xorg-server | |
| parent | 44dd1ff6074d822a7088a48d375f9b8518735f02 (diff) | |
| download | pkgsrc-e236febcfd8dc2b103fbad68eda274d017224bb5.tar.gz | |
xorg-server 1.12.4 is a maintenance release of the X.org X server. There
are only a handful of changes in this dot release, and with the pending
release of 1.13 next month, it's likely that this may be the final scheduled
release from the 1.12 branch; we will likely put out additional releases
from this branch, but they will no longer follow the standard 6-week
development cycle.
This version is identical to the previous release candidate except for
version numbers.
== Known Issues ==
Currently open bugs the 1.12 Tracker:
https://bugs.freedesktop.org/show_bug.cgi?id=xserver-1.12
23938: keys occasionally get stuck with xorg-server 1.6.99.901
http://bugs.freedesktop.org/23938
31501: crash accessing font info with xfs in fontpath
http://bugs.freedesktop.org/31501
39094: WaitFor does not handle EIO (causes 100% cpu load)
http://bugs.freedesktop.org/39094
39383: X server crashes when restarting KDE from Alt+F2
http://bugs.freedesktop.org/39383
39949: RandR panning & scaling don't work
http://bugs.freedesktop.org/39949
43988: crtc->desiredMode.name can point to freed memory.
http://bugs.freedesktop.org/43988
44038: some 3D wine apps no longer work (bisected)
http://bugs.freedesktop.org/44038
45445: Key press crashes the xserver when kdm is running
http://bugs.freedesktop.org/45445
49170: crash when starting or after some time of using psi
http://bugs.freedesktop.org/49170
50641: xorg-server-1.12.0 - When SELinux is enabled the xserver fails
http://bugs.freedesktop.org/50641
== New Issues ==
If you encounter an issue that you think should block a future 1.12
release,
please follow the instructions listed in the wiki to raise this to our
attention.
http://www.x.org/wiki/Server112Branch
== Changes since 1.12.3 ==
Aaron Plattner (1):
randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
Adam Jackson (3):
ephyr: Fix up some bizarre formatting
randr: Fix up yet another corner case in preferred mode selection
sync: Fix logic error from b55bf248581dc66321b24b29f199f6dc8d02db1b
Alan Coopersmith (10):
OtherClientGone: Remove unreachable return statement
Fix some overly indented/poorly line wrapped comments in dix/events.c
Remove obsolete tab stop comments from hw/xfree86/parser/*.c
ProcRRGetScreenInfo: swap configTimestamp as well
xf86dga2.c & xf86vmode.c: Move REQUEST_SIZE_MATCH checks before using stuff
Use calloc to zero fill buffers being allocated for replies & events
Set padding bytes to 0 in WriteToClient
Initialize padding bits to 0 in ErrorConnMax()
Fix up formatting of initializers for arrays of structs
Make indentation of dix/tables.c much more consistent and readable
Daniel Stone (5):
DRI2: Remove prototype for DRI2DestroyDrawable
Don't make failure to -nolisten fatal
Xorg: Link XKB DDX library after core server libs
Xinerama: Fix ExtensionInit prototype
AllocDevicePair: Ensure XKB privates are initialised
Dave Airlie (2):
xf86: cursor code got mangled by indenting
kinput: allocate enough space for null character.
Jaroslav Šmíd (1):
Bug 51375: Xorg doesn't set status for RRGetOutputInfo
Jeremy Huddleston (3):
XQuartz: Silence an unused-variable warning
XQuartz: Fix incorrect PseudoramiXExtensionInit prototype
XQuartz: Call xp_window_bring_all_to_front if available in libXplugin
Jeremy Huddleston Sequoia (7):
XQuartz: Fix xp_window_bring_all_to_front linking on OS versions with older libXplugin
configure.ac: Version bump to 1.12.3.901 (1.12.4 RC1)
XQuartz: console_redirect: Set the correct location for reading into the buffer
XQuartz: console_redirect: Properly zero-out the tail of the array on realloc()
configure.ac: Version bump to 1.12.3.902 (1.12.4 RC2)
XQuartz: Bump version to 2.7.3
configure.ac: Version bump to 1.12.4
Jon TURNEY (1):
hw/xquartz: Various fixes for pseudoramiX.c
Julien Cristau (1):
Bump video ABI version to 12.1
Keith Packard (4):
randr: Clean up compiler warnings about unused and shadowing variables
randr: Catch two more potential unset rrScrPriv uses
Add 'install-headers' target in the top-level Makefile
Only free Render filter names on last screen close
Michal Srb (1):
Look for ModuleData only in appropriate library
Michel Dänzer (2):
dri2: Add DRI2CreateDrawable2.
glx: Free DRI2 drawable reference to destroyed GLX drawable.
Peter Hutterer (4):
xkb: use local variable instead of casting arg
dix: fix dereference before null check
list.h: don't crash when removing an element from a NULL list
dix: make sure the mask is set for emulated scroll events (#52508)
Ricardo Salveti de Araujo (1):
randr: first check pScrPriv before using the pointer at RRFirstOutput
Simon Schubert (1):
fb: reorder Bresenham error correction to avoid overshoot.
Vic Lee (1):
ephyr: Resize screen automatically when parent window is resized
git tag: xorg-server-1.12.4
Diffstat (limited to 'x11/modular-xorg-server')
35 files changed, 74 insertions, 1727 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 7dfd2cf178d..fc76ac81cb5 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2013/02/06 23:24:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.75 2013/05/16 05:38:31 richard Exp $ # -DISTNAME= xorg-server-1.6.5 +DISTNAME= xorg-server-1.12.4 PKGNAME= modular-${DISTNAME} -PKGREVISION= 15 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 @@ -17,6 +16,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 @@ -40,22 +40,15 @@ DEPENDS+= xkeyboard-config-[0-9]*:../../x11/xkeyboard-config .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS+= --with-release-version=${PKGNAME:Q} .if ${OPSYS} == "NetBSD" CONFIGURE_ARGS+= --with-builder-addr="tech-x11@NetBSD.org" CONFIGURE_ARGS+= --with-os-vendor="The NetBSD Foundation" .endif -.if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --without-dtrace -.endif -.if ${OPSYS} == "FreeBSD" -CONFIGURE_ARGS+= --without-dtrace -.endif CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q} 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= @@ -69,16 +62,12 @@ 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 @@ -107,17 +96,28 @@ 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.1.0 +BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0 BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4 -BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0 -BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.9 -BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.5 +BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0 +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.13.2 -BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.2.99.1 -BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.9.3 +BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8 +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:Mclang) @@ -168,6 +168,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" diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index e583bd9f241..d9d49894706 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2012/03/13 14:13:52 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.18 2013/05/16 05:38:31 richard Exp $ bin/X bin/Xnest bin/Xorg @@ -9,16 +9,16 @@ include/xorg/BT.h include/xorg/IBM.h include/xorg/TI.h include/xorg/XIstubs.h -${PLIST.sunos}include/xorg/agpgart.h -include/xorg/bstore.h -include/xorg/bstorestr.h +include/xorg/Xprintf.h include/xorg/bt829.h -include/xorg/cfb8_16.h +include/xorg/callback.h +include/xorg/client.h include/xorg/closestr.h include/xorg/closure.h include/xorg/colormap.h include/xorg/colormapst.h include/xorg/compiler.h +include/xorg/compositeext.h include/xorg/cursor.h include/xorg/cursorstr.h include/xorg/damage.h @@ -36,6 +36,7 @@ ${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 include/xorg/exevents.h include/xorg/extension.h @@ -44,6 +45,7 @@ include/xorg/extnsionst.h include/xorg/fb.h include/xorg/fbdevhw.h include/xorg/fboverlay.h +include/xorg/fbpict.h include/xorg/fbrop.h include/xorg/fi1236.h include/xorg/fourcc.h @@ -57,8 +59,8 @@ include/xorg/hotplug.h include/xorg/i2c_def.h include/xorg/input.h include/xorg/inputstr.h +include/xorg/list.h include/xorg/mi.h -include/xorg/mibank.h include/xorg/mibstore.h include/xorg/micmap.h include/xorg/micoord.h @@ -66,6 +68,7 @@ include/xorg/mifillarc.h include/xorg/mifpoly.h include/xorg/migc.h include/xorg/miline.h +include/xorg/mioverlay.h include/xorg/mipict.h include/xorg/mipointer.h include/xorg/mipointrst.h @@ -73,11 +76,16 @@ include/xorg/misc.h include/xorg/miscstruct.h include/xorg/mispans.h include/xorg/mistruct.h +include/xorg/misync.h +include/xorg/misyncstr.h 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 include/xorg/picture.h include/xorg/picturestr.h include/xorg/pixmap.h @@ -90,7 +98,6 @@ include/xorg/randrstr.h include/xorg/region.h include/xorg/regionstr.h include/xorg/registry.h -include/xorg/renderedge.h include/xorg/resource.h include/xorg/rgb.h include/xorg/rrtransform.h @@ -106,6 +113,7 @@ include/xorg/site.h ${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il include/xorg/swaprep.h include/xorg/swapreq.h +include/xorg/syncsdk.h include/xorg/tda8425.h include/xorg/tda9850.h include/xorg/tda9885.h @@ -114,13 +122,15 @@ include/xorg/validate.h include/xorg/vbe.h include/xorg/vbeModes.h include/xorg/vgaHW.h +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/xaaWrapper.h include/xorg/xaalocal.h -include/xorg/xaarop.h +include/xorg/xace.h +include/xorg/xacestr.h include/xorg/xf86.h include/xorg/xf86Crtc.h include/xorg/xf86Cursor.h @@ -128,17 +138,17 @@ 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 include/xorg/xf86PciInfo.h include/xorg/xf86Priv.h include/xorg/xf86Privstr.h -include/xorg/xf86RAC.h include/xorg/xf86RamDac.h include/xorg/xf86RandR12.h include/xorg/xf86Rename.h -include/xorg/xf86Resources.h +include/xorg/xf86VGAarbiter.h include/xorg/xf86Xinput.h include/xorg/xf86_OSlib.h include/xorg/xf86_OSproc.h @@ -151,6 +161,7 @@ include/xorg/xf86str.h include/xorg/xf86xv.h include/xorg/xf86xvmc.h include/xorg/xf86xvpriv.h +include/xorg/xfixes.h include/xorg/xisb.h include/xorg/xkbfile.h include/xorg/xkbrules.h @@ -161,15 +172,16 @@ include/xorg/xorgVersion.h include/xorg/xserver-properties.h include/xorg/xvdix.h include/xorg/xvmcext.h -lib/X11/Options lib/pkgconfig/xorg-server.pc -lib/xorg/modules/extensions/libdbe.la +${PLIST.dri}lib/xorg/modules/extensions/libdbe.la ${PLIST.dri}lib/xorg/modules/extensions/libdri.la -lib/xorg/modules/extensions/libdri2.la -lib/xorg/modules/extensions/libextmod.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 lib/xorg/modules/libint10.la lib/xorg/modules/libshadow.la lib/xorg/modules/libshadowfb.la @@ -177,8 +189,6 @@ lib/xorg/modules/libvbe.la lib/xorg/modules/libvgahw.la lib/xorg/modules/libwfb.la lib/xorg/modules/libxaa.la -lib/xorg/modules/libxf8_16bpp.la -lib/xorg/modules/linux/libfbdevhw.la lib/xorg/modules/multimedia/bt829_drv.la lib/xorg/modules/multimedia/fi1236_drv.la lib/xorg/modules/multimedia/msp3430_drv.la @@ -196,6 +206,8 @@ man/man1/gtf.1 man/man4/exa.4 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 diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk index a200b47b502..423d6411470 100644 --- a/x11/modular-xorg-server/buildlink3.mk +++ b/x11/modular-xorg-server/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.9 2010/09/14 11:03:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2013/05/16 05:38:31 richard 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?= ../../x11/modular-xorg-server .include "../../sysutils/libpciaccess/buildlink3.mk" @@ -22,6 +22,7 @@ BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/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 diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 7bef0a7cc48..eeafed75a85 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,36 +1,6 @@ -$NetBSD: distinfo,v 1.47 2012/12/15 09:26:07 is Exp $ +$NetBSD: distinfo,v 1.48 2013/05/16 05:38:31 richard Exp $ -SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6 -RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a -Size (xorg-server-1.6.5.tar.bz2) = 4678406 bytes -SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0 -SHA1 (patch-ac) = fdc115fad11cddcc77e3aee4d6992b6e7c6fbf32 -SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908 -SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007 -SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d -SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53 -SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7 -SHA1 (patch-ba) = b758aab64fcba81ba33b7c425db6430757b2fd4b -SHA1 (patch-bb) = 1e8ca63c07b22424d0bf379dd98e032f41eabc0e -SHA1 (patch-bc) = f1ab56e8876ddc6bc0fe941a45ab2c7726c5cbf4 -SHA1 (patch-bd) = 01abcfe981c5d7d8aa20ca80e6a55cecc5e0daad -SHA1 (patch-be) = 29d24b313707689c390eb4d3b0f0afe7799944df -SHA1 (patch-bf) = fe74060e662e39accc285026b7eb0a7fd87e698e -SHA1 (patch-bg) = 6e44664941585390c32b5f6cc1fdc93447228b09 -SHA1 (patch-bh) = 51074592a06a84a049a4e2bc994471491e2e202c -SHA1 (patch-bi) = 52012af9c4bd2dab0e9d96cb1692a5e342737748 -SHA1 (patch-bj) = 3bea92151311028e9eeeacd441b1855a0d5f6867 -SHA1 (patch-bk) = 293aba14c63bfd4c8cf282c4a1cca40f76f6634a -SHA1 (patch-bl) = 42fb973bd4a22bbe6c441159f1edcaf7c04f0d27 -SHA1 (patch-bm) = 9c7192eb98816165d8fb16af465e0056045280b2 -SHA1 (patch-bn) = 27dffea8ce05ac79fd438818fba463f57776f2af -SHA1 (patch-bo) = ee05a01c6b1d4d0b759d8372f16c5f752273f73e +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-os_utils.c) = 949384a74c5702c863dea7387bfe18952c92b239 -SHA1 (patch-sa) = 349bad3f5f7e6bc3b7d37ab37fb6d2a0e6f4d7f0 -SHA1 (patch-sb) = 48c22a62b30c6bc4d5786624bc264fee30a9bb81 -SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0 -SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881 -SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568 -SHA1 (patch-sf) = 22d4f575c066691696ec96f1fcd459251b662012 -SHA1 (patch-sg) = 81598e687357a6e8b477055d14ece01372ae4617 diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 8920f75c17b..1bde0329156 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,12 +1,12 @@ -# $NetBSD: options.mk,v 1.8 2012/06/12 15:46:05 wiz Exp $ +# $NetBSD: options.mk,v 1.9 2013/05/16 05:38:31 richard 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 diff --git a/x11/modular-xorg-server/patches/patch-ab b/x11/modular-xorg-server/patches/patch-ab deleted file mode 100644 index 87ca7bea477..00000000000 --- a/x11/modular-xorg-server/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2009/06/07 11:23:47 wiz 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 diff --git a/x11/modular-xorg-server/patches/patch-ac b/x11/modular-xorg-server/patches/patch-ac deleted file mode 100644 index 3bae281f159..00000000000 --- a/x11/modular-xorg-server/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2012/03/13 14:13:52 fhajny Exp $ - -Fix build on DragonFly after header moved. -Do not set HAS_USL_VTS on any SunOS platform. - ---- hw/xfree86/os-support/xf86_OSlib.h.orig 2011-10-28 15:02:52.128328912 +0000 -+++ hw/xfree86/os-support/xf86_OSlib.h -@@ -140,7 +140,7 @@ - # include <sys/mmap.h> /* MMAP driver header */ - # endif - --# if !defined(sun) || (!defined(sparc) && !defined(__SOL8__)) -+# if !defined(sun) - # define HAS_USL_VTS - # endif - # if !defined(sun) -@@ -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 diff --git a/x11/modular-xorg-server/patches/patch-af b/x11/modular-xorg-server/patches/patch-af deleted file mode 100644 index e9a871537f7..00000000000 --- a/x11/modular-xorg-server/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.3 2009/01/04 20:02:12 wiz 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 - { diff --git a/x11/modular-xorg-server/patches/patch-aj b/x11/modular-xorg-server/patches/patch-aj deleted file mode 100644 index 7fdc464e31a..00000000000 --- a/x11/modular-xorg-server/patches/patch-aj +++ /dev/null @@ -1,124 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2009/03/14 11:00:22 apb Exp $ - -Changes from NetBSD xsrc/external/mit/xorg-server/dist/\ -hw/xfree86/xaa/xaaFillRect.c - ----------------------------- -revision 1.2 -date: 2009/02/19 20:02:02; author: macallan; state: Exp; lines: +104 -0 -Actually use scanline image writes to upload images if available ----------------------------- - ---- hw/xfree86/xaa/xaaFillRect.c.orig 2008-06-06 12:03:10.000000000 +0200 -+++ hw/xfree86/xaa/xaaFillRect.c -@@ -779,6 +779,110 @@ XAAFillCacheExpandRects( - with reading past the edge of the pattern otherwise */ - - static void -+WriteColumnScanlines( -+ ScrnInfoPtr pScrn, -+ unsigned char *pSrc, -+ int x, int y, int w, int h, -+ int xoff, int yoff, -+ int pHeight, -+ int srcwidth, -+ int Bpp -+) { -+ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); -+ unsigned char *src; -+ int skipleft, bytes, line, sline; -+ int buffer; -+ -+ pSrc += (Bpp * xoff); -+ -+ if((skipleft = (long)pSrc & 0x03L)) { -+ if(Bpp == 3) -+ skipleft = 4 - skipleft; -+ else -+ skipleft /= Bpp; -+ -+ x -= skipleft; -+ w += skipleft; -+ -+ if(Bpp == 3) -+ pSrc -= 3 * skipleft; -+ else /* is this Alpha friendly ? */ -+ pSrc = (unsigned char*)((long)pSrc & ~0x03L); -+ } -+ -+ src = pSrc + (yoff * srcwidth); -+ -+ bytes = w * Bpp; -+ -+ (*infoRec->SubsequentScanlineImageWriteRect)(pScrn, x, y, w, h, skipleft); -+ -+ buffer = 0; -+ sline = yoff; -+ for (line = 0; line < h; line++) { -+ memcpy(infoRec->ScanlineImageWriteBuffers[buffer], src, bytes); -+ (*infoRec->SubsequentImageWriteScanline)(pScrn, buffer); -+ buffer++; -+ src += srcwidth; -+ sline++; -+ if (sline >= pHeight) { -+ sline = 0; -+ src = pSrc; -+ } -+ if (buffer >= infoRec->NumScanlineImageWriteBuffers) -+ buffer = 0; -+ } -+} -+ -+void -+XAAFillScanlineImageWriteRects( -+ ScrnInfoPtr pScrn, -+ int rop, -+ unsigned int planemask, -+ int nBox, -+ BoxPtr pBox, -+ int xorg, int yorg, -+ PixmapPtr pPix -+){ -+ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); -+ int x, phaseY, phaseX, height, width, blit_w; -+ int pHeight = pPix->drawable.height; -+ int pWidth = pPix->drawable.width; -+ int Bpp = pPix->drawable.bitsPerPixel >> 3; -+ int srcwidth = pPix->devKind; -+ -+ (*infoRec->SetupForScanlineImageWrite)(pScrn, rop, planemask, -1, -+ pPix->drawable.bitsPerPixel, pPix->drawable.depth); -+ -+ while(nBox--) { -+ x = pBox->x1; -+ phaseY = (pBox->y1 - yorg) % pHeight; -+ if(phaseY < 0) phaseY += pHeight; -+ phaseX = (x - xorg) % pWidth; -+ if(phaseX < 0) phaseX += pWidth; -+ height = pBox->y2 - pBox->y1; -+ width = pBox->x2 - x; -+ -+ while(1) { -+ blit_w = pWidth - phaseX; -+ if(blit_w > width) blit_w = width; -+ -+ WriteColumnScanlines(pScrn, pPix->devPrivate.ptr, x, pBox->y1, -+ blit_w, height, phaseX, phaseY, pHeight, srcwidth, Bpp); -+ -+ width -= blit_w; -+ if(!width) break; -+ x += blit_w; -+ phaseX = (phaseX + blit_w) % pWidth; -+ } -+ pBox++; -+ } -+ -+ if(infoRec->ScanlineImageWriteFlags & SYNC_AFTER_IMAGE_WRITE) -+ (*infoRec->Sync)(pScrn); -+ else SET_SYNC_FLAG(infoRec); -+} -+ -+static void - WriteColumn( - ScrnInfoPtr pScrn, - unsigned char *pSrc, diff --git a/x11/modular-xorg-server/patches/patch-ak b/x11/modular-xorg-server/patches/patch-ak deleted file mode 100644 index fca73867252..00000000000 --- a/x11/modular-xorg-server/patches/patch-ak +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2009/03/14 11:00:22 apb 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 && diff --git a/x11/modular-xorg-server/patches/patch-al b/x11/modular-xorg-server/patches/patch-al deleted file mode 100644 index d26930ddcb4..00000000000 --- a/x11/modular-xorg-server/patches/patch-al +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-al,v 1.3 2009/03/14 11:00:22 apb 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 2008-06-10 19:57:19.000000000 +0200 -+++ hw/xfree86/xaa/xaalocal.h -@@ -602,6 +602,17 @@ XAAFillImageWriteRects( - PixmapPtr pPix - ); - -+void -+XAAFillScanlineImageWriteRects( -+ ScrnInfoPtr pScrn, -+ int rop, -+ unsigned int planemask, -+ int nBox, -+ BoxPtr pBox, -+ int xorg, int yorg, -+ PixmapPtr pPix -+); -+ - void - XAAPolyFillRect( - DrawablePtr pDraw, diff --git a/x11/modular-xorg-server/patches/patch-am b/x11/modular-xorg-server/patches/patch-am deleted file mode 100644 index 6976c4f776b..00000000000 --- a/x11/modular-xorg-server/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.5 2009/06/24 17:25:36 drochner Exp $ - ---- glx/glxdri.c.orig 2009-06-24 16:22:56.000000000 +0200 -+++ glx/glxdri.c -@@ -966,6 +966,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - const __DRIextension **extensions; - int i; - -+ memset(&framebuffer, 0, sizeof(framebuffer)); -+ - if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || - !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || - !isCapable) { diff --git a/x11/modular-xorg-server/patches/patch-ba b/x11/modular-xorg-server/patches/patch-ba deleted file mode 100644 index 06d8126aec5..00000000000 --- a/x11/modular-xorg-server/patches/patch-ba +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2010/04/09 09:08:13 tnn 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 - diff --git a/x11/modular-xorg-server/patches/patch-bb b/x11/modular-xorg-server/patches/patch-bb deleted file mode 100644 index 9f11cfd32ae..00000000000 --- a/x11/modular-xorg-server/patches/patch-bb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2010/04/09 09:08:13 tnn Exp $ - ---- Xext/shmint.h.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/shmint.h -@@ -25,6 +25,7 @@ - - #define _XSHM_SERVER_ - #include <X11/extensions/shmstr.h> -+#include <X11/extensions/shmproto.h> - - #include "screenint.h" - #include "pixmap.h" diff --git a/x11/modular-xorg-server/patches/patch-bc b/x11/modular-xorg-server/patches/patch-bc deleted file mode 100644 index 37588f9b1f4..00000000000 --- a/x11/modular-xorg-server/patches/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2010/04/09 09:08:13 tnn 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" diff --git a/x11/modular-xorg-server/patches/patch-bd b/x11/modular-xorg-server/patches/patch-bd deleted file mode 100644 index 0373ab35d4e..00000000000 --- a/x11/modular-xorg-server/patches/patch-bd +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2010/04/09 09:08:13 tnn Exp $ - ---- hw/xfree86/dixmods/extmod/modinit.h.orig 2009-10-12 02:52:40.000000000 +0000 -+++ hw/xfree86/dixmods/extmod/modinit.h -@@ -8,7 +8,7 @@ - #endif - - #define _SHAPE_SERVER_ /* don't want Xlib structures */ --#include <X11/extensions/shapestr.h> -+#include <X11/extensions/shapeproto.h> - - #ifdef MULTIBUFFER - extern void MultibufferExtensionInit(INITARGS); -@@ -19,8 +19,7 @@ extern void MultibufferExtensionInit(INI - #ifdef XTEST - extern void XTestExtensionInit(INITARGS); - #define _XTEST_SERVER_ --#include <X11/extensions/XTest.h> --#include <X11/extensions/xteststr.h> -+#include <X11/extensions/xtestproto.h> - #endif - - #if 1 -@@ -35,19 +34,19 @@ extern void ScreenSaverExtensionInit (IN - #ifdef XF86VIDMODE - extern void XFree86VidModeExtensionInit(INITARGS); - #define _XF86VIDMODE_SERVER_ --#include <X11/extensions/xf86vmstr.h> -+#include <X11/extensions/xf86vmproto.h> - #endif - - #ifdef XFreeXDGA - extern void XFree86DGAExtensionInit(INITARGS); - extern void XFree86DGARegister(INITARGS); - #define _XF86DGA_SERVER_ --#include <X11/extensions/xf86dgastr.h> -+#include <X11/extensions/xf86dgaproto.h> - #endif - - #ifdef DPMSExtension - extern void DPMSExtensionInit(INITARGS); --#include <X11/extensions/dpmsstr.h> -+#include <X11/extensions/dpmsproto.h> - #endif - - #ifdef XV -@@ -66,6 +65,7 @@ extern void ResExtensionInit(INITARGS); - #ifdef SHM - extern void ShmExtensionInit(INITARGS); - #include <X11/extensions/shmstr.h> -+#include <X11/extensions/shmproto.h> - extern void ShmRegisterFuncs( - ScreenPtr pScreen, - ShmFuncsPtr funcs); diff --git a/x11/modular-xorg-server/patches/patch-be b/x11/modular-xorg-server/patches/patch-be deleted file mode 100644 index 29a5269709a..00000000000 --- a/x11/modular-xorg-server/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1 2010/04/09 09:08:13 tnn Exp $ - ---- ./Xext/bigreq.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ ./Xext/bigreq.c -@@ -37,7 +37,7 @@ from The Open Group. - #include "os.h" - #include "dixstruct.h" - #include "extnsionst.h" --#include <X11/extensions/bigreqstr.h> -+#include <X11/extensions/bigreqsproto.h> - #include "opaque.h" - #include "modinit.h" - diff --git a/x11/modular-xorg-server/patches/patch-bf b/x11/modular-xorg-server/patches/patch-bf deleted file mode 100644 index 4eb4d3acc6e..00000000000 --- a/x11/modular-xorg-server/patches/patch-bf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2010/04/09 09:08:13 tnn Exp $ - ---- Xext/shape.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/shape.c -@@ -44,7 +44,7 @@ in this Software without prior written a - #include "resource.h" - #include "opaque.h" - #define _SHAPE_SERVER_ /* don't want Xlib structures */ --#include <X11/extensions/shapestr.h> -+#include <X11/extensions/shapeproto.h> - #include "regionstr.h" - #include "gcstruct.h" - #include "modinit.h" diff --git a/x11/modular-xorg-server/patches/patch-bg b/x11/modular-xorg-server/patches/patch-bg deleted file mode 100644 index 1ca4c0691f9..00000000000 --- a/x11/modular-xorg-server/patches/patch-bg +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2010/04/09 09:08:13 tnn Exp $ - ---- Xext/sync.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/sync.c -@@ -68,8 +68,8 @@ PERFORMANCE OF THIS SOFTWARE. - #include "resource.h" - #include "opaque.h" - #define _SYNC_SERVER --#include <X11/extensions/sync.h> --#include <X11/extensions/syncstr.h> -+#include "sync_old.h" -+#include "syncstr_old.h" - - #include <stdio.h> - #if !defined(WIN32) diff --git a/x11/modular-xorg-server/patches/patch-bh b/x11/modular-xorg-server/patches/patch-bh deleted file mode 100644 index d222f786b7b..00000000000 --- a/x11/modular-xorg-server/patches/patch-bh +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2010/04/09 09:08:14 tnn Exp $ - ---- Xext/xtest.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/xtest.c -@@ -44,8 +44,7 @@ - #include "sleepuntil.h" - #include "mi.h" - #define _XTEST_SERVER_ --#include <X11/extensions/XTest.h> --#include <X11/extensions/xteststr.h> -+#include <X11/extensions/xtestproto.h> - #include <X11/extensions/XI.h> - #include <X11/extensions/XIproto.h> - diff --git a/x11/modular-xorg-server/patches/patch-bi b/x11/modular-xorg-server/patches/patch-bi deleted file mode 100644 index c091bc30061..00000000000 --- a/x11/modular-xorg-server/patches/patch-bi +++ /dev/null @@ -1,499 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2010/04/09 09:08:14 tnn 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_ */ diff --git a/x11/modular-xorg-server/patches/patch-bj b/x11/modular-xorg-server/patches/patch-bj deleted file mode 100644 index 7c904951b50..00000000000 --- a/x11/modular-xorg-server/patches/patch-bj +++ /dev/null @@ -1,474 +0,0 @@ -$NetBSD: patch-bj,v 1.1 2010/04/09 09:08:14 tnn 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_ */ diff --git a/x11/modular-xorg-server/patches/patch-bk b/x11/modular-xorg-server/patches/patch-bk deleted file mode 100644 index 8d35dbae721..00000000000 --- a/x11/modular-xorg-server/patches/patch-bk +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2010/04/09 09:08:14 tnn Exp $ - ---- Xext/shm.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/shm.c -@@ -56,6 +56,7 @@ in this Software without prior written a - #include "xace.h" - #define _XSHM_SERVER_ - #include <X11/extensions/shmstr.h> -+#include <X11/extensions/shmproto.h> - #include <X11/Xfuncproto.h> - - /* Needed for Solaris cross-zone shared memory extension */ diff --git a/x11/modular-xorg-server/patches/patch-bl b/x11/modular-xorg-server/patches/patch-bl deleted file mode 100644 index fb86f325a32..00000000000 --- a/x11/modular-xorg-server/patches/patch-bl +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2010/04/09 09:08:14 tnn Exp $ - ---- Xext/xvdisp.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/xvdisp.c -@@ -44,6 +44,7 @@ SOFTWARE. - #ifdef MITSHM - #define _XSHM_SERVER_ - #include <X11/extensions/shmstr.h> -+#include <X11/extensions/shmproto.h> - #endif - - #include "xvdisp.h" diff --git a/x11/modular-xorg-server/patches/patch-bm b/x11/modular-xorg-server/patches/patch-bm deleted file mode 100644 index 538b971eaca..00000000000 --- a/x11/modular-xorg-server/patches/patch-bm +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bm,v 1.1 2010/04/09 09:08:14 tnn Exp $ - ---- Xext/dpms.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ Xext/dpms.c -@@ -46,7 +46,7 @@ Equipment Corporation. - #include "opaque.h" - #define DPMS_SERVER - #include <X11/extensions/dpms.h> --#include <X11/extensions/dpmsstr.h> -+#include <X11/extensions/dpmsproto.h> - #include "dpmsproc.h" - #include "modinit.h" - diff --git a/x11/modular-xorg-server/patches/patch-bn b/x11/modular-xorg-server/patches/patch-bn deleted file mode 100644 index 7103af318de..00000000000 --- a/x11/modular-xorg-server/patches/patch-bn +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bn,v 1.1 2010/04/09 09:08:14 tnn Exp $ - ---- dbe/dbestruct.h.orig 2009-10-12 02:52:40.000000000 +0000 -+++ dbe/dbestruct.h -@@ -37,7 +37,8 @@ - /* INCLUDES */ - - #define NEED_DBE_PROTOCOL --#include <X11/extensions/Xdbeproto.h> -+#include <X11/extensions/Xdbe.h> -+#include <X11/extensions/dbeproto.h> - #include "windowstr.h" - #include "privates.h" - diff --git a/x11/modular-xorg-server/patches/patch-bo b/x11/modular-xorg-server/patches/patch-bo deleted file mode 100644 index accdf79d084..00000000000 --- a/x11/modular-xorg-server/patches/patch-bo +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2010/04/09 09:08:14 tnn Exp $ - ---- mi/miinitext.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ mi/miinitext.c -@@ -162,10 +162,11 @@ typedef void (*InitExtension)(INITARGS); - #ifdef MITSHM - #define _XSHM_SERVER_ - #include <X11/extensions/shmstr.h> -+#include <X11/extensions/shmproto.h> - #endif - #ifdef XTEST - #define _XTEST_SERVER_ --#include <X11/extensions/XTest.h> -+#include <X11/extensions/xtestconst.h> - #endif - #ifdef XKB - #include <X11/extensions/XKB.h> diff --git a/x11/modular-xorg-server/patches/patch-os_utils.c b/x11/modular-xorg-server/patches/patch-os_utils.c deleted file mode 100644 index 5763a102380..00000000000 --- a/x11/modular-xorg-server/patches/patch-os_utils.c +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-os_utils.c,v 1.1 2012/12/15 09:26:07 is Exp $ - ---- os/utils.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ os/utils.c -@@ -315,7 +315,7 @@ LockServer(void) - FatalError("Could not create lock file in %s\n", tmp); - (void) sprintf(pid_str, "%10ld\n", (long)getpid()); - (void) write(lfd, pid_str, 11); -- (void) chmod(tmp, 0444); -+ (void) fchmod(lfd, 0444); - (void) close(lfd); - - /* -@@ -336,7 +336,7 @@ LockServer(void) - /* - * Read the pid from the existing file - */ -- lfd = open(LockFile, O_RDONLY); -+ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); - if (lfd < 0) { - unlink(tmp); - FatalError("Can't read lock file %s\n", LockFile); diff --git a/x11/modular-xorg-server/patches/patch-sa b/x11/modular-xorg-server/patches/patch-sa deleted file mode 100644 index 058ef636d79..00000000000 --- a/x11/modular-xorg-server/patches/patch-sa +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-sa,v 1.4 2012/05/04 16:40:01 joerg Exp $ - ---- hw/xfree86/common/compiler.h.orig 2009-07-07 19:48:58.000000000 +0200 -+++ hw/xfree86/common/compiler.h 2009-09-20 11:51:51.000000000 +0200 -@@ -465,7 +465,7 @@ extern unsigned int inb(unsigned long po - extern unsigned int inw(unsigned long port); - extern unsigned int inl(unsigned long port); - --# elif defined(linux) && defined(__amd64__) -+# elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__) - - # include <inttypes.h> - -@@ -531,7 +531,7 @@ inl(unsigned short port) - return ret; - } - --# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc__) -+# elif (defined(linux) || defined(sun) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)) && defined(__sparc__) - - # ifndef ASI_PL - # define ASI_PL 0x88 -@@ -1390,26 +1390,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)" : -+ __asm__ __volatile__("inb %1,%0" : - "=a" (ret) : - "d" (port)); - return ret; -@@ -1419,7 +1419,7 @@ static __inline__ unsigned int - inw(unsigned short port) - { - unsigned short ret; -- __asm__ __volatile__("in%W0 (%1)" : -+ __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)" : -+ __asm__ __volatile__("inl %1,%0" : - "=a" (ret) : - "d" (port)); - return ret; diff --git a/x11/modular-xorg-server/patches/patch-sb b/x11/modular-xorg-server/patches/patch-sb deleted file mode 100644 index 5ce0970b642..00000000000 --- a/x11/modular-xorg-server/patches/patch-sb +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-sb,v 1.3 2010/06/27 10:43:02 tnn Exp $ - ---- hw/xfree86/common/xf86Configure.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ hw/xfree86/common/xf86Configure.c -@@ -115,7 +115,7 @@ xf86AddBusDeviceToConfigure(const char * - return NULL; - isPrimary = xf86IsPrimaryPci(pVideo); - break; --#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) -+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__) - case BUS_SBUS: - for (i = 0; i < nDevToConfig; i++) - if (DevToConfig[i].sVideo && -@@ -180,8 +180,14 @@ xf86AddBusDeviceToConfigure(const char * - - NewDevice.GDev.busID = xnfalloc(16); - xf86FormatPciBusNumber(pVideo->bus, busnum); -- sprintf(NewDevice.GDev.busID, "PCI:%s:%d:%d", -- busnum, pVideo->dev, pVideo->func); -+ -+ if (pVideo->domain == 0) { -+ snprintf(NewDevice.GDev.busID, 16, "PCI:%s:%d:%d", -+ busnum, pVideo->dev, pVideo->func); -+ } else { -+ snprintf(NewDevice.GDev.busID, 16, "PCI:%s@%d:%d:%d", -+ busnum, pVideo->domain, pVideo->dev, pVideo->func); -+ } - - NewDevice.GDev.chipID = pVideo->device_id; - NewDevice.GDev.chipRev = pVideo->revision; diff --git a/x11/modular-xorg-server/patches/patch-sc b/x11/modular-xorg-server/patches/patch-sc deleted file mode 100644 index 91529ed77c2..00000000000 --- a/x11/modular-xorg-server/patches/patch-sc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-sc,v 1.2 2009/06/07 11:23:47 wiz Exp $ - -Temporary disable Sbus suport. - ---- hw/xfree86/loader/xf86sym.c.orig 2009-03-21 01:57:50 +0200 -+++ hw/xfree86/loader/xf86sym.c 2009-05-19 14:38:30 +0300 -@@ -451,7 +451,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { - SYMFUNC(xf86RegisterRootWindowProperty) - SYMFUNC(xf86IsUnblank) - --#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) -+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__) - /* xf86sbusBus.c */ - SYMFUNC(xf86MatchSbusInstances) - SYMFUNC(xf86GetSbusInfoForEntity) diff --git a/x11/modular-xorg-server/patches/patch-sd b/x11/modular-xorg-server/patches/patch-sd deleted file mode 100644 index e3b0784deec..00000000000 --- a/x11/modular-xorg-server/patches/patch-sd +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-sd,v 1.2 2009/06/07 11:23:47 wiz Exp $ - -Temporary disable Sbus suport. - ---- hw/xfree86/common/xf86Bus.c.orig 2009-03-21 01:57:50 +0200 -+++ hw/xfree86/common/xf86Bus.c 2009-05-19 14:30:07 +0300 -@@ -104,7 +104,7 @@ void - xf86BusProbe(void) - { - xf86PciProbe(); --#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) -+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__) - xf86SbusProbe(); - #endif - } -@@ -1829,7 +1829,7 @@ xf86PostProbe(void) - - if (fbSlotClaimed) { - if (pciSlotClaimed --#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) -+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) && !defined(__NetBSD__) - || sbusSlotClaimed - #endif - ) { diff --git a/x11/modular-xorg-server/patches/patch-se b/x11/modular-xorg-server/patches/patch-se deleted file mode 100644 index dc32cebfb49..00000000000 --- a/x11/modular-xorg-server/patches/patch-se +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-se,v 1.1 2007/08/16 20:10:17 joerg 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> diff --git a/x11/modular-xorg-server/patches/patch-sf b/x11/modular-xorg-server/patches/patch-sf deleted file mode 100644 index 4a8b2220862..00000000000 --- a/x11/modular-xorg-server/patches/patch-sf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-sf,v 1.1 2011/12/30 09:33:04 is Exp $ - ---- fb/fbpict.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ fb/fbpict.c -@@ -37,7 +37,7 @@ - #include "mipict.h" - #include "fbpict.h" - --#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) -+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b)) - - void - fbWalkCompositeRegion (CARD8 op, diff --git a/x11/modular-xorg-server/patches/patch-sg b/x11/modular-xorg-server/patches/patch-sg deleted file mode 100644 index e3af24dda2b..00000000000 --- a/x11/modular-xorg-server/patches/patch-sg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-sg,v 1.1 2011/12/30 09:33:04 is Exp $ - ---- mi/miarc.c.orig 2009-10-12 02:52:40.000000000 +0000 -+++ mi/miarc.c -@@ -1525,7 +1525,7 @@ miRoundCap( - - # define Dsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0))) - # define Dcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0))) --# define mod(a,b) ((a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) -+# define mod(a,b) ((a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b)) - - static double - miDcos (double a) |