head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.2 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.3.0.34 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.32 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.30 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.28 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.26 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.24 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.22 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.20 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.18 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.16 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.14 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.12 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.10 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.8 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.6 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.4 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.2 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.2.0.4 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.2 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.1.0.12 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.10 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.8 pkgsrc-2008Q1:1.1.0.6 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.4 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.2 pkgsrc-2007Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2013.05.16.05.38.31; author richard; state dead; branches; next 1.3; commitid B45ARZAzCLIBGOPw; 1.3 date 2009.03.14.11.00.22; author apb; state Exp; branches; next 1.2; 1.2 date 2008.09.18.20.56.01; author bjs; state dead; branches; next 1.1; 1.1 date 2007.08.16.20.10.16; author joerg; state Exp; branches; next ; desc @@ 1.4 log @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 @ text @$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, @ 1.3 log @Modular-xorg-server-1.4.2nb5. Apply the following patches from NetBSD xsrc/external/mit/xorg-server/dist; thanks to joerg for providing a list of changes to apply. 2009-02-19 20:02 macallan * hw/xfree86/xaa/: xaaFillRect.c (1.2), xaaInitAccel.c (1.2), xaalocal.h (1.2): Actually use scanline image writes to upload images if available 2009-02-09 09:49 plunky * hw/xfree86/os-support/bsd/bsd_mouse.c (1.5): add horizontal mouse-wheel functionality to USB and WSMOUSE drivers 2009-02-02 03:06 christos * hw/xfree86/os-support/: bsd/bsd_mouse.c (1.4), xf86OSmouse.h (1.2): add a SetupMouse proc to condition the fd. Convert NetBSD's SetupAuto to SetupMouse. 2009-01-19 00:54 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.3): fix ioctl. 2009-01-13 18:43 christos * hw/xfree86/os-support/bsd/bsd_mouse.c (1.2): Set the mouse event protocol version. (untested, but head will be broken unless I add this). @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Welcome to modular-xorg-server-1.4.2. This long-overdue update brings many improvements: - Many improvements to EXA - Input Hotplugging via HAL or dbus (not enabled yet) - Support for RandR 1.2. Users using a dual-head configuration are encouraged to see for more information. - The server now uses the same version of Mesa we have in pkgsrc; this likely will result in more reliable OpenGL/DRI operation. I realize that this server is still not the latest release (1.5.0); upgrading to that version will require an involved mesa update, libpciaccess, etc. I hope that by the next quarter, that work will be done. Please file a problem report and/or contact us via the usual means (mailing lists, etc.) should you encounter any issues. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 2007/08/16 20:10:16 joerg Exp $ d3 122 a124 43 --- configure.ac.orig 2007-08-16 17:12:23.000000000 +0200 +++ configure.ac @@@@ -217,6 +217,7 @@@@ case $host_cpu in case $host_os in *linux*) DEFAULT_INT10=vm86 ;; *freebsd*) AC_DEFINE(USE_DEV_IO) ;; + *dragonfly*) AC_DEFINE(USE_DEV_IO) ;; *netbsd*) AC_DEFINE(USE_I386_IOPL) SYS_LIBS=-li386 ;; @@@@ -275,6 +276,7 @@@@ case $host_os in *netbsd*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) + AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console]) AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console]) DRI=yes ;; @@@@ -1147,7 +1149,7 @@@@ int main () { AC_DEFINE_UNQUOTED(LNX_KBD_PERIOD_NAME, [$period_field], [Name of the period field in struct kbd_repeat]) ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly) XORG_OS="freebsd" XORG_OS_SUBDIR="bsd" XORG_OS_KBD="BSD" @@@@ -1260,7 +1262,14 @@@@ int main () { ;; sparc*) xorg_bus_sparcpci="yes" - xorg_bus_sparc="yes" + case $host_os in + netbsd*) + xorg_bus_sparc="no" + ;; + *) + xorg_bus_sparc="yes" + ;; + esac ;; x86_64*|amd64*) case $host_os in @ 1.1 log @Fix basic NetBSD SPARC support. This currently disables Sbus until someone more involved in the platform take a look or I find the time to merge the xsrc changes. @ text @d1 1 a1 1 $NetBSD$ @