.gitignore | 69 ++++++- COPYING | 89 ++++++++- ChangeLog | 455 -------------------------------------------------- Makefile.am | 12 + configure.ac | 18 - debian/README.source | 2 debian/changelog | 24 ++ debian/control | 10 - debian/rules | 10 - debian/xsfbs/xsfbs.mk | 35 ++- man/.cvsignore | 3 man/Makefile.am | 41 ++-- src/.cvsignore | 6 src/Makefile.am | 2 src/tseng.h | 3 src/tseng_mode.c | 2 16 files changed, 241 insertions(+), 540 deletions(-)
New commits: commit 35ce5f089288553b8fc6ae61b8d823c9b20e616b Author: Christopher James Halse Rogers <[email protected]> Date: Wed Aug 4 13:05:54 2010 +1000 Add changelog entry for 1.2.4-1 diff --git a/debian/changelog b/debian/changelog index b2764a3..c73c751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xserver-xorg-video-tseng (1:1.2.4-1) UNRELEASED; urgency=low + + * New upstream release + - Fixes build against Xserver 1.9 and its lack of 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:45:28 +1000 + xserver-xorg-video-tseng (1:1.2.3-2) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/control b/debian/control index 0a80f3b..e7de3b8 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: x11proto-render-dev, x11proto-xext-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-tseng Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tseng.git commit f80842085c790c3acf611d3944939f9515e4bee2 Author: Dave Airlie <[email protected]> Date: Mon Jul 5 14:16:09 2010 +1000 bump for release 1.2.4 diff --git a/configure.ac b/configure.ac index 51376c9..62cc318 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tseng], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tseng) commit eb4a39b11ece5dc4e34519286b3f406fecf9b5ae Author: Gaetan Nadon <[email protected]> Date: Sun Jun 13 12:49:55 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..461c4d5 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,85 @@ -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 2000 by Rainer Keller, <[email protected]>. -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 1990,91 by Thomas Roell, Dinkelscherben, Germany. + +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 Thomas Roell not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Thomas Roell makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THOMAS ROELL 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 2005-2006 Luc Verhaegen. +Copyright 1993-1997 The XFree86 Project, Inc. +Copyright 1990-1991 Thomas Roell. + + +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, sub license, +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 NON-INFRINGEMENT. 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 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 9bb1b4995b8825944531d495262a0bb049a45f3e Author: Gaetan Nadon <[email protected]> Date: Thu Apr 8 13:21:52 2010 -0400 config: remove redundant compiler flags These are available using --enable-strict-compilation Use same configure option as all x.org modules Only GCC was covered, not SUNCC or INTELCC Introduced in commit 85397a4ef7a3a13f7e2940cb0e5c2fdbfea4c695 Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 9daadc6..51376c9 100644 --- a/configure.ac +++ b/configure.ac @@ -45,10 +45,6 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall -pedantic" -fi - AH_TOP([#include "xorg-server.h"]) AC_ARG_WITH(xorg-module-dir, diff --git a/src/Makefile.am b/src/Makefile.am index 114f8e9..bf3a03a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ +AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) tseng_drv_la_LTLIBRARIES = tseng_drv.la tseng_drv_la_LDFLAGS = -module -avoid-version tseng_drv_ladir = @moduledir@/drivers commit bd71f657daa44b8e5fc416f6eb48e5bc8216e838 Author: Adam Jackson <[email protected]> Date: Tue May 18 13:13:44 2010 -0400 Remove mibank.h reference Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/tseng.h b/src/tseng.h index fbb0fd3..ce2f174 100644 --- a/src/tseng.h +++ b/src/tseng.h @@ -25,9 +25,6 @@ /* All Tseng chips _need_ VGA register access, so multihead operation is out of the question */ #include "vgaHW.h" -/* Drivers using the mi banking wrapper need this */ -#include "mibank.h" - /* All drivers using the mi colormap manipulation need this */ #include "micmap.h" commit a4bc4d25fe38a2778593a8b1b606c2507f9981f0 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 8ecb271..0a80f3b 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,5 @@ Description: X.Org X server -- Tseng 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-tseng driver module. commit 5bf78ef9a273b4bc56b9a2548e9715333aa885ad Author: Tiago Vignatti <[email protected]> Date: Thu May 6 20:16:21 2010 +0300 Check xf86EnableAccess only in old servers On new X servers this function is dummy. Similar functionality is now in place using lock/unlock mechanism of the VGA arbitration, triggered inside the server. Signed-off-by: Tiago Vignatti <[email protected]> diff --git a/src/tseng_mode.c b/src/tseng_mode.c index 7237f1b..f075226 100644 --- a/src/tseng_mode.c +++ b/src/tseng_mode.c @@ -1522,7 +1522,9 @@ TsengCrtcDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) vgaHWPtr hwp = VGAHWPTR(pScrn); CARD8 seq1, crtc34; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 xf86EnableAccess(pScrn); +#endif switch (PowerManagementMode) { case DPMSModeOn: default: commit e5f44c8e69e6c725b7a40b7b6628adddf6ff8aa7 Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:55:59 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 583a717..b2764a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-tseng (1:1.2.3-2) UNRELEASED; urgency=low +xserver-xorg-video-tseng (1:1.2.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-tseng (1:1.2.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:25:14 +0100 + -- Cyril Brulebois <[email protected]> Tue, 04 May 2010 00:55:53 +0200 xserver-xorg-video-tseng (1:1.2.3-1) experimental; urgency=low commit 8c91a180ddd08cdb04958cfcbd300bc6d2a9a9cb Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:55:44 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 6ae5e97..583a717 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-tseng (1:1.2.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:25:14 +0100 diff --git a/debian/control b/debian/control index ac0a5d9..8ecb271 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: x11proto-render-dev, x11proto-xext-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-tseng Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tseng.git commit ab0dbc237a736aaf2d7a5b5efb820ea1a7ddb42b Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:55:34 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 70d577a..6ae5e97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-video-tseng (1:1.2.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:25:14 +0100 diff --git a/debian/control b/debian/control index 80d4ccc..ac0a5d9 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-tseng 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 efbcc71fd246782f01c4112201b871a9d22e515f Author: Cyril Brulebois <[email protected]> Date: Tue May 4 00:55:18 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 eec201f..70d577a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ xserver-xorg-video-tseng (1:1.2.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:25:14 +0100 xserver-xorg-video-tseng (1:1.2.3-1) experimental; urgency=low diff --git a/debian/control b/debian/control index c35f303..80d4ccc 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-core-dev, x11proto-fonts-dev, @@ -24,7 +24,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-tseng.g Package: xserver-xorg-video-tseng 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-tseng Conflicts: xserver-xorg-driver-tseng 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 96b1c264aaf6a025e78db948e51384bdc0da18d4 Author: Julien Cristau <[email protected]> Date: Sat Jan 23 01:46:35 2010 +0100 Remove myself from Uploaders diff --git a/debian/changelog b/debian/changelog index 6302cb3..46b455a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-video-tseng (1:1.2.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 6163906..c35f303 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-video-tseng 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 6aad17524e1cecab9dc1aad6b33d14f2b479f16e Author: Julien Cristau <[email protected]> Date: Sat Jan 16 16:48:48 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 d8730c4..6302cb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ xserver-xorg-video-tseng (1:1.2.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-tseng (1:1.2.1-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 186f680..e73d060 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 b918f6d35409a2c5e74232b540dffad57f85cf0a Author: Alan Coopersmith <[email protected]> Date: Fri Jan 15 15:54:57 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 78d94fb6981e5bb9ff19be9b9362a9b1f3707bb6 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 b664295..9daadc6 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. SAVE_CPPFLAGS="$CPPFLAGS" commit 96b5eebb07ca02e607c02bd22911e8002882fbcd 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 4d3c8e7e1f1eebcad01418d2a312c8791a1773fb 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 7dcae998561f95b79a981433a9b264cfe727918e 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 fd820d9..b664295 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 9ef01ab3f2420c4fb27f605834fd165c919abdf6 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 e402090..0000000 --- a/ChangeLog +++ /dev/null @@ -1,259 +0,0 @@ -2006-04-11 Luc Verhaegen <[email protected]> - - * src/tseng_mode.c: (TsengSave), (TsengRestore): - - Fix dotclock breakage on ET6000. - The fish crawled out of the swamp, but still had gills and fins. - The internal ramdac still has multiple dotclock registers, and the - previous change only fixed up the external ramdacs of ET4000W32ps. - (Reported by the other tseng owner: Adam Jackson) - -2006-03-08 Luc Verhaegen <[email protected]> - - * src/tseng_mode.c: (STG1703Restore), (CH8398Store), - (TsengModeInit): - - Remove daft dependance on mode->ClockIndex. We used it to tell - vgaHWInit to use clock 2, while ClockIndex = -1 is clock 3. So - just use clock 3 for the ramdacs and be done with. - -2006-01-31 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_driver.c: (TsengPreInit): - * src/tseng_mode.c: (STG1703Mode), (CH8398Mode), - (TsengSetupClockRange), (TsengSave), (TsengRestore), - (TsengModeInit): - - Remove dual clockranges. ET4000W32p now always uses the dac bus - as 16bits wide. - -2006-01-29 Luc Verhaegen <[email protected]> - - * src/tseng_driver.c: (TsengPreInit): - * src/tseng_mode.c: (STG1703Detect), (STG1703Restore), - (STG1703Clock), (STG1703Mode), (CH8398Detect), (CH8398PrintRegs), - (CH8398Store), (CH8398Restore), (CH8398Clock), (CH8398Mode), - (TsengRAMDACProbe), (TsengSave), (TsengRestore), (TsengModeInit): - - Fully implement the Chrontel CH8398. This has the exact same - 24bpp weirdness, so i guess this is an fb issue. - -2006-01-28 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_driver.c: (TsengGetRec), (TsengFreeRec), - (TsengPreInit): - * src/tseng_mode.c: (STG1703Detect), (STG1703PrintRegs), - (STG1703Store), (STG1703Restore), (STG1703Clock), (STG1703Mode), - (TsengRAMDACProbe), (tseng_set_ramdac_bpp), (TsengSave), - (TsengRestore), (TsengModeInit): - - Fully implement the SGS-Thomson STG-1703. This is working great - except for 24bpp, where there seems to be an offset issue. Red is - blue, green is red, blue is green. Will dig that one out later on. - 8bpp and 16bpp (both with 8 and 16bit dac bus) and 32bpp are great. - -2006-01-28 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_mode.c: (tseng_set_ramdac_bpp), (ET6000CalcClock), - (TsengSave), (TsengRestore), (TsengModeInit): - - - Remove pTseng->ModeReg - - Split ET6000 bpp, dotclock and ram clock handling from the - ET4000s ramdac code. - -2006-01-27 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_mode.c: (tseng_set_ramdac_bpp), (tseng_clock_setup), - (TsengModeInit): - - Clear duplicate PrivFlag. - -2006-01-26 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_cursor.c: (ET4000CursorRead), (ET4000CursorWrite), - (TsengShowCursor), (TsengHideCursor), (TsengSetCursorPosition), - (TsengSetCursorColors), (TsengLoadCursorImage), - (TsengHWCursorInit), (TsengCursorStore), (TsengCursorRestore): - * src/tseng_driver.c: (TsengUnlock), (TsengLock), - (TsengPreInitPCI), (et6000_check_videoram), (TsengDetectMem), - (TsengProcessHibit), (TsengPreInit), (TsengEnterVT), - (TsengLeaveVT), (TsengSaveScreen): - * src/tseng_mode.c: (vgaHWReadDacReadAddr), (vgaHWWriteBank), - (vgaHWReadBank), (vgaHWWriteSegment), (vgaHWReadSegment), - (vgaHWWriteModeControl), (vgaHWHerculesSecondPage), (ET6000IORead), - (ET6000IOWrite), (TsengRAMDACProbe), (tseng_set_ramdac_bpp), - (TsengAdjustFrame), (TsengSave), (TsengRestore), (TsengModeInit), - (TsengCrtcDPMSSet), (TsengHVSyncDPMSSet): - - Improve tseng driver transparency. - - move all VGA inbs/outbs to vgahw calls, provide our own when - relevant callbacks are missing. - - move ET4000 sprite accesses to ET4000CursorRead/Write. - - move ET6000 IO accesses to ET6000IORead/Write. - - fix regression with CH8398, introduced with the ramdac cleanup. - -2006-01-23 Luc Verhaegen <[email protected]> - - * src/Makefile.am: - * src/tseng.h: - * src/tseng_accel.c: (tseng_terminate_acl), - (tseng_recover_timeout), (tseng_init_acl), - (TsengSubsequentScanlineCPUToScreenColorExpandFill), - (TsengSubsequentColorExpandScanline), - (TsengSubsequentColorExpandScanline_8bpp), - (TsengSubsequentColorExpandScanline_16bpp), - (TsengSubsequentColorExpandScanline_24bpp), - (TsengSubsequentColorExpandScanline_32bpp), - (TsengSetupForCPUToScreenColorExpandFill), - (TsengSubsequentCPUToScreenColorExpandFill), - (TsengSetupForScreenToScreenColorExpandFill), - (TsengSubsequentScreenToScreenColorExpandFill), - (TsengXAAInit_Colexp), (TsengXAAInit): - * src/tseng_accel.h: - * src/tseng_acl.c: - * src/tseng_acl.h: - * src/tseng_clock.c: - * src/tseng_colexp.c: - * src/tseng_dpms.c: - * src/tseng_driver.c: (TsengSaveScreen), (TsengSwitchMode): - * src/tseng_inline.h: - * src/tseng_mode.c: (vgaHWReadDacWriteAddr), (tsengSTG170xDetect), - (tsengCH8398Detect), (TsengRAMDACProbe), (tseng_set_ramdac_bpp), - (tseng_clock_setup), (TsengcommonCalcClock), (TsengAdjustFrame), - (TsengValidMode), (TsengSave), (TsengRestore), (TsengModeInit), - (TsengCrtcDPMSSet), (TsengHVSyncDPMSSet): - * src/tseng_ramdac.c: - - Reorganise code: - - move tseng_ramdac.c, tseng_clock.c, tseng_dpms.c, and - TsengAdjustFrame, TsengValidMode, TsengSave, TsengRestore, - TsengModeInit from tseng_driver.c into tseng_mode.c. - - move tseng_acl.c and tseng_colexp.c into tseng_accel.c - - move tseng_acl.h and tseng_inline.g into tseng_accel.h - - move all accel functions except for 2 to static, ifdef - out unused ones. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
