xserver-xorg-video-newport: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
man/Makefile.am | 1 -
man/newport.man | 2 +-
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/newport_driver.c | 28 ++++++++++++----------------
10 files changed, 42 insertions(+), 46 deletions(-)
New commits:
commit 67fbf6932ec59063928925401283958ccdfb98c3
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 15 03:01:04 2009 +0200
Bump to 0.2.2
diff --git a/configure.ac b/configure.ac
index 5aa1609..4478cbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-newport],
- 0.2.1,
+ 0.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-newport)
commit 50e8de3620fc0e4e6df47d101b9743424fb9ed4c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 9 16:31:17 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/newport.man b/man/newport.man
index 701735a..1fbc5fe 100644
--- a/man/newport.man
+++ b/man/newport.man
@@ -39,7 +39,7 @@ Enable or disable the HW cursor. Default: on.
.BI "Option \*qBusID\*q \*q"integer \*q
Set to 1 for the Indigo2 XL. Default: 0
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors:
Guido GÜnther \fIagx@sigxcpu.org\fP
commit 6cad0fa508db77a9ce45165a1cf870ee2f54ca3d
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Nov 23 20:14:15 2008 -0500
Use "no" bus, not ISA
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 0bf0fe1..757fd12 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -1,6 +1,4 @@
/*
- * Id: newport_driver.c,v 1.2 2000/11/29 20:58:10 agx Exp $
- *
* Driver for the SGI Indy's Newport graphics card
*
* This driver is based on the newport.c & newport_con.c kernel code
@@ -30,7 +28,6 @@
* Project.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.25 2003/04/23 21:51:41 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -272,17 +269,13 @@ NewportProbe(DriverPtr drv, int flags)
int entity;
ScrnInfoPtr pScrn = NULL;
- /* This is a hack because don't have the RAC info(and don't want it).
- * Set it as an ISA entity to get the entity field set up right.
- */
- entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE);
+ entity = xf86ClaimNoSlot(drv, 0, dev, TRUE);
base = (NEWPORT_BASE_ADDR0
+ busID * NEWPORT_BASE_OFFSET);
RANGE(range[0], base, base + sizeof(NewportRegs),\
ResExcMemBlock);
- pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, range, \
- NULL, NULL, NULL, NULL);
- /* Allocate a ScrnInfoRec */
+ pScrn = xf86AllocateScreen(drv, 0);
+ xf86AddEntityToScreen(pScrn, entity);
pScrn->driverVersion = NEWPORT_VERSION;
pScrn->driverName = NEWPORT_DRIVER_NAME;
pScrn->name = NEWPORT_NAME;
commit 75e6c48a6f9f731ed6088e6f65db4697b89f9f85
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 8 23:41:26 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 86b6bb11ffc4bce5886b5bc28b8df41af89f0925
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 25 11:52:20 2008 +0100
Bug#11761: Fix xaa initialization
Load the xaa module when NoAccel is unset, so it actually has a chance
to work.
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 4794df1..0bf0fe1 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -593,12 +593,15 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
pNewport->NoAccel = FALSE;
if (xf86ReturnOptValBool(pNewport->Options, OPTION_NOACCEL, FALSE))
{
- if (!xf86LoadSubModule(pScrn, "xaa"))
- return FALSE;
- xf86LoaderReqSymLists(xaaSymbols, NULL);
pNewport->NoAccel = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
}
+ if (!pNewport->NoAccel) {
+ if (!xf86LoadSubModule(pScrn, "xaa"))
+ pNewport->NoAccel = TRUE;
+ else
+ xf86LoaderReqSymLists(xaaSymbols, NULL);
+ }
#if 0
if (pScrn->bitsPerPixel < 24)
{ /* not implemented yet */
commit 39c8fdb4029f775a4cfc6b84be6584876e54b49e
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:37 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 023e3e4e20c6145e6ac70eea1c18cf5518b935ca
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:50 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 6cce7770b43999ea606a468d63067aa6263a7940
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 12:37:51 2007 +0200
Define NEWPORT_*_VERSION using PACKAGE_VERSION_*
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 2bb6cab..4794df1 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -62,9 +62,9 @@
#define NEWPORT_VERSION 4000
#define NEWPORT_NAME "NEWPORT"
#define NEWPORT_DRIVER_NAME "newport"
-#define NEWPORT_MAJOR_VERSION 0
-#define NEWPORT_MINOR_VERSION 2
-#define NEWPORT_PATCHLEVEL 0
+#define NEWPORT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define NEWPORT_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define NEWPORT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/* Prototypes ------------------------------------------------------- */
Reply to: