xserver-xorg-video-voodoo: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
configure.ac | 2 +-
debian/changelog | 3 ++-
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
src/.cvsignore | 6 ++++++
7 files changed, 43 insertions(+), 3 deletions(-)
New commits:
commit 92ce0dc5e315bc3b96ba8d26cf2acc854cb62ec8
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Oct 13 18:51:36 2006 -0400
Bump to 1.1.1
diff --git a/configure.ac b/configure.ac
index e3a422c..5c9d152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit 3d2a18a636230257e78cb013eadef77ecbdf2496
Author: A Costa <agcosta@gis.net>
Date: Thu Sep 21 22:51:52 2006 +1000
Typo fix (Debian bug #364555).
diff --git a/man/voodoo.man b/man/voodoo.man
index e170cdb..82a3a3f 100644
--- a/man/voodoo.man
+++ b/man/voodoo.man
@@ -19,7 +19,7 @@ On the Voodoo 1 the driver uses a shadow
the video adapter has only 3D acceleration. Selected portions of the shadow
framebuffer are copied out to the Voodoo board at the right time. Because
of this, the speed of the driver is very dependent on the CPU. Processors
-nowdays are actually rather fast at moving data so we get very good speed
+nowadays are actually rather fast at moving data so we get very good speed
anyway as the shadow framebuffer is in cached RAM.
.PP
The Voodoo2 has 16bpp acceleration and the driver provides accelerated
commit e6743d920ddb245bd2af6c047dd769ae2deb9a74
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 21:58:28 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..50d6011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/voodoo.h:
+ * src/voodoo_dga.c:
+ * src/voodoo_driver.c:
+ * src/voodoo_hardware.c:
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 7954a0a..e3a422c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
@@ -53,7 +53,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/voodoo.h b/src/voodoo.h
index 3a99aca..8aa0435 100644
--- a/src/voodoo.h
+++ b/src/voodoo.h
@@ -1,3 +1,5 @@
+#include <string.h>
+
typedef struct {
CARD32 m;
CARD32 n;
@@ -74,11 +76,11 @@ #define FALSE 0
#define VoodooPTR(p) ((VoodooPtr)((p)->driverPrivate))
-#define VERSION 4000
+#define VOODOO_VERSION 4000
#define VOODOO_NAME "Voodoo"
#define VOODOO_DRIVER_NAME "voodoo"
#define VOODOO_MAJOR_VERSION 1
-#define VOODOO_MINOR_VERSION 0
+#define VOODOO_MINOR_VERSION 1
#define VOODOO_PATCHLEVEL 0
#define PCI_CHIP_VOODOO1 0x0001
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 6c85dcd..6f1f925 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -42,7 +42,6 @@ #include "mibank.h"
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index f161f8e..f4dcd96 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -50,7 +50,6 @@ #include "mibank.h"
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
@@ -101,7 +100,7 @@ static void VoodooDisplayPowerManagement
*/
_X_EXPORT DriverRec VOODOO = {
- VERSION,
+ VOODOO_VERSION,
VOODOO_DRIVER_NAME,
VoodooIdentify,
VoodooProbe,
@@ -284,7 +283,7 @@ #endif
VoodooPCIChipsets,NULL,
NULL, NULL, NULL,
NULL))) {
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = VOODOO_VERSION;
pScrn->driverName = VOODOO_DRIVER_NAME;
pScrn->name = VOODOO_NAME;
pScrn->Probe = VoodooProbe;
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 5aa3c49..c943ab4 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -43,7 +43,6 @@ #include "mibank.h"
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
commit 61355da3d5b6c4d0ddc8c850de9d26ff614c5446
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:30:04 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 253fecf..e6c8681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
diff --git a/configure.ac b/configure.ac
index 74b402b..7954a0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit d7babb0733fbc829316ccd45d9c9cfb9b2a1a7b8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:56 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+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.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit 383cfcd075804108d745203cd0994f303d19e5f2
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:21 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index f1bd720..253fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
diff --git a/configure.ac b/configure.ac
index f33e185..74b402b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit 10d6004d445458208704f2f2222da8b5c645c19c
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:41 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..f1bd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 01b6c002ad1fca2a764108ff8625656685d0fb92
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:37 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index 749c638..e56beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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:
diff --git a/configure.ac b/configure.ac
index 11671e7..f33e185 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit 21dc72ae9cdb55fa78f0fd084f97e9ea3ca54920
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:12 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 1cc1dfb..749c638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index bf22914..11671e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 015e90f6b6846543e0e7749ffc2b1c35d686160c
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:30:06 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..1cc1dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index f9994af..bf22914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit ce9a84fc75ff8a5cf843221e221237556fa5bb81
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:15 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @DRIVER_NAME@.man
commit 35a05598c57e05007178a3ec63dd814d1b3f7bd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:23 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 4cc9473165a23e03d4107fee56a6837ca0a008b0
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:23 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index db7f827..f9994af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit c4424080af70cf905bc60ce1d0b7c422b2c5993c
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:57 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index 734eca4..db7f827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,15 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit ed78cee70cd76dd0f43141abdf803f2a469baeaa
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:06 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index 17c5888..734eca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
commit 1ed4d987a62bcf5a497ee22d4fa675b7134b1fd3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:01:56 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 1391fc217eb28a76e162784757da5b1b553cff72
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:38 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @DRIVER_NAME@.man
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
commit 4d2910cbfb5d9d071736001f3e6f8ee20222dae5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:09:09 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 3db9d43..17c5888 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=voodoo
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index d707173..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,22 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# 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.
-
-dist_man_MANS = \
- voodoo.4
+# 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.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @DRIVER_NAME@.man
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+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'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit 9a63bf647b0559957878766f5dc63ea100d0877e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 22:17:59 2005 +0000
Add some additional files to symlink.sh - and add TODO to voodoo driver
diff --git a/Makefile.am b/Makefile.am
index 7052905..a52b854 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,5 @@ # CONNECTION WITH THE SOFTWARE OR THE U
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+EXTRA_DIST = TODO
commit 6df3f4b81eed9107df75ef08ab367cc64468048c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:56 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
diff --git a/autogen.sh b/autogen.sh
index e81f989..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,4 +10,3 @@ autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"
-
commit 22f33cd649333ca4a579add3848ef07db16f89fd
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:46 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
diff --git a/configure.ac b/configure.ac
index 80ad019..3db9d43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 0.1.0,
- [ajax@freedesktop.org],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -57,6 +57,8 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit 8b86d5b142e77fc772c2c84102a2fa5a1ff344e6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:58:52 2005 +0000
Build system for voodoo
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7052905
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..80ad019
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,64 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-video-voodoo],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-voodoo)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([moduledir])
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+ man/Makefile
+])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..d707173
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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.
+
+dist_man_MANS = \
+ voodoo.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..b3a34f9
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,35 @@
+# Copyright 2005 Adam Jackson.
+#
+# 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.
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -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@
+voodoo_drv_la_LTLIBRARIES = voodoo_drv.la
+voodoo_drv_la_LDFLAGS = -module -avoid-version
+voodoo_drv_ladir = @moduledir@/drivers
+
+voodoo_drv_la_SOURCES = \
+ voodoo_dga.c \
+ voodoo_driver.c \
+ voodoo.h \
+ voodoo_hardware.c
commit 443375cce1fb3c52b9a64ec179686b70ab9baaa5
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:30:07 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index dccbf76..6c85dcd 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -33,6 +33,10 @@
* ANY KIND OR FORM.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "fb.h"
#include "mibank.h"
#include "micmap.h"
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 1f86cff..f161f8e 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -41,6 +41,10 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/voodoo/voodoo_driver.c,v 1.27 2001/08/07 07:04:46 keithp Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "fb.h"
#include "mibank.h"
#include "micmap.h"
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index b4d040a..5aa3c49 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -34,6 +34,10 @@
* http://www.magnatune.com
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "fb.h"
#include "mibank.h"
#include "micmap.h"
commit be3a1ab6f4cb4e3c53f1b08cb1174c17b7b4ff22
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:17:00 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index c12e7f0..1f86cff 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -96,7 +96,7 @@ static void VoodooDisplayPowerManagement
* this DriverRec be an upper-case version of the driver name.
*/
-DriverRec VOODOO = {
+_X_EXPORT DriverRec VOODOO = {
VERSION,
VOODOO_DRIVER_NAME,
VoodooIdentify,
@@ -183,8 +183,11 @@ static pointer voodooSetup(pointer modul
return NULL;
}
-XF86ModuleData voodooModuleData = { &voodooVersRec, voodooSetup, NULL };
-
+_X_EXPORT XF86ModuleData voodooModuleData = {
+ &voodooVersRec,
+ voodooSetup,
+ NULL
+};
#endif /* XFree86LOADER */
commit b9d71978d81671e3c216d1e2fa2dc78d8a2ff80f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:33 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index 668545a..dccbf76 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -55,11 +55,11 @@ #include "dgaproc.h"
#include "voodoo.h"
#define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
#define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
/***********************************************************************
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index a38435c..c12e7f0 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -62,11 +62,11 @@ #include "xaa.h"
#include "voodoo.h"
#define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
#define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
static const OptionInfoRec * VoodooAvailableOptions(int chipid, int busid);
static void VoodooIdentify(int flags);
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 6ba8569..b4d040a 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -54,11 +54,11 @@ #include "compiler.h"
#include "voodoo.h"
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
#include "opaque.h"
#define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
#include "mipict.h"
#include "dixstruct.h"
commit 8a8e883bae4926b9b5e75e5aabb7394b91d689b9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Nov 27 15:14:15 2004 +0000
xc/programs/Xserver/hw/xfree86/driver/ati/radeon.man
xc/programs/Xserver/hw/xfree86/driver/voodoo/voodo.man
xc/programs/Xserver/hw/xfree86/driver/wsfb/wsfb.man XF86Config ->
__xconfigfile__
diff --git a/man/voodoo.man b/man/voodoo.man
index 1c974ce..e170cdb 100644
--- a/man/voodoo.man
+++ b/man/voodoo.man
@@ -45,7 +45,7 @@ This driver does not support a virtual s
display size. This is a hardware limitation. 3D rendering is also not
supported.
.SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -67,6 +67,6 @@ The driver interacts badly with the
sstfb frame buffer driver as there is insufficient information to restore
the chip to its previous state.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+XFree86(1), __xconfigfile__(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors: Alan Cox, Ghozlane Toumi, Henrik Harmsen.
commit 6bcc0a72857119897eb752e302b75680760bbc9d
Author: alan <alan>
Date: Sun Aug 1 15:32:02 2004 +0000
Fix a typo Eric Anholt noticed. Fortunately in all normal situations this
didnt result in further operations being wrongly alpha blended
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 73b6c88..6ba8569 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -1250,7 +1250,7 @@ void VoodooSubsequentCPUToScreenAlphaTex
dh = 0;
}
}
- mmio32_w(pVoo, 114, pVoo->lfbMode);
+ mmio32_w(pVoo, 0x114, pVoo->lfbMode);
mmio32_w(pVoo, 0x10C, 0);
}
Reply to: