diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/ChangeLog xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/ChangeLog --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/ChangeLog 2010-06-09 19:40:24.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/ChangeLog 2010-07-06 01:35:25.000000000 +0100 @@ -1,3 +1,36 @@ +commit e7ed6da907fae5356074cbf1069fd2fadc66f02b +Author: Robert Hooker +Date: Tue Jul 6 09:19:52 2010 +0845 + + Add debian tree from origin/debian-unstable + +commit 77faeb2222ed86622b2d3bf5291b1a7f470b1382 +Author: Dave Airlie +Date: Mon Jul 5 14:48:07 2010 +1000 + + neomagic 1.2.5 + +commit 73bc0507b0b772717356a7fa8a15442022a8c3c7 +Author: Jamey Sharp +Date: Sun Jun 13 17:28:06 2010 -0700 + + Revert "Adding experimental pseudocolor overlay stuff to NeoMagic driver." + + ajax removed the key parts of that patch two years ago in commit + dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of + commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace + changes. + + Signed-off-by: Jamey Sharp + +commit e2234bd3d37239f5ac0182a3a8b3db23ba5ffbac +Author: Gaetan Nadon +Date: Sat Jun 12 20:44:46 2010 -0400 + + COPYING: replace stub file with actual Copyright notices. + + Signed-off-by: Gaetan Nadon + commit fdfd0902f858d068b8ee100b34249e7a53252d14 Author: Gaetan Nadon Date: Sat Mar 27 09:55:13 2010 -0400 diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/configure.ac xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/configure.ac --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/configure.ac 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/configure.ac 2010-07-06 01:34:52.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-neomagic], - 1.2.4, + 1.2.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-neomagic) diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/COPYING xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/COPYING --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/COPYING 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/COPYING 2010-07-06 01:34:52.000000000 +0100 @@ -1,12 +1,95 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1998, 1999 by Precision Insight, Inc., Cedar Park, Texas. -Please submit updated COPYING files to the Xorg bugzilla: + All Rights Reserved -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +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, and that the name of Precision Insight not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. Precision Insight +and its suppliers make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +PRECISION INSIGHT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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. + +Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK. + +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, and that the name of Alan Hourihane not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Alan Hourihane makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ALAN HOURIHANE 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. + +Copyright 1998, 1999 Egbert Eich +Copyright 2000, 2001 SuSE GmbH, Author: Egbert Eich +Copyright 2002 SuSE Linux AG, Author: Egbert Eich +Copyright 2002 Shigehiro Nomura + +Copyright 2007 George Sapountzis + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. + +Copyright (c) 1999, 2000 The XFree86 Project Inc. +based on code written by Mark Vojkovich + +Copyright 2002 by Shigehiro Nomura. + + All Rights Reserved + +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, and that the name of Shigehiro Nomura not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. Shigehiro Nomura +and its suppliers make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +SHIGEHIRO NOMURA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL SHIGEHIRO NOMURA AND/OR ITS SUPPLIERS 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. -http://lists.freedesktop.org/mailman/listinfo/xorg diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/debian/changelog xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/debian/changelog --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/debian/changelog 2010-07-06 01:49:32.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/debian/changelog 2010-07-06 01:49:32.000000000 +0100 @@ -1,10 +1,10 @@ -xserver-xorg-video-neomagic (1:1.2.4+git20100609.fdfd0902-0ubuntu0sarvatt) maverick; urgency=low +xserver-xorg-video-neomagic (1:1.2.5+git20100706.77faeb22-0ubuntu0sarvatt) maverick; urgency=low - * Checkout from git 20100609 (master branch) up to commit - fdfd0902f858d068b8ee100b34249e7a53252d14 + * Checkout from git 20100706 (master branch) up to commit + 77faeb2222ed86622b2d3bf5291b1a7f470b1382 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Wed, 09 Jun 2010 14:40:27 -0400 + -- Robert Hooker Tue, 06 Jul 2010 09:20:28 +0845 xserver-xorg-video-neomagic (1:1.2.4-3) unstable; urgency=low diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/.lastcommit xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/.lastcommit --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/.lastcommit 2010-06-09 19:39:51.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/.lastcommit 2010-07-06 01:34:52.000000000 +0100 @@ -1 +1 @@ -commit fdfd0902f858d068b8ee100b34249e7a53252d14 +commit 77faeb2222ed86622b2d3bf5291b1a7f470b1382 diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_2070.c xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_2070.c --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_2070.c 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_2070.c 2010-07-06 01:34:52.000000000 +0100 @@ -159,7 +159,7 @@ return FALSE; } - return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync)); + return(XAAInit(pScreen, infoPtr)); } diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_2097.c xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_2097.c --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_2097.c 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_2097.c 2010-07-06 01:34:52.000000000 +0100 @@ -248,7 +248,7 @@ return FALSE; } - return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync)); + return(XAAInit(pScreen, infoPtr)); } static void diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_2200.c xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_2200.c --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_2200.c 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_2200.c 2010-07-06 01:34:52.000000000 +0100 @@ -253,7 +253,7 @@ return FALSE; } - return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync)); + return(XAAInit(pScreen, infoPtr)); } static void diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_driver.c xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_driver.c --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo_driver.c 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo_driver.c 2010-07-06 01:34:52.000000000 +0100 @@ -1454,22 +1454,11 @@ miClearVisualTypes(); /* Setup the visuals we support. */ -#if 0 - if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) - return FALSE; -#else if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth), pScrn->rgbBits, pScrn->defaultVisual)) return FALSE; - if (pScrn->depth > 8) { - if (!miSetVisualTypes(8, miGetDefaultVisualMask(8), 6, - pScrn->defaultVisual)) - return FALSE; - } -#endif + if (!miSetPixmapDepths ()) return FALSE; /* @@ -1505,8 +1494,7 @@ /* Fixup RGB ordering */ visual = pScreen->visuals + pScreen->numVisuals; while (--visual >= pScreen->visuals) { - if ((visual->class | DynamicClass) == DirectColor - && visual->nplanes > 8) { + if ((visual->class | DynamicClass) == DirectColor) { visual->offsetRed = pScrn->offset.red; visual->offsetGreen = pScrn->offset.green; visual->offsetBlue = pScrn->offset.blue; @@ -2605,7 +2593,7 @@ */ NeoStd->Attribute[16] = 0x01; - switch (pScrn->depth) { /*@!@*/ + switch (pScrn->depth) { case 8 : NeoStd->CRTC[0x13] = pScrn->displayWidth >> 3; NeoNew->ExtCRTOffset = pScrn->displayWidth >> 11; diff -Nru xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo.h xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo.h --- xserver-xorg-video-neomagic-1.2.4+git20100609.fdfd0902/src/neo.h 2010-06-09 19:39:49.000000000 +0100 +++ xserver-xorg-video-neomagic-1.2.5+git20100706.77faeb22/src/neo.h 2010-07-06 01:34:52.000000000 +0100 @@ -48,7 +48,6 @@ #include "xaa.h" #include "xaalocal.h" /* XAA internals as we replace some of XAA */ -#include "xaaWrapper.h" #include "xf86Cursor.h" #include "shadowfb.h" @@ -268,7 +267,6 @@ int overlay_offset; int videoKey; int interlace; - SyncFunc accelSync; } NEORec, *NEOPtr; typedef struct {