xserver-xorg-video-nsc: Changes to 'debian-experimental'
.cvsignore | 19 -
.gitignore | 20 +
ChangeLog | 410 +++++++++++++++++++++++++++++-----
config.sub | 14 -
configure | 20 -
configure.ac | 2
debian/changelog | 36 ++
debian/control | 15 -
debian/copyright | 3
debian/patches/01_gen_pci_ids.diff | 14 +
debian/patches/series | 1
debian/rules | 2
debian/xserver-xorg-video-nsc.install | 1
debian/xsfbs/xsfbs.mk | 36 +-
debian/xsfbs/xsfbs.sh | 7
man/.cvsignore | 2
man/.gitignore | 2
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.am | 6
src/Makefile.in | 53 +++-
src/durango.c | 265 ---------------------
src/nsc_driver.c | 8
src/panel.c | 19 -
src/panel/panel.c | 19 -
src/panel/platform.c | 366 ------------------------------
26 files changed, 525 insertions(+), 827 deletions(-)
New commits:
commit dffcf812a5a8d6d106c96b5e2109b80e7131fd1a
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 09:55:30 2007 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 3ac0cb8..0ae9965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-nsc (1:2.8.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-nsc (1:2.8.3-1) experimental; urgency=low
* New upstream release.
* Add upstream URL to debian/copyright.
@@ -6,7 +6,7 @@ xserver-xorg-video-nsc (1:2.8.3-1) UNRELEASED; urgency=low
* Add 01_gen_pci_ids.diff. This patch adds a list of pci id's that the
driver supports so that the server can automatically load it.
- -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:49:44 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:57:00 +0200
xserver-xorg-video-nsc (1:2.8.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a87a0aa..6c2d595 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-nsc
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nsc
commit b0d47bf3f89ef2cd108275e8041af1788d8923fe
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 09:50:19 2007 +0200
Add 01_gen_pci_ids.diff
diff --git a/debian/changelog b/debian/changelog
index 3ceacdf..3ac0cb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xserver-xorg-video-nsc (1:2.8.3-1) UNRELEASED; urgency=low
* New upstream release.
* Add upstream URL to debian/copyright.
* Build against xserver 1.4.
+ * Add 01_gen_pci_ids.diff. This patch adds a list of pci id's that the
+ driver supports so that the server can automatically load it.
- -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:44:53 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:49:44 +0200
xserver-xorg-video-nsc (1:2.8.2-2) unstable; urgency=low
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
new file mode 100644
index 0000000..3327ae7
--- /dev/null
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -0,0 +1,14 @@
+Index: xserver-xorg-video-nsc/src/Makefile.am
+===================================================================
+--- xserver-xorg-video-nsc.orig/src/Makefile.am 2007-09-13 09:46:05.000000000 +0200
++++ xserver-xorg-video-nsc/src/Makefile.am 2007-09-13 09:48:21.000000000 +0200
+@@ -120,3 +120,9 @@
+ gfx/vip_1400.c
+
+
++pcidatadir = $(datadir)/xserver-xorg/pci
++pcidata_DATA = nsc.ids
++
++nsc.ids: nsc_driver.c
++ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/1078/' > nsc.ids
++ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/100B/' >> nsc.ids
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b55d79f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_gen_pci_ids.diff
diff --git a/debian/xserver-xorg-video-nsc.install b/debian/xserver-xorg-video-nsc.install
index 614cfb4..8a9f4ba 100644
--- a/debian/xserver-xorg-video-nsc.install
+++ b/debian/xserver-xorg-video-nsc.install
@@ -1,2 +1,3 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
+usr/share/xserver-xorg/pci/*
diff --git a/src/Makefile.am b/src/Makefile.am
index 97e1010..f35a6ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,3 +120,9 @@ EXTRA_DIST = \
gfx/vip_1400.c
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = nsc.ids
+
+nsc.ids: nsc_driver.c
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/1078/' > nsc.ids
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/100B/' >> nsc.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index c720da3..5e65131 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -34,6 +34,7 @@
# 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.
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -74,7 +75,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nsc_drv_ladir)"
+am__installdirs = "$(DESTDIR)$(nsc_drv_ladir)" \
+ "$(DESTDIR)$(pcidatadir)"
nsc_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(nsc_drv_la_LTLIBRARIES)
nsc_drv_la_LIBADD =
@@ -108,6 +110,8 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(nsc_drv_la_SOURCES)
DIST_SOURCES = $(am__nsc_drv_la_SOURCES_DIST)
+pcidataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pcidata_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -318,6 +322,8 @@ EXTRA_DIST = \
gfx/vid_1400.c \
gfx/vip_1400.c
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = nsc.ids
all: all-am
.SUFFIXES:
@@ -443,6 +449,23 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
+install-pcidataDATA: $(pcidata_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pcidatadir)" || $(mkdir_p) "$(DESTDIR)$(pcidatadir)"
+ @list='$(pcidata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pcidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcidatadir)/$$f'"; \
+ $(pcidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcidatadir)/$$f"; \
+ done
+
+uninstall-pcidataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pcidata_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pcidatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pcidatadir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -522,9 +545,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(nsc_drv_ladir)"; do \
+ for dir in "$(DESTDIR)$(nsc_drv_ladir)" "$(DESTDIR)$(pcidatadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -572,7 +595,7 @@ info: info-am
info-am:
-install-data-am: install-nsc_drv_laLTLIBRARIES
+install-data-am: install-nsc_drv_laLTLIBRARIES install-pcidataDATA
install-exec-am:
@@ -600,7 +623,8 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-info-am uninstall-nsc_drv_laLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-nsc_drv_laLTLIBRARIES \
+ uninstall-pcidataDATA
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-nsc_drv_laLTLIBRARIES ctags distclean \
@@ -608,13 +632,18 @@ uninstall-am: uninstall-info-am uninstall-nsc_drv_laLTLIBRARIES
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
- install-nsc_drv_laLTLIBRARIES install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-nsc_drv_laLTLIBRARIES
-
+ install-nsc_drv_laLTLIBRARIES install-pcidataDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am uninstall-nsc_drv_laLTLIBRARIES \
+ uninstall-pcidataDATA
+
+
+nsc.ids: nsc_driver.c
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/1078/' > nsc.ids
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sed -e 's/0x/100B/' >> nsc.ids
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
commit e19dad3a7784e6e9141947487e84b22859655bee
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 09:45:02 2007 +0200
Build against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index 07ffe56..3ceacdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-nsc (1:2.8.3-1) UNRELEASED; urgency=low
* New upstream release.
* Add upstream URL to debian/copyright.
+ * Build against xserver 1.4.
- -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:44:18 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:44:53 +0200
xserver-xorg-video-nsc (1:2.8.2-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 36e789c..a87a0aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-xext-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nsc
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nsc.git
commit c0e7e3196b2c97710b06f839cccc219f14c16422
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 09:44:35 2007 +0200
Add upstream URL to debian/copyright
diff --git a/debian/changelog b/debian/changelog
index 17d702d..07ffe56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-nsc (1:2.8.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add upstream URL to debian/copyright.
- -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:42:22 +0200
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:44:18 +0200
xserver-xorg-video-nsc (1:2.8.2-2) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index a6da11c..fd3c554 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright (c) 1999-2001
National Semiconductor Corporation.
All rights reserved.
commit 0748c6b8d0195256942d2d6d50a753500a9afa5f
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 09:43:26 2007 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 9095e7b..5d15169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,84 +1,376 @@
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit 829b289a4809e0544f9df9d95866dcff514c108d
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 4 18:00:51 2007 -0700
- * configure.ac:
- * src/nsc_driver.c:
- Bump to 2.8.1 for Xv changes.
+ Bump driver version to 2.8.3 to release untested build fixes.
-2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+commit 65e357db17a8a45b90a4af92d5765aefda80c00c
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Aug 20 16:41:18 2007 -0700
- * src/nsc_gx1_video.c: (GX1PutImage):
- * src/nsc_gx2_video.c: (GX2PutImage):
- Add a DrawablePtr argument to the XV functions to pave the way for
- redirected video.
+ Bug #9588: Fix build after XFree86Server unifdef by removing HAL junk.
+
+ This is untested beyond building, but no maintainer could be found.
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
+commit b4703cb8a5eab9aa88f40484b15c122cb869569b
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:39 2007 -0400
- * configure.ac:
- * src/durango.c:
- * src/nsc.h:
- * src/nsc_driver.c:
- * src/nsc_galstub.c:
- * src/nsc_gx1_accel.c:
- * src/nsc_gx1_cursor.c:
- * src/nsc_gx1_dga.c:
- * src/nsc_gx1_driver.c:
- * src/nsc_gx1_shadow.c:
- * src/nsc_gx1_video.c:
- * src/nsc_gx2_accel.c:
- * src/nsc_gx2_cursor.c:
- * src/nsc_gx2_dga.c:
- * src/nsc_gx2_driver.c:
- * src/nsc_gx2_shadow.c:
- * src/nsc_gx2_video.c:
- Unlibcwrap. Bump server version requirement. Bump to 2.8.0.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2006-02-27 Alan Coopersmith <alan.coopersmith@sun.com>
+commit a6e2d0bf43c95740b34bb317579ba32aaa7a5b87
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:52 2007 -0400
- * man/nsc.man:
- Typo fix (Nicholas Joly, XFree86 bugzilla #1658)
+ Rename .cvsignore to .gitignore
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d6c60cc3fde115df8ab1913038923e1164b29f07
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Tue Aug 7 12:33:30 2007 +0200
- * configure.ac:
- Update package version for X11R7 release.
+ Define NSC_VERSION_* using PACKAGE_VERSION*
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c37c8076df5fa28cdba255519037b184c1cca567
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Oct 13 18:39:21 2006 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Bump to 2.8.2
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 47be0f00a21fa2053d600c49707335825182b4bd
+Author: bart@po8.org <bart@po8.org>
+Date: Tue Sep 12 01:00:13 2006 -0700
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ [PATCH] More compilation fixes
+
+ I'm not sure the attached fix is at all correct, but it at
+ least makes vague sense and got the nsc driver to compile.
+
+ I'm stuck right now with a missing source symbol
+ (SMI_COUGAR3DR) in the Silicon Motion driver. I'm giving up
+ and going to sleep; I'll bug you tomorrow.
+
+ Bart
+
+ Signed-off-by: Keith Packard <keithp@neko.keithp.com>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit abc5f38e445c8124b8febff40ade151fd274fe94
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 01:36:56 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bump to 2.8.1 for Xv changes.
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 61bdc4d2c00945c3cc5b257b7f7fb9290cf3acca
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Fri Apr 7 23:10:36 2006 +0000
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit bec305f962c8133e33c9c835f416ac55777231f3
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Apr 7 19:35:33 2006 +0000
- * configure.ac:
- Only build dlloader modules by default.
+ Unlibcwrap. Bump server version requirement. Bump to 2.8.0.
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 31e8d94f0f097d08075816939f36ad6d957878fa
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Feb 27 18:16:13 2006 +0000
- * configure.ac:
- Add check for DGA extension to fix issues when building with
- separate build roots.
+ Typo fix (Nicholas Joly, XFree86 bugzilla #1658)
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 73052d252e5db99d1f3fcd8333eb6b8ffa796615
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:01 2005 +0000
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Update package version for X11R7 release.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9e9859133fd745e49a6fbf26ca77e96c456d4980
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:54 2005 +0000
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Stub COPYING files
+
+commit a3c0bd00c6ef0325c92517ea59f071b992bec5c4
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:18 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit b0d6f4c429ab9f5bd0852e9d9d82920f7b3fd511
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:36 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d78405f5f8abdf43fc92ffeb4cc9639a9e5ed41b
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:34 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit bf8000b2bf5fa4444436f05880ae70bdf8ab41b5
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:09 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit 36d79242ab6ff35823ce6ca894f338d2a70c6512
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:59 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit a2e6b70b2819c3f0646840780d5ccdf31ae1f6ca
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:10 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 4b6f7f38720957b40e625423e8b79b51227e3280
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:16 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 5584a8547bd3fae6f855ce85baabe1f6040450b5
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 15 05:42:03 2005 +0000
+
+ Add check for DGA extension to fix issues when building with separate build
+ roots.
+
+commit 4967162dc96d6719b4f74a1298e081ff6664574f
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:19 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit ee7cd557f1bf63afeaaf5810315926f6320a8323
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:53 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit a75d2b86b25ca09169fe960163624738bda521a7
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:03 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 03f56f55f526d9efbd1cc0a58b49b709c90540ac
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:53 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 297480c08f3c77d819529837068aa03768d0663b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:34 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit 81884fac6390b2efe0219f510d4d5724a82ce567
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:09:04 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 7106f97058a605cf44142899a3248636c3599a3a
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Oct 4 22:59:15 2005 +0000
+
+ Add missing files for various drivers Remove trailing / on src_dir that
+ causes problems in symlink.sh
+
+commit e91ec06ab2e242aff715409817ddeab11f7d35ce
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Oct 2 22:05:13 2005 +0000
+
+ Don't try to use i386 assembly if building for AMD64
+
+commit dffc33314454667cdaa1910e0f20d32d23114072
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Sep 27 21:50:48 2005 +0000
+
+ Add some additional gfx files to EXTRA_DIST On i386 add the file
+ nsc_asm_msr.S to the source files
+
+commit e8255ee9f28b3841bc591c656dd045be8e3a3301
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:47 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit e2f095fe3f8d67d02ad253aab03120433291c110
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:44 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit b2053fa96e70ec926def822eb30de1283af928ca
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Tue Jul 26 18:01:24 2005 +0000
+
+ Build system for nsc
+
+commit ece4c4330591069ca55dc836e677dce2558d3ace
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:29:57 2005 +0000
+
+ Prep for modular builds by adding guarded #include "config.h" everywhere.
+
+commit ea81b9b00ade213b0297fa1ae8956bcea91286c2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 1 22:43:12 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit 89449af0584b763a4e07425c801e596c05feb783
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:16:55 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 683f2cce24df4e1f30243e619a2c1cd05458ad59
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:28 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 2a0df477542cde8c92ddaae7456a18c99052a91a
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:43:09 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 3f5ba2682bf4d99d7697d61c2a037800c034200f
+Author: Egbert Eich <eich@suse.de>
+Date: Mon Oct 18 14:21:45 2004 +0000
+
+ Made handling of DevelDrivers for x86-64 more conformant to other
+ platforms.
+ Compress all font encodings (Stefan Dirsch).
+ Fixed warnings.
+ Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and
+ Root mode (bugzilla #1580, James Su).
+ Added another compose key combination for the Euro symbol (Stefan Dirsch).
+ Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
+ Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian).
+ This is the encoding that is also used by glibc. We may break other
+ libcs - lets see who complains.
+ Added explanation for DESTDIR to install to a different directory than /.
+ Added some early bailouts to atiprobe if PCI structure pointer is NULL to
+ prevent sig11.
+ XV support doesn't depend on 2D acceleration any more. This patch removes
+ this limitation from the NSC driver. This is a patch that I have
+ committed to XFree86 a while ago but never ported over to X.Org.
+ Matthieu Herrb contributed some build fixes.
+ Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate
+ timer. This takes advantage of the fact that TimerSet() with a timeout
+ argument 0 behaves like TimerCanel().
+ Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
+ Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
+ Changed comment to mention xorg.
+ Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If
+ you don't like it we can change it back (original author unkown).
+ Added 'pic' to the man page rendering command pipeline (Werner Fink).
+ Added missing return value (Stefan Dirsch, Roland Mainz)
+
+commit d6346c6ac6a6a38d47bbf6cc4271110b8bf93dcf
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Sep 17 03:04:52 2004 +0000
+
+ Bug #1192: Remove cfb support from drivers where its use is an option.
+ Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+ to refer to fb rather than cfb.
+
+commit a7d27d00febe51416a3f2d719982f6586ebe1bff
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri Jul 30 20:30:53 2004 +0000
+
+ Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
+ framebuffer formats except cfb and the overlay modes should work, and
+ r128 and radeon need to be loaded from the ati driver (both issues to
+ be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
+ drivers. elfloader users shouldn't be affected.
+
+commit 1b0fc4d16af312d67728dace2d30da4cf819c465
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:22:36 2004 +0000
+
+ DRI XFree86-4_3_99_12-merge import
+
+commit cbb680972ff178fd9d8b0fca7ea22d5b47646cb6
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:41:40 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit f5662a7641f52606b2e4922f4c41537238a065e5
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:27 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 9d62d7429d1cea40999a1759a2596b832e282ae4
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:20 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 33a55366c96558d29c3ffe93f544f8d11b55cf6a
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:53 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit bedc0818c70da9327ea1a253f5e75fa3e236fc9d
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:22 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 69b40cd96ed868dd028cade989cbadbb9ac50b0a
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:08:35 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit e98acf72d990777d4b0afa42b42bb90edcf6de3e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Dec 19 20:55:11 2003 +0000
+
+ XFree86 4.3.99.902 (RC 2)
+
+commit ae25b306d5f2e46a7ff9971957bc1005d01e7d45
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:38 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 1bf4874e04bf0287dc5dbb5e7e34585d44e10337
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit c34b9dd6458c0dc2e9b4db40d8b803ca5a86a24a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:55 2003 +0000
+
+ Initial revision
diff --git a/config.sub b/config.sub
index fab0aa3..387c18d 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
+timestamp='2006-07-02'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,7 +276,6 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -368,7 +367,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
- basic_machine=mipsisa32-sde
- os=-elf
- ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1371,9 +1366,6 @@ else
# system, and we'll never get to this point.
case $basic_machine in
- score-*)
- os=-elf
- ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index afb3506..e9084d5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nsc 2.8.2.
+# Generated by GNU Autoconf 2.61 for xf86-video-nsc 2.8.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-nsc'
PACKAGE_TARNAME='xf86-video-nsc'
-PACKAGE_VERSION='2.8.2'
-PACKAGE_STRING='xf86-video-nsc 2.8.2'
+PACKAGE_VERSION='2.8.3'
+PACKAGE_STRING='xf86-video-nsc 2.8.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1418,7 +1418,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-nsc 2.8.2 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nsc 2.8.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1488,7 +1488,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-nsc 2.8.2:";;
+ short | recursive ) echo "Configuration of xf86-video-nsc 2.8.3:";;
esac
cat <<\_ACEOF
@@ -1602,7 +1602,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-nsc configure 2.8.2
+xf86-video-nsc configure 2.8.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1616,7 +1616,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-nsc $as_me 2.8.2, which was
+It was created by xf86-video-nsc $as_me 2.8.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2291,7 +2291,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-nsc'
- VERSION='2.8.2'
+ VERSION='2.8.3'
cat >>confdefs.h <<_ACEOF
@@ -21459,7 +21459,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-nsc $as_me 2.8.2, which was
+This file was extended by xf86-video-nsc $as_me 2.8.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21512,7 +21512,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-nsc config.status 2.8.2
+xf86-video-nsc config.status 2.8.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index caf8650..17d702d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nsc (1:2.8.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 09:42:22 +0200
+
xserver-xorg-video-nsc (1:2.8.2-2) unstable; urgency=low
[ Julien Cristau ]
commit 829b289a4809e0544f9df9d95866dcff514c108d
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 18:00:51 2007 -0700
Bump driver version to 2.8.3 to release untested build fixes.
diff --git a/configure.ac b/configure.ac
index 34c9bce..4b724dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-nsc],
- 2.8.2,
+ 2.8.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-nsc)
commit 65e357db17a8a45b90a4af92d5765aefda80c00c
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 20 16:41:18 2007 -0700
Bug #9588: Fix build after XFree86Server unifdef by removing HAL junk.
This is untested beyond building, but no maintainer could be found.
diff --git a/src/durango.c b/src/durango.c
index 690824f..12f3b46 100644
--- a/src/durango.c
+++ b/src/durango.c
@@ -311,221 +311,6 @@ unsigned char *gfx_phys_vipptr = (unsigned char *)0x40015000;
* routines will work properly.
*/
-#if defined(OS_WIN32) /* For Windows */
-
-/* VSA II CALL */
-
-void
-gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr,
- unsigned long *ptrHigh, unsigned long *ptrLow)
-{
- unsigned long temp1, temp2;
-
- _asm {
- mov dx, 0x0AC1C
- mov eax, 0x0FC530007
- out dx, eax
- add dl, 2
- mov ecx, msrAddr
- mov cx, msrReg
- in ax, dx;
- ;EDX:EAX will contain MSR contents.
- mov temp1, edx
- mov temp2, eax
- }
-
- *ptrHigh = temp1;
- *ptrLow = temp2;
-}
-
-void
Reply to: