xserver-xorg-video-ark: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
src/.cvsignore | 6 ++++++
src/ark_reg.h | 2 +-
4 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit 1e341ca5f80f603e0d139bf464ba0143249f32cb
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 18:37:02 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 0.6.0.
diff --git a/ChangeLog b/ChangeLog
index 1450b33..e41fc6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/ark.h:
+ * src/ark_accel.c:
+ * src/ark_driver.c:
+ Unlibcwrap. Bump server version requirement. Bump to 0.6.0.
+
2006-02-08 Luc Verhaegen <libv@skynet.be>
* src/ark_driver.c: (ARKPreInit):
diff --git a/configure.ac b/configure.ac
index d612231..87a7472 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-ark],
- 0.5.0.5,
+ 0.6.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
@@ -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 $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/ark.h b/src/ark.h
index a76ff26..0219c5c 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
/*
* ark
*/
@@ -10,7 +10,6 @@ #include "xf86.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xaa.h"
-#include "xf86_ansic.h"
#include "vgaHW.h"
typedef struct _ARKRegRec {
@@ -56,9 +55,9 @@ #define ARKPTR(p) ((ARKPtr)((p)->driverP
#define DRIVER_NAME "ark"
-#define DRIVER_VERSION "0.5.0"
+#define DRIVER_VERSION "0.6.0"
#define VERSION_MAJOR 0
-#define VERSION_MINOR 5
+#define VERSION_MINOR 6
#define PATCHLEVEL 0
#define ARK_VERSION ((VERSION_MAJOR << 24) | \
(VERSION_MINOR << 16) | \
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 4637dc1..315226d 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -34,7 +34,6 @@ #endif
#include <X11/Xarch.h>
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86_OSproc.h"
#include "xaa.h"
#include "xf86PciInfo.h"
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 1febb9b..e5ee7e5 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -34,7 +34,6 @@ #endif
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xf86Version.h"
@@ -49,6 +48,7 @@ #include "mibstore.h"
#include "fb.h"
#include "ark.h"
+#include <string.h>
/*
* prototypes
commit 8a81f9ec9d1faaeb4913596961c39a9b7400e230
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Feb 8 17:50:15 2006 +0000
ARK: Remove wrong usage of pScrn->clock.
diff --git a/ChangeLog b/ChangeLog
index 104027e..1450b33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-08 Luc Verhaegen <libv@skynet.be>
+
+ * src/ark_driver.c: (ARKPreInit):
+
+ Remove wrong usage of pScrn->clock.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 1a13004..1febb9b 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -453,9 +453,6 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
pARK->clock_mult = 2;
}
- pScrn->numClocks = 1;
- pScrn->clock[0] = 80000; /* safe */
-
clockRanges = xnfcalloc(sizeof(ClockRange), 1);
clockRanges->next = NULL;
clockRanges->minClock = 20000;
commit 4d52b618aa10ebbb32ad9fc771cb1c1545cbb55c
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:59 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index ecef2b3..104027e 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 aff2ee0..d612231 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-ark],
- 0.5.0.4,
+ 0.5.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit 2fcf9c5df5d395d2e2e43949737303b0089bdb99
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:52 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 ccd9dc62d76526de1db316e2a548b1b4de199b3a
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:16 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..ecef2b3 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-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 49a289b..aff2ee0 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-ark],
- 0.5.0.3,
+ 0.5.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit 98973a0e64e801cec02f63c10660b9c1a69df68a
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:32 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 f729895..49a289b 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-ark],
- 0.5.0.2,
+ 0.5.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit d1a212a4e9d926a362665d0403ad3600a53b9345
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:07 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 00de74e..f729895 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 $REQUIRED_MODULES)
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
commit 6b41442a3d68b290442b5edb5094e60ef81606d8
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:29:57 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 4b208ca..00de74e 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 54808bc14a348f36cabac2168e18b4cf4244ba34
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:09 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/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 cccff99ea1f6d2483ba1c9c3ac438a609ca4cdf9
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:14 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 1271d39..4b208ca 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-ark],
- 0.5.0.1,
+ 0.5.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit 6a4e3fb5854ebaaa8a054ca8f28867b925844b25
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:52 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 217a313..1271d39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,15 @@ AC_ARG_WITH(xorg-module-dir, [ --with-x
[ moduledir="$libdir/xorg/modules" ])
AC_SUBST(moduledir)
+
+# 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 $REQUIRED_MODULES)
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
commit 69326ffc469a8b1c34dec1a8b6a426694bf199ac
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:02 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index 116fd89..217a313 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-ark],
- 0.5.0,
+ 0.5.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
commit e49525d59684b50255d07fe0d88960de891f6e13
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:09:01 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 83d9cf4..116fd89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,10 @@ # Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=ark
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
commit 78879585f2a82d90b7cd64ee2fce05cac182f066
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:45 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 25a5746b57a841c69c7c03ee217b8596f695b243
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 14:07:24 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
drivers
diff --git a/configure.ac b/configure.ac
index ebce88f..83d9cf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ # Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit ca9eb203e79ce1aaef5ae6fe6bdcb5f11ffe84c5
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:42 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 6722193..ebce88f 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-ark],
- 0.1.0,
- [ajax@freedesktop.org],
+ 0.5.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -59,6 +59,8 @@ # Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit 0092febd5aba5c208bee3b86dc4fcb27b2ffe1b6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 00:28:44 2005 +0000
- Add build system for xf86-video-ati
- Add build system for xserver/xorg/hw/xfree86/dri
- Add glcore.h to symlink.sh
- Symlink.sh: add some more DRI files, symlink glcore.h from
extras/Mesa/include/GL/internal to proto/GL
- proto/GL/Makefile.am: install glcore.h
- xf86-video-ark: s/module-dir/xorg-module-dir/
diff --git a/configure.ac b/configure.ac
index f224b53..6722193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,9 +40,9 @@ AC_PROG_CC
AH_TOP([#include "xorg-server.h"])
-AC_ARG_WITH(module-dir, [ --with-xorg-module-dir=DIR ],
- [ moduledir="$withval" ],
- [ moduledir="$libdir/xorg/modules" ])
+AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
+ [ moduledir="$withval" ],
+ [ moduledir="$libdir/xorg/modules" ])
AC_SUBST(moduledir)
# Checks for pkg-config packages
commit 2a195bccdc39b5e0241c03e0485a8afe1f0d2571
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 22:02:27 2005 +0000
driver/xf86-video-ark/src: Add Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..a605e6c
--- /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.
+ark_drv_la_LTLIBRARIES = ark_drv.la
+ark_drv_la_LDFLAGS = -module -avoid-version
+ark_drv_ladir = @moduledir@/drivers
+
+ark_drv_la_SOURCES = \
+ ark_accel.c \
+ ark_driver.c \
+ ark.h \
+ ark_reg.h
commit 9cf05e94f77f859615b4cb35a6fb52b3939836aa
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 18:08:41 2005 +0000
Add accidentally left out PKG_CHECK_MODULES
diff --git a/configure.ac b/configure.ac
index 792313a..f224b53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_ARG_WITH(module-dir, [ --with-xorg-m
AC_SUBST(moduledir)
# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, xorg-server xproto)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
commit 6a04dd93ad508915ae8f263ab54b80fb9acec4df
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 17:39:31 2005 +0000
Build system for ark video driver
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..16f4412
--- /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
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..792313a
--- /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-ark],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-ark)
+
+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(module-dir, [ --with-xorg-module-dir=DIR ],
+ [ moduledir="$withval" ],
+ [ moduledir="$libdir/xorg/modules" ])
+AC_SUBST(moduledir)
+
+# Checks for pkg-config packages
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+])
commit 65141896d5bc62e71208eafa5160c21ff7e302f5
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:29:44 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 21f7266..4637dc1 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -28,6 +28,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <X11/Xarch.h>
#include "xf86.h"
diff --git a/src/ark_driver.c b/src/ark_driver.c
index ac490c7..1a13004 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -28,6 +28,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
commit 827e5d59662065d4caff6b1db52a6672217c06c6
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:52 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 444e3c5..ac490c7 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -76,7 +76,7 @@ static unsigned char get_daccomm(IOADDRE
static unsigned char set_daccom(IOADDRESS, unsigned char comm);
-DriverRec ARK =
+_X_EXPORT DriverRec ARK =
{
ARK_VERSION,
DRIVER_NAME,
@@ -148,7 +148,7 @@ static XF86ModuleVersionInfo ARKVersRec
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -156,7 +156,7 @@ static XF86ModuleVersionInfo ARKVersRec
{0, 0, 0, 0}
};
-XF86ModuleData arkModuleData = { &ARKVersRec, ARKSetup, NULL };
+_X_EXPORT XF86ModuleData arkModuleData = { &ARKVersRec, ARKSetup, NULL };
pointer ARKSetup(pointer module, pointer opts, int *errmaj, int *errmin)
{
@@ -391,8 +391,10 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
(rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%x\n",
- pARK->FBAddress);
+ pScrn->memPhysBase = pARK->FBAddress;
+
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
+ (unsigned long)pARK->FBAddress);
if (!xf86SetGamma(pScrn, gzeros))
return FALSE;
commit e0cc898635fe405bc16ce915942e37623180aeb1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:22 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/ark_accel.c b/src/ark_accel.c
index 11b478c..21f7266 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
@@ -29,7 +29,7 @@
*/
-#include "Xarch.h"
+#include <X11/Xarch.h>
#include "xf86.h"
#include "xf86_ansic.h"
#include "xf86_OSproc.h"
commit bb8ec8f8d979f53c683020b66dddb250e63fca07
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:22:41 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/src/ark.h b/src/ark.h
index c56d179..a76ff26 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 9b68479..11b478c 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 604766b..444e3c5 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -148,7 +148,7 @@ static XF86ModuleVersionInfo ARKVersRec
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -391,10 +391,8 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
(rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
- pScrn->memPhysBase = pARK->FBAddress;
-
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
- (unsigned long)pARK->FBAddress);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%x\n",
+ pARK->FBAddress);
if (!xf86SetGamma(pScrn, gzeros))
return FALSE;
diff --git a/src/ark_reg.h b/src/ark_reg.h
index 727dbdf..91a9301 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
commit 4c8db25829e320eaf9c85f9a0b6442a931bd4840
Author: Egbert Eich <eich@suse.de>
Date: Wed May 26 16:24:08 2004 +0000
Fixing setting of physical framebuffer base for several drivers. C&T
driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
driver: improved support for lowres double scan modes.
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 2419a70..604766b 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -391,6 +391,8 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
(rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
+ pScrn->memPhysBase = pARK->FBAddress;
+
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
(unsigned long)pARK->FBAddress);
commit 64396251f02569d0bee87c8f304be3eefc0aa82b
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:25:33 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/src/ark.h b/src/ark.h
index a76ff26..c56d179 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 11b478c..9b68479 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 6399b99..2419a70 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.22 2003/08/23 15:02:53 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
@@ -148,7 +148,7 @@ static XF86ModuleVersionInfo ARKVersRec
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
diff --git a/src/ark_reg.h b/src/ark_reg.h
index 91a9301..727dbdf 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
commit c2217e65fc4a33cabd4aa4cb92e34a07b34abe7f
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:16 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/src/ark.h b/src/ark.h
index c56d179..a76ff26 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 9b68479..11b478c 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 2d916f2..6399b99 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.22 2003/08/23 15:02:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_reg.h b/src/ark_reg.h
index 727dbdf..91a9301 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
commit f0de270c61be39965b36630052d7243ed215ade5
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:15 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/src/ark.h b/src/ark.h
index a76ff26..c56d179 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 11b478c..9b68479 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 6399b99..2d916f2 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.22 2003/08/23 15:02:53 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_reg.h b/src/ark_reg.h
index 91a9301..727dbdf 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
commit cb39868f758e5c1b0b98364ca3b1190480cb3f86
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:46 2004 +0000
readding XFree86's cvs IDs
diff --git a/src/ark.h b/src/ark.h
index 1cfbf61..a76ff26 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index e60a49e..11b478c 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 5c5a23c..6399b99 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_reg.h b/src/ark_reg.h
index d202003..91a9301 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
commit 2fd451f8cd43e13a66c914d8fcac0c7e38b62ad8
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:15 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/src/ark.h b/src/ark.h
index a76ff26..1cfbf61 100644
--- a/src/ark.h
+++ b/src/ark.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */
+/* $XFree86$ */
/*
* ark
*/
diff --git a/src/ark_accel.c b/src/ark_accel.c
index 11b478c..e60a49e 100644
--- a/src/ark_accel.c
+++ b/src/ark_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 6399b99..5c5a23c 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
diff --git a/src/ark_reg.h b/src/ark_reg.h
index 91a9301..d202003 100644
--- a/src/ark_reg.h
+++ b/src/ark_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */
+/* $XFree86$ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
commit 3362857a4aa10088f9359f7a8a3573dbd62c64b0
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:34 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/ark_driver.c b/src/ark_driver.c
index 0d84bce..6399b99 100644
--- a/src/ark_driver.c
+++ b/src/ark_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.21 2002/07/24 01:47:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <ajoshi@unixbox.com>
*
@@ -285,7 +285,7 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
pScrn->monitor = pScrn->confScreen->monitor;
- if (!xf86SetDepthBpp(pScrn, 8, 8, 8, Support24bppFb | Support32bppFb))
+ if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb))
return FALSE;
else {
switch (pScrn->depth) {
@@ -391,8 +391,8 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn
pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
(rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%x\n",
- pARK->FBAddress);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
+ (unsigned long)pARK->FBAddress);
if (!xf86SetGamma(pScrn, gzeros))
return FALSE;
Reply to: