.gitignore | 69 ++++++++++++-- COPYING | 89 ++++++++++++++++-- ChangeLog | 259 ----------------------------------------------------- Makefile.am | 12 ++ configure.ac | 51 ++++------ man/.cvsignore | 3 man/Makefile.am | 59 ++++-------- man/tseng.man | 1 src/.cvsignore | 6 - src/Makefile.am | 2 src/tseng.h | 3 src/tseng_cursor.c | 2 src/tseng_dga.c | 6 - src/tseng_driver.c | 12 +- src/tseng_mode.c | 40 +++++++- 15 files changed, 245 insertions(+), 369 deletions(-)
New commits: commit 8f41e5d8bb40d6bb184b4806b701a3e11caf43c3 Author: Jeremy Huddleston <[email protected]> Date: Tue Nov 1 20:37:14 2011 -0700 Build fix for -Werror=int-to-pointer-cast Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/tseng_dga.c b/src/tseng_dga.c index cb57dfe..528ba4c 100644 --- a/src/tseng_dga.c +++ b/src/tseng_dga.c @@ -135,7 +135,7 @@ Tseng_OpenFramebuffer( TsengPtr pTseng = TsengPTR(pScrn); *name = NULL; /* no special device */ - *mem = (unsigned char*)pTseng->FbAddress; + *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress; *size = pTseng->FbMapSize; *offset = 0; /* Always */ *flags = 0; /* Root permissions OS-dependent */ commit 9d9895962f4078404dae06a2db5d3fe3a23e0133 Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 01:11:49 2011 -0700 Fix a compiler warning tseng_cursor.c:163:1: warning: no previous prototype for 'TsengLoadCursorImage' [-Wmissing-prototypes] Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c index d4fb847..2412b31 100644 --- a/src/tseng_cursor.c +++ b/src/tseng_cursor.c @@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) } } -void +static void TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits) { vgaHWPtr hwp = VGAHWPTR(pScrn); commit 39dd08e1b84c9aecf4eb296db51f25f4b2ff925c Author: Jeremy Huddleston <[email protected]> Date: Wed Oct 19 01:09:30 2011 -0700 Build fix for ABI Version 12 ABI Version 12 removes support for multiple PCI domains. If you need to use this driver on a system with more than one PCI domain, you should either port this driver to using libpciaccess directly or stick with an older server. Signed-off-by: Jeremy Huddleston <[email protected]> diff --git a/src/tseng_mode.c b/src/tseng_mode.c index 7649efd..a3ff87d 100644 --- a/src/tseng_mode.c +++ b/src/tseng_mode.c @@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value) if (hwp->MMIOBase) MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value); else +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 outb(hwp->PIOOffset + VGA_BANK, value); +#else + pci_io_write8(hwp->io, VGA_BANK, value); +#endif } CARD8 @@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp) if (hwp->MMIOBase) return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK); else +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 return inb(hwp->PIOOffset + VGA_BANK); +#else + return pci_io_read8(hwp->io, VGA_BANK); +#endif } #define VGA_SEGMENT 0x3CD @@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value) if (hwp->MMIOBase) MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value); else +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 outb(hwp->PIOOffset + VGA_SEGMENT, value); +#else + pci_io_write8(hwp->io, VGA_SEGMENT, value); +#endif } CARD8 @@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp) if (hwp->MMIOBase) return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT); else +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 return inb(hwp->PIOOffset + VGA_SEGMENT); +#else + return pci_io_read8(hwp->io, VGA_SEGMENT); +#endif } /* @@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value) if (hwp->MMIOBase) MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value); - else - outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value); + else +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + outb(hwp->PIOOffset + VGA_MODE_CONTROL, value); +#else + pci_io_write8(hwp->io, VGA_MODE_CONTROL, value); +#endif } /* @@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable) MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp); } else { - tmp = inb(hwp->PIOOffset + VGA_HERCULES); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + tmp = inb(hwp->PIOOffset + VGA_HERCULES); +#else + tmp = pci_io_read8(hwp->io, VGA_HERCULES); +#endif if (Enable) tmp |= 0x02; else tmp &= ~0x02; - outb(hwp->PIOOffset + VGA_HERCULES, tmp); +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 + outb(hwp->PIOOffset + VGA_HERCULES, tmp); +#else + pci_io_write8(hwp->io, VGA_HERCULES, tmp); +#endif } } commit 542e65deaf834c3d58c44064206445e4d18f6daa Author: BALATON Zoltan <[email protected]> Date: Sat Jun 11 12:50:16 2011 +0200 Fix regression from pciaccess conversion (bug#32682) Due to a typo in TsengGetFbAddress it is unable to get framebuffer base address and thus fails to load with an error message saying "No valid Framebuffer address in PCI config space" although previously it does print the correct framebuffer address. Signed-off-by: Julien Cristau <[email protected]> diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 6992671..d36b62c 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn) PDEBUG(" TsengGetFbAddress\n"); /* base0 is the framebuffer and base1 is the PCI IO space. */ - if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) { + if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid Framebuffer address in PCI config space;\n"); return FALSE; commit a123285200c6747bfc2631f684a9d1c06c868fb4 Author: Trevor Woerner <[email protected]> Date: Fri Oct 22 20:48:13 2010 -0400 Convert x+m/calloc/free to m/calloc/free. Reviewed-by: Mikhail Gusarov <[email protected]> Signed-off-by: Trevor Woerner <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/src/tseng_dga.c b/src/tseng_dga.c index 70ebe23..cb57dfe 100644 --- a/src/tseng_dga.c +++ b/src/tseng_dga.c @@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen) if (!pTseng->DGAnumModes) { pMode = firstMode = pScrn->modes; while (pMode) { - newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec)); + newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec)); if (!newmodes) { - xfree(modes); + free(modes); return FALSE; } modes = newmodes; diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 445c17e..6992671 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn) pTseng = TsengPTR(pScrn); if (pTseng->SavedReg.RAMDAC) - xfree(pTseng->SavedReg.RAMDAC); + free(pTseng->SavedReg.RAMDAC); - xfree(pScrn->driverPrivate); + free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; } @@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags) foundScreen = TRUE; } } - xfree(usedChips); + free(usedChips); } - xfree(devSections); + free(devSections); return foundScreen; } @@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn) xf86CollectOptions(pScrn, NULL); /* Process the options */ - if (!(pTseng->Options = xalloc(sizeof(TsengOptions)))) + if (!(pTseng->Options = malloc(sizeof(TsengOptions)))) return FALSE; memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions)); xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options); diff --git a/src/tseng_mode.c b/src/tseng_mode.c index f075226..7649efd 100644 --- a/src/tseng_mode.c +++ b/src/tseng_mode.c @@ -1502,7 +1502,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode) /* clean up */ if (new->RAMDAC) - xfree(new->RAMDAC); + free(new->RAMDAC); return TRUE; } commit 477fe18698b95b546669a3d2089045ed4c7141d8 Author: Jesse Adkins <[email protected]> Date: Tue Sep 28 13:29:52 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/tseng.man b/man/tseng.man index 403782f..984c8e7 100644 --- a/man/tseng.man +++ b/man/tseng.man @@ -1,4 +1,3 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH TSENG __drivermansuffix__ __vendorversion__ commit 6959ac1434c3594221f340f4d7f3d1489f585f8e Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 16:49:04 2010 -0400 config: add comments for main statements diff --git a/configure.ac b/configure.ac index 969845a..8458c06 100644 --- a/configure.ac +++ b/configure.ac @@ -20,18 +20,18 @@ # # Process this file with autoconf to produce a configure script +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-tseng], [1.2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-tseng]) - AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -# Checks for programs. +# Initialize libtool AC_DISABLE_STATIC AC_PROG_LIBTOOL AH_TOP([#include "xorg-server.h"]) +# Define a configure option for an alternate module directory AC_ARG_WITH(xorg-module-dir, AS_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) -# Checks for extensions +# Store the list of server defined optional extensions in REQUIRED_MODULES XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(XV, videoproto) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) -# Checks for pkg-config packages +# Obtain compiler/linker options for the driver dependencies PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) # Checks for libraries. @@ -77,7 +78,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - AC_SUBST([moduledir]) DRIVER_NAME=tseng commit 398afc967e3774012576c63315b1de9b9d7e6892 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 16:07:00 2010 -0400 config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 4e324c3..969845a 100644 --- a/configure.ac +++ b/configure.ac @@ -83,8 +83,9 @@ AC_SUBST([moduledir]) DRIVER_NAME=tseng AC_SUBST([DRIVER_NAME]) -AC_OUTPUT([ - Makefile - src/Makefile - man/Makefile +AC_CONFIG_FILES([ + Makefile + src/Makefile + man/Makefile ]) +AC_OUTPUT commit 141beb8c016038d668433391fa44fde077cfb8b8 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 14:37:42 2010 -0400 config: replace deprecated AC_HELP_STRING with AS_HELP_STRING Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 91dbe46..4e324c3 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,7 @@ AC_PROG_LIBTOOL AH_TOP([#include "xorg-server.h"]) AC_ARG_WITH(xorg-module-dir, - AC_HELP_STRING([--with-xorg-module-dir=DIR], + AS_HELP_STRING([--with-xorg-module-dir=DIR], [Default xorg module directory [[default=$libdir/xorg/modules]]]), [moduledir="$withval"], [moduledir="$libdir/xorg/modules"]) commit e655cbc99c454dde624520762d447fa1227cff2a Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 14:05:23 2010 -0400 config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 2fe63ca..91dbe46 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_INIT([xf86-video-tseng], [xf86-video-tseng]) AC_CONFIG_SRCDIR([Makefile.am]) -AM_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit 27b18cd6f06b50f3072e28ef56bb48f97de23e57 Author: Gaetan Nadon <[email protected]> Date: Wed Jul 21 09:27:42 2010 -0400 config: complete AC_INIT m4 quoting Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 800227f..2fe63ca 100644 --- a/configure.ac +++ b/configure.ac @@ -22,9 +22,9 @@ AC_PREREQ([2.60]) AC_INIT([xf86-video-tseng], - 1.2.4, + [1.2.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - xf86-video-tseng) + [xf86-video-tseng]) AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) commit 524aea5bc711b65c00f6b31a7617f3d6e940b34d Author: Gaetan Nadon <[email protected]> Date: Tue Jul 20 21:44:58 2010 -0400 config: remove unrequired AC_SUBST([XORG_CFLAGS]) This macro is called by PKG_CHECK_MODULES Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 62ee25a..800227f 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,6 @@ fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) DRIVER_NAME=tseng commit 3b615fed4f601bb0bb9da81420dc9725abbee62d Author: Gaetan Nadon <[email protected]> Date: Tue Jul 20 20:24:42 2010 -0400 config: remove unrequired AC_HEADER_STDC Autoconf says: "This macro is obsolescent, as current systems have conforming header files. New programs need not use this macro". Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 3c556d0..62ee25a 100644 --- a/configure.ac +++ b/configure.ac @@ -77,8 +77,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) -# Checks for header files. -AC_HEADER_STDC AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) commit 14bcede477a7039855ed8490792b47b8685d3e8d Author: Gaetan Nadon <[email protected]> Date: Tue Jul 20 19:41:31 2010 -0400 config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_C_C99. This sets gcc with -std=gnu99. If AC_PROG_CC macro is called afterwards, it resets CC to gcc. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 1031d50..3c556d0 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,6 @@ XORG_DEFAULT_OPTIONS # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL -AC_PROG_CC AH_TOP([#include "xorg-server.h"]) commit 1f2e2a3985eed072e003e6f4800e6f1e143b6b75 Author: Gaetan Nadon <[email protected]> Date: Tue Jul 20 18:45:19 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index cd6a064..1031d50 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ(2.57) +AC_PREREQ([2.60]) AC_INIT([xf86-video-tseng], 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], commit c32e20a3e2740a316c5088cfd682f6f18edc0db6 Author: Gaetan Nadon <[email protected]> Date: Tue Jul 20 16:15:30 2010 -0400 config: upgrade to util-macros 1.8 for additional man page support Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. diff --git a/configure.ac b/configure.ac index 62cc318..cd6a064 100644 --- a/configure.ac +++ b/configure.ac @@ -34,10 +34,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Checks for programs. diff --git a/man/Makefile.am b/man/Makefile.am index 8f2454b..b3688ce 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -31,25 +31,11 @@ EXTRA_DIST = @[email protected] CLEANFILES = $(driverman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure + SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man .man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ 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 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 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) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
