xserver-xorg-video-glide: Changes to 'upstream-unstable'
.gitignore | 2 +
COPYING | 71 +++++++++++++++++++++++++++++++++++++++++++++++------
Makefile.am | 11 ++++++++
README | 18 +++++++++++++
configure.ac | 5 ++-
man/.gitignore | 1
man/Makefile.am | 2 -
man/glide.man | 20 --------------
src/glide_driver.c | 8 -----
9 files changed, 99 insertions(+), 39 deletions(-)
New commits:
commit ce31b3e87032253ef8c77a8738014b8e981f01e5
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 07:53:55 2008 +0300
Bump to 1.0.1
diff --git a/configure.ac b/configure.ac
index 216bbcd..11f70e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glide],
- 1.0.0,
+ 1.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glide)
commit ff45582f61a34b9bfa2833c4098f9618156a5752
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 07:06:05 2008 +0300
Remove redefinition of NULL
diff --git a/src/glide_driver.c b/src/glide_driver.c
index 5817334..1f6bdae 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -70,10 +70,6 @@
#define TRUE 1
#define FALSE 0
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL 0
typedef signed char s8;
typedef unsigned char u8;
commit 07576fbeb79bc3ae199ae13de3cb09e216efca0e
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 07:05:38 2008 +0300
Remove unused MIN and MAX macros
diff --git a/src/glide_driver.c b/src/glide_driver.c
index e4daf44..5817334 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -74,8 +74,6 @@
#undef NULL
#endif
#define NULL 0
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
typedef signed char s8;
typedef unsigned char u8;
commit a8a63bee3d5b73fd261d5d543332ee8ee8199071
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 04:01:08 2008 +0300
Generate the ChangeLog file from git history
diff --git a/.gitignore b/.gitignore
index 2df4a8d..d90176e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ChangeLog
Makefile
Makefile.in
*.la
diff --git a/Makefile.am b/Makefile.am
index 3ae2692..1edd0a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,4 +20,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-EXTRA_DIST = README
+EXTRA_DIST = README ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+ChangeLog:
+ ( GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && \
+ mv .changelog.tmp ChangeLog; \
+ rm -f .changelog.tmp ) || \
+ ( touch ChangeLog; \
+ echo 'git directory not found: installing possibly empty changelog.' >&2 )
+
+dist-hook: ChangeLog
commit e86333b890407033431041febe216319ab319a76
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 02:46:40 2008 +0300
Add generated glide.4 to .gitignore
diff --git a/man/.gitignore b/man/.gitignore
index 282522d..0d07578 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,2 +1,3 @@
Makefile
Makefile.in
+glide.4
commit 7a2b55e4ce5817a39829db478d42a860d2649e80
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 02:43:48 2008 +0300
Remove RCS tags
diff --git a/man/Makefile.am b/man/Makefile.am
index f7e6783..bdb85f3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/man/glide.man b/man/glide.man
index aacbea1..ad39b3e 100644
--- a/man/glide.man
+++ b/man/glide.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man,v 1.3 2001/02/07 22:51:56 tsi Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH GLIDE __drivermansuffix__ __vendorversion__
diff --git a/src/glide_driver.c b/src/glide_driver.c
index c38bec9..e4daf44 100644
--- a/src/glide_driver.c
+++ b/src/glide_driver.c
@@ -45,8 +45,6 @@
* Support static loading.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.27 2001/08/07 07:04:46 keithp Exp $ */
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
commit 838ad3bc77dcbc1b481ae891bc4f314b421a82d8
Author: Guillem Jover <guillem@hadrons.org>
Date: Wed Jun 18 00:55:32 2008 +0300
Add license and copyright information to COPYING
diff --git a/COPYING b/COPYING
index 7f33cbf..fcde660 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,67 @@
-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 1997-2003 by The XFree86 Project, 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 names of Orest Zborowski and David Wexelblat
+not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission. Orest Zborowski
+and David Wexelblat make 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
+THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT 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:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 2005 Adam Jackson.
+Copyright 2007 Guillem Jover.
+
+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
+on 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
+ADAM JACKSON 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 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.
commit 3db677c4d9bd52b40197dad6e96956a437787b77
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:32 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit eca9f6d16e6f919c719c45c9161eb8f205c4e1df
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Aug 30 04:41:28 2007 +0300
Move build time information from the man page to a README
diff --git a/Makefile.am b/Makefile.am
index 7052905..3ae2692 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,4 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+EXTRA_DIST = README
diff --git a/README b/README
new file mode 100644
index 0000000..371031d
--- /dev/null
+++ b/README
@@ -0,0 +1,18 @@
+This driver has a special requirement that needs to be fulfilled before it
+will work: you need Glide installed. At the time of this writing, it may
+be found at <http://glide.sf.net/>.
+
+Also, you need to tell the X server where the libglide2x.so file is placed by
+making a soft link in the moduledir directory (usually /usr/lib/xorg/modules)
+that points to the libglide2x.so file. For example, if your libglide2x.so file
+is in /usr/lib):
+
+ # ln -s /usr/lib/libglide2x.so <moduledir>
+
+If you have installed /dev/3dfx, the driver will be able to turn on the MTRR
+registers (through the glide library) if you have a CPU with such registers
+(see <http://glide.xxedgexx.com/MTRR.html>).
+This will speed up copying data to the Voodoo board by as much as 2.7 times
+and is very noticeable since this driver copies a lot of data...
+Highly recommended.
+
diff --git a/man/glide.man b/man/glide.man
index 6c970e4..aacbea1 100644
--- a/man/glide.man
+++ b/man/glide.man
@@ -12,10 +12,6 @@ glide \- Glide video driver
\ \ ...
.B EndSection
.fi
-.SH READ THIS IF NOTHING ELSE
-This driver has a special requirement that needs to be fulfilled
-before it will work: You need Glide installed and you need to make a link for the libglide2x.so
-file. Read the second paragraph in the description below to find out how.
.SH DESCRIPTION
.B glide
is an __xservername__ driver for Glide capable video boards (such as 3Dfx
@@ -33,21 +29,6 @@ the CPU. But since the CPU is nowadays actually rather fast at moving
data, we get very good speed anyway, especially since the whole shadow
framebuffer is in cached RAM.
.PP
-This driver requires that you have installed Glide. (Which can, at the
-time of this writing, be found at http://glide.sf.net/). Also, you need
-to tell __xservername__ here the libglide2x.so file is placed by making
-a soft link in the __moduledir__ directory that points to the libglide2x.so
-file. For example (if your libglide2x.so file is in /usr/lib):
-.PP
-\& # ln -s /usr/lib/libglide2x.so __moduledir__
-.PP
-If you have installed /dev/3dfx, the driver will be able to turn on
-the MTRR registers (through the glide library) if you have a CPU with
-such registers (see http://glide.xxedgexx.com/MTRR.html). This will
-speed up copying data to the Voodoo board by as much as 2.7 times and
-is very noticeable since this driver copies a lot of
-data... Highly recommended.
-.PP
This driver supports 16 and 24 bit color modes. The 24 bit color mode
uses a 32 bit framebuffer (it has no support for 24 bit packed-pixel
framebuffers). Notice that the Voodoo boards can only display 16 bit
commit 3a3b11dcf342ce6cba7317fb56f8bac619d65ff2
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 25 03:16:39 2007 +0300
Check for glide.h presence in configure
diff --git a/configure.ac b/configure.ac
index 856836e..216bbcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,10 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
# Checks for header files.
+CPPFLAGS="$CPPFLAGS -I$glideincludedir"
AC_HEADER_STDC
+AC_HEADER_CHECK([glide.h], [],
+ [AC_MSG_ERROR([<glide.h> is required])])
GLIDE_CFLAGS="-I$glideincludedir"
AC_SUBST([GLIDE_CFLAGS])
Reply to: