xserver-xorg-video-i128: Changes to 'upstream-experimental'
.gitignore | 70 +++++++++++++++++++++++++++--
COPYING | 47 ++++++++++++++++---
ChangeLog | 45 ------------------
Makefile.am | 15 +++---
README | 76 ++++++++++++++++----------------
README.sgml | 98 -----------------------------------------
configure.ac | 51 ++++++++++-----------
man/.cvsignore | 2
man/Makefile.am | 59 ++++++++----------------
man/i128.man | 2
src/.cvsignore | 6 --
src/i128.h | 2
src/i128IBMDAC.c | 84 +----------------------------------
src/i128_driver.c | 128 +++++++-----------------------------------------------
src/i128accel.c | 4 +
src/i128exa.c | 6 ++
src/i128init.c | 15 +++++-
17 files changed, 243 insertions(+), 467 deletions(-)
New commits:
commit d7c1073cf42e3486b49f5a55f2c5f2929b18417f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:51:59 2010 -0400
xf86-video-i128 1.3.4
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 6fa235f..5ae48b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
- [1.3.3],
+ [1.3.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
commit 94cdca24c2035245b191e2d1c453fc02c2fbecac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index eee8e2f..6fa235f 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-i128],
[1.3.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-i128])
-
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 xproto fontsproto $REQUIRED_MODULES])
# Checks for libraries.
commit 2c9c7070abec4eb3fbf14f380dd1e57d63fdd720
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 4780299..eee8e2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=i128
AC_SUBST([DRIVER_NAME])
-AC_OUTPUT([
- Makefile
- src/Makefile
- man/Makefile
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ man/Makefile
])
+AC_OUTPUT
commit 68934cda27a0c2c051187f77c0d8faf82b9615f4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:37:41 2010 -0400
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 073409f..4780299 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 bef6413d558428f439422126f77791814df4453b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 14:05:22 2010 -0400
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d56557e..073409f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([xf86-video-i128],
[xf86-video-i128])
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 53239cdc70f2ffff09b2d509f44319008e5c6397
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 09:27:42 2010 -0400
config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index cb0764c..d56557e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,9 @@
AC_PREREQ([2.60])
AC_INIT([xf86-video-i128],
- 1.3.3,
+ [1.3.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-i128)
+ [xf86-video-i128])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
commit b0f3826e110f44e3dd0660b8c6d0dd04cc35d908
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 21:44:57 2010 -0400
config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9d56366..cb0764c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
DRIVER_NAME=i128
commit 4b3e0c971fc320bf3d47b56adc0f65ac16d78eb7
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 550d7c0..9d56366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,6 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Required by exa.h
AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
-# Checks for header files.
-AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
commit aedc94dd1770317bb41e9341863f371834203373
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 29a8169..550d7c0 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 04015a519e52493fcd43f4d940a3a9e55d7c03be
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 9ae0ac6..29a8169 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-i128],
1.3.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
commit eda5280a2acd6b55c9cc29a7d251aca5915ad744
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 20 16:15:29 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 ba90bb6..9ae0ac6 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 = @DRIVER_NAME@.man
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 ff026f65b3e8f54d6677b8dc16fd17db43b39edf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 18:51:15 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
The file had not been updated for 5 years.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 310cd3d..4c278ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,6 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = README.sgml
-
.PHONY: ChangeLog INSTALL
INSTALL:
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index 02dbceb..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-<title>Information for Number Nine I128 Users
-<author>The XFree86 Project Inc.
-<date>25 March 2004
-
-<toc>
-
-<sect>Supported hardware
-<p>
-The current accelerated I128 server supports
-<p>
-<itemize>
-<item>Imagine 128
-(I128 with Texas Instruments TVP3025 or IBM528 RAMDAC). It has been tested with
-with 4MB of VRAM.
-<item>Imagine 128 Ticket 2 Ride
-(I128-T2R with IBM526 or 528 RAMDAC). It has been tested with 4 MB and 8 MB of
-VRAM and DRAM.
-<item>Imagine 128 Revolution 3D
-(I128-R3D with IBM526 RAMDAC). It has been tested with 4 MB, 8 MB, and 16 MB
-of WRAM or SGRAM.
-<item>Imagine 128 Revolution IV
-(I128-R4 with SILVERHAMMER RAMDAC). It has been tested with 32 MB.
-</itemize>
-
-<sect>Features:
-<p>
-<itemize>
-<item>uses linear frame buffer
-<item>Resolutions up to the maximum supported by the card should be possible.
-<item>8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are
-supported.
-<item>supports RGB Sync-on-Green
-<item>Makes use of the graphics accelerator.
-</itemize>
-
-<sect>Configuration:
-<p>
-The I128 driver should auto-detect all supported hardware so you needn't
-have anything other than the Identifier in the Section "Device" of the
-xorg.conf file. When running the xorgcfg or xorgconfig programs one
-merely needs to select an I128 card so that the correct server will be
-used. One need not and should not specify a RAMDAC, clockchip or allow
-the setup program to probe for clocks. The driver will auto-detect the
-amount of video ram present.
-
-The following Section "Device" options are supported by the I128 driver:
-<itemize>
-<item>Option "Dac6Bit"
-<p>
-Will enable 6-bit DAC support.
-<item>Option "NoAccel"
-<p>
-Will disable all hardware acceleration.
-<item>Option "SyncOnGreen"
-<p>
-Will enable syncing on green for sync-on-green monitors (these are typically
-fixed frequency workstation monitors).
-</itemize>
-
-<sect>Mode lines for the Silicon Graphics flat panel display:
-<p>
-<itemize>
-<item>These mode lines are required for use with the T2R4 (Rev 4) and the
-Silicon Graphics Flat Panel display.
-<item>Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 7 +Hsync +Vsync
-<item>Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 5 +Hsync +Vsync
-<item>Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 HSkew 1 +Hsync +Vsync
-<item>Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 HSkew 7 DoubleScan +Hsync +Vsync
-<item>Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 HSkew 5 DoubleScan +Hsync +Vsync
-<item>Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 HSkew 1 DoubleScan +Hsync +Vsync
-</itemize>
-
-<p>
-<itemize>
-<item>These lines are required for use with the SGI Multilink Adapter and the SiliconGraphics Flat Panel display.
-<item>Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 1056 -Hsync -Vsync
-<item>Option "OverridePolarity" "1"
-</itemize>
-
-<sect>Author(s)
-<p>
-
-Robin Cutshaw, <url url="mailto:robin@XFree86.Org";>
-
-and special help from:
-
-<itemize>
-<item>Galen Brooks, <url url="mailto:galen@interlabs.com";>
-</itemize>
-
-</article>
diff --git a/configure.ac b/configure.ac
index 3c51993..ba90bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=i128
AC_SUBST([DRIVER_NAME])
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
commit 399c47cb69731d1e3e8d59edd53b3e7cc2b77d95
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 18:40:05 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
replace docbook email tag with linuxdoc email tag
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README b/README
index 432227e..c0b7380 100644
--- a/README
+++ b/README
@@ -15,111 +15,111 @@
______________________________________________________________________
- [1m1. Supported hardware[0m
+ 1. Supported hardware
The current accelerated I128 server supports
- +o Imagine 128 (I128 with Texas Instruments TVP3025 or IBM528 RAMDAC).
+ o Imagine 128 (I128 with Texas Instruments TVP3025 or IBM528 RAMDAC).
It has been tested with with 4MB of VRAM.
- +o Imagine 128 Ticket 2 Ride (I128-T2R with IBM526 or 528 RAMDAC). It
+ o Imagine 128 Ticket 2 Ride (I128-T2R with IBM526 or 528 RAMDAC). It
has been tested with 4 MB and 8 MB of VRAM and DRAM.
- +o Imagine 128 Revolution 3D (I128-R3D with IBM526 RAMDAC). It has
+ o Imagine 128 Revolution 3D (I128-R3D with IBM526 RAMDAC). It has
been tested with 4 MB, 8 MB, and 16 MB of WRAM or SGRAM.
- +o Imagine 128 Revolution IV (I128-R4 with SILVERHAMMER RAMDAC). It
+ o Imagine 128 Revolution IV (I128-R4 with SILVERHAMMER RAMDAC). It
has been tested with 32 MB.
- [1m2. Features:[0m
+ 2. Features:
- +o uses linear frame buffer
+ o uses linear frame buffer
- +o Resolutions up to the maximum supported by the card should be
+ o Resolutions up to the maximum supported by the card should be
possible.
- +o 8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are
+ o 8 bpp, 16 bpp (depth 15 and 16), and 32 bpp (depth 24, sparse) are
supported.
- +o supports RGB Sync-on-Green
+ o supports RGB Sync-on-Green
- +o Makes use of the graphics accelerator.
+ o Makes use of the graphics accelerator.
- [1m3. Configuration:[0m
+ 3. Configuration:
The I128 driver should auto-detect all supported hardware so you
needn't have anything other than the Identifier in the Section
- "Device" of the xorg.conf file. When running the xorgcfg or
- xorgconfig programs one merely needs to select an I128 card so that
- the correct server will be used. One need not and should not specify
- a RAMDAC, clockchip or allow the setup program to probe for clocks.
- The driver will auto-detect the amount of video ram present.
+ "Device" of the xorg.conf file. When running the xorgcfg or xorgconfig
+ programs one merely needs to select an I128 card so that the correct
+ server will be used. One need not and should not specify a RAMDAC,
+ clockchip or allow the setup program to probe for clocks. The driver
+ will auto-detect the amount of video ram present.
The following Section "Device" options are supported by the I128
driver:
- +o Option "Dac6Bit"
+ o Option "Dac6Bit"
Will enable 6-bit DAC support.
- +o Option "NoAccel"
+ o Option "NoAccel"
Will disable all hardware acceleration.
- +o Option "SyncOnGreen"
+ o Option "SyncOnGreen"
Will enable syncing on green for sync-on-green monitors (these are
typically fixed frequency workstation monitors).
- [1m4. Mode lines for the Silicon Graphics flat panel display:[0m
+ 4. Mode lines for the Silicon Graphics flat panel display:
- +o These mode lines are required for use with the T2R4 (Rev 4) and the
+ o These mode lines are required for use with the T2R4 (Rev 4) and the
Silicon Graphics Flat Panel display.
- +o Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029
+ o Modeline "1600x1024d32" 103.125 1600 1600 1656 1664 1024 1024 1029
1030 HSkew 7 +Hsync +Vsync
- +o Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029
+ o Modeline "1600x1024d16" 103.125 1600 1600 1656 1664 1024 1024 1029
1030 HSkew 5 +Hsync +Vsync
- +o Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029
+ o Modeline "1600x1024d08" 103.125 1600 1600 1656 1664 1024 1024 1029
1030 HSkew 1 +Hsync +Vsync
- +o Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515
- HSkew 7 DoubleScan +Hsync +Vsync
+ o Modeline "800x512d32" 54.375 800 800 840 848 512 512 514 515 HSkew
+ 7 DoubleScan +Hsync +Vsync
- +o Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515
- HSkew 5 DoubleScan +Hsync +Vsync
+ o Modeline "800x512d16" 54.375 800 800 840 848 512 512 514 515 HSkew
+ 5 DoubleScan +Hsync +Vsync
- +o Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515
- HSkew 1 DoubleScan +Hsync +Vsync
+ o Modeline "800x512d08" 54.375 800 800 840 848 512 512 514 515 HSkew
+ 1 DoubleScan +Hsync +Vsync
- +o These lines are required for use with the SGI Multilink Adapter and
+ o These lines are required for use with the SGI Multilink Adapter and
the SiliconGraphics Flat Panel display.
- +o Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030
- 1056 -Hsync -Vsync
+ o Modeline "1600x1024g" 108.0 1600 1616 1656 1704 1024 1027 1030 1056
+ -Hsync -Vsync
- +o Option "OverridePolarity" "1"
+ o Option "OverridePolarity" "1"
- [1m5. Author(s)[0m
+ 5. Author(s)
- Robin Cutshaw, <robin@XFree86.Org>
+ Robin Cutshaw, <mailto:robin@XFree86.Org>
and special help from:
- +o Galen Brooks, <galen@interlabs.com>
+ o Galen Brooks, <mailto:galen@interlabs.com>
diff --git a/README.sgml b/README.sgml
index 289a5b6..02dbceb 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,13 +1,11 @@
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
]>
<article>
<title>Information for Number Nine I128 Users
<author>The XFree86 Project Inc.
<date>25 March 2004
-<ident>
-</ident>
<toc>
@@ -87,12 +85,12 @@ Silicon Graphics Flat Panel display.
<sect>Author(s)
<p>
-Robin Cutshaw, <email>robin@XFree86.Org</email>
+Robin Cutshaw, <url url="mailto:robin@XFree86.Org";>
and special help from:
<itemize>
-<item>Galen Brooks, <email>galen@interlabs.com</email>
+<item>Galen Brooks, <url url="mailto:galen@interlabs.com";>
</itemize>
</article>
commit f1d97375da248af05848f56323c1a8cad4d3a416
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jun 12 19:55:58 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..5d9e80f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,43 @@
-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 1994-2000 by Robin Cutshaw <robin@XFree86.Org>
+Copyright 2005 Adam Jackson <ajax@nwnk.net>
+Copyright 1998 by Number Nine Visual Technology, Inc.
-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 Robin Cutshaw not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Robin Cutshaw 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
+ROBIN CUTSHAW DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ROBIN CUTSHAW 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 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 3c58b1d2ad0203ac9b96db7ba8da6f7171aead49
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 14:55:02 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
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 d5e49a46c62501a0b95fc2298d6b3c129500a6e0
Author: Gaetan Nadon <memsize@videotron.ca>
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 <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 1e4090c..3c51993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
SAVE_CPPFLAGS="$CPPFLAGS"
commit d9fddc2023770c58d7ccc7e3a5507b0c6042b984
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 23 09:25:05 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 0250b0f..310cd3d 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
if BUILD_LINUXDOC
README: README.sgml
commit b045340006550b484ae38be6e25c8f22ec7cf5c1
Author: Gaetan Nadon <memsize@videotron.ca>
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 a40a960..0250b0f 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
if BUILD_LINUXDOC
commit 6c8d05924ca437cfe237211a43f2b183ea78ed96
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:09 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 5b04139..a40a960 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,12 @@ endif
EXTRA_DIST = README.sgml
-.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 424448c..1e4090c 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 48f66f2548cec5db9580626bb03f6393a52dd273
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 12:54:21 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 64c7900..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Eric Anholt <anholt@FreeBSD.org>
-
- * src/i128_driver.c: (I128PreInit):
- Don't forget to zero the xf86ModReqInfo before using it.
- Noticed by Alex Deucher.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
Reply to: