COPYING | 68 ++++++++++++++++++++++++++++++++++++++++++++++++-------
ChangeLog | 67 ------------------------------------------------------
Makefile.am | 12 ++++++++-
README | 24 +++++++++++++++++++
configure.ac | 10 ++++++--
man/.cvsignore | 2 -
man/.gitignore | 2 +
man/cirrus.man | 5 ++--
src/.cvsignore | 6 ----
src/.gitignore | 6 ++++
src/CirrusClk.c | 2 -
src/Makefile.am | 2 -
src/alp_driver.c | 4 +--
src/cir_dga.c | 2 -
src/cir_driver.c | 8 +++---
src/cir_shadow.c | 12 ++++-----
src/lg_driver.c | 2 -
17 files changed, 130 insertions(+), 104 deletions(-)
New commits:
commit 15b1632d4136d4d20e006626836fb1f73c5a61f7
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu May 7 06:56:57 2009 -0700
Version 1.3.0
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/configure.ac b/configure.ac
index fac942f..bc503cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-cirrus],
- 1.2.1,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cirrus)
commit b2dd1f8616e0863710abe1efd0d6444d749b6c49
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu May 7 06:45:12 2009 -0700
Updates to COPYING, README, & cirrus.man
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/COPYING b/COPYING
index 7f33cbf..9af4242 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,64 @@
-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 (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+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 fur-
+nished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
+Copyright 2000 by Egbert Eich
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of Alan Hourihane not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Alan Hourihane makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+EGBERT EICH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+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.
diff --git a/README b/README
index a855ceb..4e1c707 100644
--- a/README
+++ b/README
@@ -15,6 +15,10 @@ The master development code repository can be found at:
http://cgit.freedesktop.org/xorg/driver/xf86-video-cirrus
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
diff --git a/man/cirrus.man b/man/cirrus.man
index 201dc7d..009011e 100644
--- a/man/cirrus.man
+++ b/man/cirrus.man
@@ -27,4 +27,5 @@ driver.
.SH "SEE ALSO"
__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1),
X(__miscmansuffix__)
.SH AUTHORS
-Authors include: ...
+Authors include: Corin Anderson, Egbert Eich, Derek Fawcus, Koen Gadeyne,
+Harm Hanemaayer, David Monniaux, Itai Nahshon
commit 5db201643fc0e1554fb522db3a215f55938dd1e3
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Thu May 7 06:43:12 2009 -0700
renamed: {man,src}/.cvsignore -> {man,src}/.gitignore
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 8676a781c9fcbf03e61f9805c436d21555220e9a
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Wed Apr 29 18:30:25 2009 -0700
Raise minimum xorg-server required to 1.4 for miGetPointerPosition
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/configure.ac b/configure.ac
index 700c727..fac942f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto
$REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 6e13b31347c298e72f0f4bcaf94b56172a48bd5c
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Apr 24 02:31:23 2009 -0700
Replace static ChangeLog with XORG_CHANGELOG, use XORG_CWARNFLAGS too
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 92ba092..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,67 +0,0 @@
-2006-04-06 Adam Jackson <a...@freedesktop.org>
-
- * configure.ac:
- * src/CirrusClk.c:
- * src/alp_driver.c:
- * src/alp_hwcurs.c:
- * src/alp_i2c.c:
- * src/alp_xaa.c:
- * src/alp_xaam.c:
- * src/cir.h:
- * src/cir_dga.c:
- * src/cir_driver.c:
- * src/cir_shadow.c:
- * src/lg_driver.c:
- * src/lg_hwcurs.c:
- * src/lg_i2c.c:
- * src/lg_xaa.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
- * src/cir_driver.c:
- VERSION -> CIR_VERSION
-
-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 <a...@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-28 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * src/Makefile.am:
- Separate cirrus driver into _drv, _alpine and _laguna components
- as they are in the monolithic tree.
-
-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:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index ceec308..aa89732 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,4 +21,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
-EXTRA_DIST = README.multihead
+EXTRA_DIST = README.multihead ChangeLog
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
+
diff --git a/configure.ac b/configure.ac
index a17ccab..700c727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,15 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or
later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -84,6 +89,7 @@ AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([
Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 88f6fa1..f2cb24f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ $(CWARNFLAGS)
cirrus_drv_la_LTLIBRARIES = cirrus_drv.la
cirrus_drv_la_LDFLAGS = -module -avoid-version
commit 19b9d2335a89269b271583101d4fe377c5dfdddf
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 30 20:38:04 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
diff --git a/README b/README
new file mode 100644
index 0000000..a855ceb
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+xf86-video-cirrus - Cirrus Logic video driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-cirrus
+
+ http://cgit.freedesktop.org/xorg/driver/xf86-video-cirrus
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
commit c5c3a60d085efdc32132f0a19de50b559dcf3827
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:26:50 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/cirrus.man b/man/cirrus.man
index 2c5e4a0..201dc7d 100644
--- a/man/cirrus.man
+++ b/man/cirrus.man
@@ -25,6 +25,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for
general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1),
Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1),
X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
commit d92459edcb8917d51435110f6b30a133d8ce7d52
Author: Matthieu Herrb <matthieu.he...@laas.fr>
Date: Tue Sep 16 23:48:07 2008 +0200
alpine: fix order of arguments of PCI_WRITE_LONG().
diff --git a/src/alp_driver.c b/src/alp_driver.c
index c5d2426..b7be5b2 100644
--- a/src/alp_driver.c
+++ b/src/alp_driver.c
@@ -591,8 +591,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
* BIOSes tend to mess them up
*/
- PCI_WRITE_LONG(pCir->PciInfo, 0x10, PCI_REGION_BASE(pCir->PciInfo, 0,
REGION_MEM));
- PCI_WRITE_LONG(pCir->PciInfo, 0x14, PCI_REGION_BASE(pCir->PciInfo, 1,
REGION_MEM));
+ PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0,
REGION_MEM), 0x10);
+ PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1,
REGION_MEM), 0x14);
}
commit 6dcbf42d6ddf0f8b55feb72008c4f79b18a1603a
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Thu Jul 17 19:06:42 2008 -0300
Update to use miPointerGetPosition.
miPointerPosition is deprecated.
diff --git a/src/lg_driver.c b/src/lg_driver.c
index c731f61..ff5a477 100644
--- a/src/lg_driver.c
+++ b/src/lg_driver.c
@@ -1547,7 +1547,7 @@ LgAdjustFrame(int scrnIndex, int x, int y, int flags)
(PCI_CHIP_GD5465 == pCir->Chipset) ? 1 :
(24==pScrn->bitsPerPixel?3:1);
/* Where's the pointer? */
- miPointerPosition(&cursorX, &cursorY);
+ miPointerGetPosition(inputInfo.pointer, &cursorX, &cursorY);
/* Where's the middle of the screen? We want to eventually know
which side of the screen the pointer is on. */
commit 8341f8b0298eef41ff9db582305e3b7006cdf27a
Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Mon Jul 28 19:09:16 2008 -0300
Export symbols used by different cirrus driver modules.
Symbols are used by cirrus_drv.so, cirrus_alpine.so, and cirrus_laguna.so.
These must have public visibility if compiling with hidden symbols.
diff --git a/src/CirrusClk.c b/src/CirrusClk.c
index f23fde8..a3590c9 100644
--- a/src/CirrusClk.c
+++ b/src/CirrusClk.c
@@ -88,7 +88,7 @@ static cirrusClockRec cirrusClockTab[] = {
* use the tested clock since others can be unstable.
*/
-Bool
+_X_EXPORT Bool
CirrusFindClock(int *rfreq, int max_clock, int *num_out, int *den_out)
{
int n, i;
diff --git a/src/cir_dga.c b/src/cir_dga.c
index bedb796..bc98df6 100644
--- a/src/cir_dga.c
+++ b/src/cir_dga.c
@@ -67,7 +67,7 @@ DGAFunctionRec CirDGAFuncs = {
-Bool
+_X_EXPORT Bool
CirDGAInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
diff --git a/src/cir_driver.c b/src/cir_driver.c
index 1942b15..0ce058d 100644
--- a/src/cir_driver.c
+++ b/src/cir_driver.c
@@ -93,7 +93,7 @@ SymTabRec CIRChipsets[] = {
};
/* List of PCI chipset names */
-PciChipsets CIRPciChipsets[] = {
+_X_EXPORT PciChipsets CIRPciChipsets[] = {
{ PCI_CHIP_GD5430, PCI_CHIP_GD5430, RES_SHARED_VGA },
{ PCI_CHIP_GD5434_4,PCI_CHIP_GD5434_4, RES_SHARED_VGA },
{ PCI_CHIP_GD5434_8,PCI_CHIP_GD5434_8, RES_SHARED_VGA },
@@ -320,7 +320,7 @@ CIRProbe(DriverPtr drv, int flags)
* Map the framebuffer and MMIO memory.
*/
-Bool
+_X_EXPORT Bool
CirMapMem(CirPtr pCir, int scrnIndex)
{
int mmioFlags;
@@ -410,7 +410,7 @@ CirMapMem(CirPtr pCir, int scrnIndex)
* Unmap the framebuffer and MMIO memory.
*/
-Bool
+_X_EXPORT Bool
CirUnmapMem(CirPtr pCir, int scrnIndex)
{
#ifdef CIR_DEBUG
@@ -438,7 +438,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
return TRUE;
}
-void
+_X_EXPORT void
cirProbeDDC(ScrnInfoPtr pScrn, int index)
{
vbeInfoPtr pVbe;
diff --git a/src/cir_shadow.c b/src/cir_shadow.c
index a7964cd..e8b8d35 100644
--- a/src/cir_shadow.c
+++ b/src/cir_shadow.c
@@ -19,7 +19,7 @@
#include "cir.h"
#include "alp.h"
-void
+_X_EXPORT void
cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
{
CirPtr pCir = CIRPTR(pScrn);
@@ -46,7 +46,7 @@ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
}
}
-void
+_X_EXPORT void
cirPointerMoved(int index, int x, int y)
{
ScrnInfoPtr pScrn = xf86Screens[index];
@@ -64,7 +64,7 @@ cirPointerMoved(int index, int x, int y)
(*pCir->PointerMoved)(index, newX, newY);
}
-void
+_X_EXPORT void
cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
{
CirPtr pCir = CIRPTR(pScrn);
@@ -110,7 +110,7 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
}
-void
+_X_EXPORT void
cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
{
CirPtr pCir = CIRPTR(pScrn);
@@ -157,7 +157,7 @@ cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
/* this one could be faster */
-void
+_X_EXPORT void
cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
{
CirPtr pCir = CIRPTR(pScrn);
@@ -208,7 +208,7 @@ cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
}
}
-void
+_X_EXPORT void
cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
{
CirPtr pCir = CIRPTR(pScrn);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
