.gitignore | 70 +++++ COPYING | 67 +++++ ChangeLog | 585 -------------------------------------------------- Makefile.am | 12 - configure.ac | 14 - debian/README.source | 2 debian/changelog | 24 ++ debian/control | 10 debian/rules | 10 debian/xsfbs/xsfbs.mk | 35 +- man/.cvsignore | 2 man/Makefile.am | 41 +-- src/.cvsignore | 6 src/trident.h | 7 src/trident_dac.c | 2 src/trident_driver.c | 17 - src/tridentramdac.c | 70 ----- src/tvga_dac.c | 2 18 files changed, 236 insertions(+), 740 deletions(-)
New commits: commit 81422b280b256e7d3e9e247360a7805ea1024c80 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Aug 4 12:13:11 2010 +1000 Add changelog entry for 1.3.4-1 diff --git a/debian/changelog b/debian/changelog index 0f84fe2..a3a5ad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-trident (1:1.3.4-1) UNRELEASED; urgency=low + + * New upstream version + - Fixes build against Xserver 1.9, which dropped ISA support and mibank.h + * Bump Standards-Version to 3.9.1 (no changes needed) + + -- Christopher James Halse Rogers <[email protected]> Wed, 04 Aug 2010 12:02:36 +1000 + xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 08b344e..3d3a298 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git commit d38c91c0cd2bb3d503784899a05a09d063c6d9b0 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Aug 4 12:12:34 2010 +1000 Remove stale tridentramdac.c file. It's not in the tarball, it's not in upstream git, it's not used in the build. Remove it from our tree, too diff --git a/src/tridentramdac.c b/src/tridentramdac.c deleted file mode 100644 index 299e782..0000000 --- a/src/tridentramdac.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 1992-2003 by Alan Hourihane, 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. - * - * Authors: Alan Hourihane, <[email protected]> - * - * TridentOutIndReg() and TridentInIndReg() are used to access - * the indirect Trident RAMDAC registers only. - */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridentramdac.c,v 1.4 2000/12/07 16:48:06 alanh Exp $ */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "xf86.h" -#include "xf86_OSproc.h" - -#include "xf86PciInfo.h" -#include "xf86Pci.h" - -#include "trident_regs.h" -#include "trident.h" - -void -TridentWriteAddress(ScrnInfoPtr pScrn, CARD32 index) -{ - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - MMIO_OUTB(0x3C6, 0xFF); - MMIO_OUTB(0x3C8, index); -} - -void -TridentWriteData(ScrnInfoPtr pScrn, unsigned char data) -{ - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - MMIO_OUTB(0x3C9, data); -} - -void -TridentReadAddress(ScrnInfoPtr pScrn, CARD32 index) -{ - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - MMIO_OUTB(0x3C6, 0xFF); - MMIO_OUTB(0x3C7, index); -} - -unsigned char -TridentReadData(ScrnInfoPtr pScrn) -{ - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - return(MMIO_INB(0x3C9)); -} commit b5d17329ae1746bc95ac211c1325df86982e0eb1 Author: Dave Airlie <[email protected]> Date: Mon Jul 5 14:32:39 2010 +1000 trident 1.3.4 diff --git a/configure.ac b/configure.ac index ebff147..be54427 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-trident], - 1.3.3, + 1.3.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-trident) commit ea2f02a84ad5a51a39c0ae55fa5aa785360d3830 Author: Gaetan Nadon <[email protected]> Date: Sun Jun 13 12:34:21 2010 -0400 COPYING: replace stub file with actual Copyright notices. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/COPYING b/COPYING index 7f33cbf..42cdf3b 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,63 @@ -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 1992-2003 by Alan Hourihane, North Wales, UK. -Please submit updated COPYING files to the Xorg bugzilla: +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. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +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. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Copyright 1997-2003 by Alan Hourihane, North Wales, UK. +Copyright 2006 by Alan Hourihane, North Wales, UK. +Copyright (c) 2006, Jesse Barnes <[email protected]> + +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 the authors not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The authors make no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS 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 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. -http://lists.freedesktop.org/mailman/listinfo/xorg commit 9632c09a9437e4fca1cdded2ea9b09ca4461a7a5 Author: Mikhail Gusarov <[email protected]> Date: Fri May 7 18:58:59 2010 +0700 Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control diff --git a/debian/control b/debian/control index a6d156e..08b344e 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,5 @@ Description: X.Org X server -- Trident display driver . More information about X.Org can be found at: <URL:http://www.X.org> - <URL:http://xorg.freedesktop.org> - <URL:http://lists.freedesktop.org/mailman/listinfo/xorg> . This package is built from the X.org xf86-video-trident driver module. commit 30f5d9803c5d4c8beb3f35fad79e1a718444105d Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:50:48 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 9801275..0f84fe2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-trident (1:1.3.3-2) UNRELEASED; urgency=low +xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -12,7 +12,7 @@ xserver-xorg-video-trident (1:1.3.3-2) UNRELEASED; urgency=low * Add myself to Uploaders. * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). - -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:07:50 +0100 + -- Cyril Brulebois <[email protected]> Tue, 04 May 2010 00:50:44 +0200 xserver-xorg-video-trident (1:1.3.3-1) experimental; urgency=low commit a88bab9eab376d83cd5f0d8133897b9c6d641c08 Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:50:33 2010 +0200 Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 1f73740..9801275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-trident (1:1.3.3-2) UNRELEASED; urgency=low ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:07:50 +0100 diff --git a/debian/control b/debian/control index c3c76f0..a6d156e 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: x11proto-randr-dev, x11proto-render-dev, dpkg-dev (>= 1.14.17) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git commit 63948fad9abc02beffd6eb162cb759fc3aeaccb5 Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:50:19 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 5d018fb..1f73740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-trident (1:1.3.3-2) UNRELEASED; urgency=low * Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. + * Add myself to Uploaders. -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:07:50 +0100 diff --git a/debian/control b/debian/control index df233b9..c3c76f0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-trident Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]> +Uploaders: David Nusinow <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit c77ae2b3cd03fc11275c5fd591e7637168a9991f Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:50:11 2010 +0200 Update to new xsfbs, replace deprecated ${xserver:Depends} with ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev accordingly. diff --git a/debian/changelog b/debian/changelog index e087ef8..5d018fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ xserver-xorg-video-trident (1:1.3.3-2) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + -- Julien Cristau <[email protected]> Sat, 23 Jan 2010 02:07:50 +0100 xserver-xorg-video-trident (1:1.3.3-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 41cfbdb..df233b9 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: automake, libtool, xutils-dev, - xserver-xorg-dev (>= 2:1.7), + xserver-xorg-dev (>= 2:1.7.6.901), x11proto-video-dev, x11proto-xext-dev, x11proto-xf86dga-dev, @@ -25,7 +25,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident Package: xserver-xorg-video-trident Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Provides: ${xviddriver:Provides} Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-driver-trident Conflicts: xserver-xorg-driver-trident commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit d9a25cc9757a626febde99f57b716dfdbc1cfdaa Author: Julien Cristau <[email protected]> Date: Sat Jan 23 01:46:31 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 2242ab9..3e111b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-trident (1:1.3.3-1) UNRELEASED; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! + * Remove myself from Uploaders -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:13 +0200 diff --git a/debian/control b/debian/control index 6e18221..41cfbdb 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-trident Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Julien Cristau <[email protected]> +Uploaders: David Nusinow <[email protected]> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit dd0f9ad6ba13743b92b675b96c73ce29a79a66cc Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:43 2010 +0000 Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! diff --git a/debian/changelog b/debian/changelog index 0028817..2242ab9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ xserver-xorg-video-trident (1:1.3.3-1) UNRELEASED; urgency=low + [ Timo Aaltonen ] * New upstream release. * Bump Standards-Version to 3.8.3. * Build against Xserver 1.7. * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to choose a driver during autoconfiguration. + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + -- Timo Aaltonen <[email protected]> Sat, 05 Dec 2009 01:49:13 +0200 xserver-xorg-video-trident (1:1.3.1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 15fe668..d83895a 100755 --- a/debian/rules +++ b/debian/rules @@ -37,12 +37,12 @@ build-stamp: $(STAMP_DIR)/patch dh_testdir autoreconf -vfi - mkdir -p obj-$(DEB_BUILD_GNU_TYPE) - cd obj-$(DEB_BUILD_GNU_TYPE) && \ + mkdir -p build + cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ CFLAGS="$(CFLAGS)" - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + cd build && $(MAKE) >$@ clean: xsfclean @@ -54,7 +54,7 @@ clean: xsfclean rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* rm -rf autom4te.cache */autom4te.cache - rm -rf obj-* + rm -rf build rm -f aclocal.m4 config.guess config.sub config.h.in configure rm -f depcomp install-sh ltmain.sh missing mkinstalldirs rm -f $$(find -name Makefile.in) @@ -67,7 +67,7 @@ install: build dh_clean -k dh_installdirs - cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install # Build architecture-dependent files here. binary-arch: build install serverabi commit cb7949bf5a4e99755677ce5df09f2e977a47da71 Author: Alan Coopersmith <[email protected]> Date: Fri Jan 15 15:05:31 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> 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) commit c5ec01e6786280717675d3841d85337645b15753 Author: Gaetan Nadon <[email protected]> Date: Tue Dec 15 22:01:02 2009 -0500 configure.ac: remove unused sdkdir=$(pkg-config...) statement The sdkdir variable isn't use, so remove the statement. Acked-by: Dan Nicholson <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 575d92b..ebff147 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,6 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) save_CFLAGS="$CFLAGS" CFLAGS="$XORG_CFLAGS" commit 1331623dbee4fbfa36188a4460a95bed4128f11e Author: Adam Jackson <[email protected]> Date: Wed Dec 30 13:08:51 2009 -0500 Make banking support properly conditional on ISA support Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/trident.h b/src/trident.h index 1142b50..c15d39c 100644 --- a/src/trident.h +++ b/src/trident.h @@ -46,6 +46,13 @@ #include "xf86Pci.h" #include "vbe.h" +/* Banked framebuffer only supported on ISA */ +#ifdef HAVE_ISA +#define LINEAR() (pTrident->Linear) +#else +#define LINEAR() (1) +#endif + #define PCI_CHIP_2200 0x2200 typedef struct { diff --git a/src/trident_dac.c b/src/trident_dac.c index cd7da80..a46f22b 100644 --- a/src/trident_dac.c +++ b/src/trident_dac.c @@ -640,7 +640,7 @@ TridentInit(ScrnInfoPtr pScrn, DisplayModePtr mode) pReg->tridentRegs3C4[Protection] = 0x92; pReg->tridentRegs3x4[LinearAddReg] = 0; - if (pTrident->Linear) { + if (LINEAR()) { /* This is used for VLB, when we support it again in 4.0 */ if (pTrident->Chipset < CYBER9385) pReg->tridentRegs3x4[LinearAddReg] |= diff --git a/src/trident_driver.c b/src/trident_driver.c index addb1af..31cbb83 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -35,7 +35,9 @@ #include "fb.h" +#ifdef HAVE_ISA #include "mibank.h" +#endif #include "micmap.h" #include "xf86.h" #include "xf86_OSproc.h" @@ -72,7 +74,6 @@ #include <X11/extensions/dpms.h> #endif - #include "xf86xv.h" static const OptionInfoRec * TRIDENTAvailableOptions(int chipid, int busid); @@ -1353,7 +1354,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) pTrident->OverrideBskew); } if (xf86ReturnOptValBool(pTrident->Options, OPTION_SHADOW_FB, FALSE)) { - if (!pTrident->Linear) + if (!LINEAR()) xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Ignoring Option SHADOW_FB" " in non-Linear Mode\n"); else { @@ -1365,7 +1366,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) } pTrident->Rotate = 0; if ((s = xf86GetOptValString(pTrident->Options, OPTION_ROTATE))) { - if (!pTrident->Linear) + if (!LINEAR()) xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Ignoring Option ROTATE " "in non-Linear Mode\n"); else { @@ -1415,7 +1416,7 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) /* FIXME ACCELERATION */ if (!UseMMIO) pTrident->NoAccel = TRUE; - if (pTrident->Linear) { + if (LINEAR()) { if (pTrident->pEnt->device->MemBase != 0) { /* * XXX Should check that the config file value matches one of the @@ -2498,7 +2499,7 @@ TRIDENTMapMem(ScrnInfoPtr pScrn) if (pTrident->IOBase == NULL) return FALSE; - if (pTrident->Linear) { + if (LINEAR()) { if (pTrident->FbMapSize != 0) { #ifndef XSERVER_LIBPCIACCESS pTrident->FbBase = xf86MapPciMem(pScrn->scrnIndex, @@ -2559,7 +2560,7 @@ TRIDENTUnmapMem(ScrnInfoPtr pScrn) #endif pTrident->IOBase = NULL; - if (pTrident->Linear) { + if (LINEAR()) { if (pTrident->FbMapSize != 0) { #ifdef XSERVER_LIBPCIACCESS pci_device_unmap_range(pTrident->PciInfo, (pointer)pTrident->FbBase, pTrident->FbMapSize); @@ -2931,7 +2932,8 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!pTrident->ShadowFB) TRIDENTDGAInit(pScreen); - if (!pTrident->Linear) { +#ifdef HAVE_ISA + if (!LINEAR()) { miBankInfoPtr pBankInfo; /* Setup the vga banking variables */ @@ -2965,6 +2967,7 @@ TRIDENTScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; } } +#endif { BoxRec AvailFBArea; diff --git a/src/tvga_dac.c b/src/tvga_dac.c index 422005d..7f2e89a 100644 --- a/src/tvga_dac.c +++ b/src/tvga_dac.c @@ -110,7 +110,7 @@ TVGAInit(ScrnInfoPtr pScrn, DisplayModePtr mode) pReg->tridentRegs3C4[NewMode1] = 0x80; - if (pTrident->Linear) + if (LINEAR()) pReg->tridentRegs3x4[LinearAddReg] = ((pTrident->FbAddress >> 24) << 6)| ((pTrident->FbAddress >> 20) & 0x0F)| 0x20; commit d6f5105ff4bab91a2af4cf5655b88ff27cba74bd Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 09:25:06 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index d451f3e..4c278ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src man +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL commit 3809fea7739b8639d855d790686c2b1eb1b91898 Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:41:41 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Automake 'foreign' option is specified in configure.ac. Remove from Makefile.am diff --git a/Makefile.am b/Makefile.am index 882733f..d451f3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # 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. -AUTOMAKE_OPTIONS = foreign SUBDIRS = src man .PHONY: ChangeLog INSTALL commit 781094dd862b209022bb2f8cdf394e3479ab28c6 Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:09:10 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/Makefile.am b/Makefile.am index 8b7c3c7..882733f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 24951c3..575d92b 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 11775de5025c32b65551497cb7fbb7040be9c314 Author: Gaetan Nadon <[email protected]> Date: Mon Oct 26 12:54:22 2009 -0400 Several driver modules do not have a ChangeLog target in Makefile.am #23814 The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 4809cab..0000000 --- a/ChangeLog +++ /dev/null @@ -1,155 +0,0 @@ -2006-04-07 Adam Jackson <[email protected]> - - * configure.ac: - * src/trident_driver.c: - Bump to 1.2.1 for Xv changes. - -2006-04-07 Aaron Plattner <[email protected]> - - * src/trident_video.c: (TRIDENTPutImage): - Add a DrawablePtr argument to the XV functions to pave the way for - redirected video. - -2006-04-07 Adam Jackson <[email protected]> - - * configure.ac: - * src/blade_accel.c: - * src/blade_accel_exa.c: - * src/image_accel.c: - * src/trident.h: - * src/trident_accel.c: - * src/trident_bank.c: - * src/trident_dac.c: - * src/trident_dga.c: - * src/trident_driver.c: - * src/trident_i2c.c: - * src/trident_shadow.c: - * src/trident_tv.c: - * src/trident_video.c: -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
