xserver-xorg-video-neomagic: Changes to 'debian-experimental'
COPYING | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
ChangeLog | 45 +++++++++++++++++++++++++
Makefile.am | 2 -
configure.ac | 2 -
debian/changelog | 6 +++
man/Makefile.am | 41 ++++++++++------------
src/neo.h | 2 -
src/neo_2070.c | 2 -
src/neo_2097.c | 2 -
src/neo_2200.c | 2 -
src/neo_driver.c | 18 +---------
11 files changed, 169 insertions(+), 52 deletions(-)
New commits:
commit 63a45525053b7c95eb15047fe7f1ecb94c4c2c32
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Oct 18 16:57:55 2010 -0400
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index e1fbbf5..021ac08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+commit 77faeb2222ed86622b2d3bf5291b1a7f470b1382
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 5 14:48:07 2010 +1000
+
+ neomagic 1.2.5
+
+commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
+Author: Jamey Sharp <jamey@minilop.net>
+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 <jamey@minilop.net>
+
+commit e2234bd3d37239f5ac0182a3a8b3db23ba5ffbac
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Jun 12 20:44:46 2010 -0400
+
+ COPYING: replace stub file with actual Copyright notices.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fdfd0902f858d068b8ee100b34249e7a53252d14
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 27 09:55:13 2010 -0400
+
+ config: remove TODO from EXTRA_DIST
+
+ Automake always distribute the TODO file.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 958353fc567f989a2c6c6ef73625f99de896a68d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 15:00:16 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit dbcbef42e4ea74e20313e4f5437067cc5cfb7024
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 15 22:01:02 2009 -0500
diff --git a/debian/changelog b/debian/changelog
index c8bd87f..a3da057 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-neomagic (1:1.2.5-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Mon, 18 Oct 2010 16:56:57 -0400
+
xserver-xorg-video-neomagic (1:1.2.4-4) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
commit 77faeb2222ed86622b2d3bf5291b1a7f470b1382
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:48:07 2010 +1000
neomagic 1.2.5
diff --git a/configure.ac b/configure.ac
index a19183b..38cba3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
commit 73bc0507b0b772717356a7fa8a15442022a8c3c7
Author: Jamey Sharp <jamey@minilop.net>
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 <jamey@minilop.net>
diff --git a/src/neo.h b/src/neo.h
index 718b8a5..f3f2b4c 100644
--- a/src/neo.h
+++ b/src/neo.h
@@ -48,7 +48,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#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 @@ typedef struct neoRec
int overlay_offset;
int videoKey;
int interlace;
- SyncFunc accelSync;
} NEORec, *NEOPtr;
typedef struct {
diff --git a/src/neo_2070.c b/src/neo_2070.c
index 007a304..b3811d6 100644
--- a/src/neo_2070.c
+++ b/src/neo_2070.c
@@ -159,7 +159,7 @@ Neo2070AccelInit(ScreenPtr pScreen)
return FALSE;
}
- return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync));
+ return(XAAInit(pScreen, infoPtr));
}
diff --git a/src/neo_2097.c b/src/neo_2097.c
index ed9014c..7d720df 100644
--- a/src/neo_2097.c
+++ b/src/neo_2097.c
@@ -248,7 +248,7 @@ Neo2097AccelInit(ScreenPtr pScreen)
return FALSE;
}
- return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync));
+ return(XAAInit(pScreen, infoPtr));
}
static void
diff --git a/src/neo_2200.c b/src/neo_2200.c
index 78b3367..4b354e7 100644
--- a/src/neo_2200.c
+++ b/src/neo_2200.c
@@ -253,7 +253,7 @@ Neo2200AccelInit(ScreenPtr pScreen)
return FALSE;
}
- return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync));
+ return(XAAInit(pScreen, infoPtr));
}
static void
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 9b40943..b12c125 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1454,22 +1454,11 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
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 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* 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 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
*/
NeoStd->Attribute[16] = 0x01;
- switch (pScrn->depth) { /*@!@*/
+ switch (pScrn->depth) {
case 8 :
NeoStd->CRTC[0x13] = pScrn->displayWidth >> 3;
NeoNew->ExtCRTOffset = pScrn->displayWidth >> 11;
commit e2234bd3d37239f5ac0182a3a8b3db23ba5ffbac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 20:44:46 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..8dbc81d 100644
--- a/COPYING
+++ b/COPYING
@@ -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 <markv@valinux.com>
+
+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
commit fdfd0902f858d068b8ee100b34249e7a53252d14
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 27 09:55:13 2010 -0400
config: remove TODO from EXTRA_DIST
Automake always distribute the TODO file.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 32ab98a..b4308a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = NM-reg.txt TODO
+EXTRA_DIST = NM-reg.txt
.PHONY: ChangeLog INSTALL
commit 958353fc567f989a2c6c6ef73625f99de896a68d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:00:16 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..8f2454b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. 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.
-#
-# 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 copyright holders 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 copyright holders.
+#
+# 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.
#
drivermandir = $(DRIVER_MAN_DIR)
Reply to: