COPYING | 8 ++++---- Makefile.am | 10 ++++------ configure.ac | 12 +++++++++--- man/Makefile.am | 2 +- man/glide.man | 2 +- src/Makefile.am | 2 +- src/glide_driver.c | 8 ++++---- 7 files changed, 24 insertions(+), 20 deletions(-)
New commits: commit e20cb5035996b392b010f2b52aa14d004868825a Author: Guillem Jover <[email protected]> Date: Wed Feb 25 01:23:03 2009 +0200 Bump to 1.0.2 diff --git a/configure.ac b/configure.ac index c6fedd8..f257c78 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-glide], - 1.0.1, + 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-glide) commit 542f21b2465c80d78aa154fa75d61c793342f3d8 Author: Guillem Jover <[email protected]> Date: Wed Feb 25 01:17:52 2009 +0200 Use XORG_CHANGELOG and CHANGELOG_CMD to generate the ChangeLog file Require at least xorg-macros 1.2 for XORG_CHANGELOG. diff --git a/Makefile.am b/Makefile.am index edff7fa..95892da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,10 +26,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: 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 ) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index f6a5e55..c6fedd8 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,11 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros version 1.2.0 or newer for 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 @@ -81,6 +86,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile commit 65c779a41c3ae1c66b7de2ecbd5904a25009f5ca Author: Guillem Jover <[email protected]> Date: Wed Feb 25 01:12:33 2009 +0200 Make ChangeLog a .PHONY target diff --git a/Makefile.am b/Makefile.am index 7044ec9..edff7fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,8 @@ SUBDIRS = src man EXTRA_DIST = README ChangeLog MAINTAINERCLEANFILES = ChangeLog +.PHONY: ChangeLog + ChangeLog: ( GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && \ mv .changelog.tmp ChangeLog; \ commit e9a6a763f3b08dce0a8815ce0e7bbe3843fe08d2 Author: Guillem Jover <[email protected]> Date: Wed Feb 25 01:11:03 2009 +0200 Add UTF-8 copyright symbol to copyright statements diff --git a/COPYING b/COPYING index fcde660..2985acd 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 1997-2003 by The XFree86 Project, Inc. +Copyright © 1997-2003 by The XFree86 Project, Inc. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -20,8 +20,8 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Copyright 2005 Adam Jackson. -Copyright 2007 Guillem Jover. +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"), @@ -42,7 +42,7 @@ 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. +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 diff --git a/Makefile.am b/Makefile.am index 1edd0a7..7044ec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2005 Adam Jackson. +# 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"), diff --git a/configure.ac b/configure.ac index 11f70e5..f6a5e55 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -# Copyright 2005 Adam Jackson. -# Copyright 2007 Guillem Jover. +# 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"), diff --git a/man/Makefile.am b/man/Makefile.am index bdb85f3..c068904 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# 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 diff --git a/src/Makefile.am b/src/Makefile.am index 9542fbb..383a62d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 2005 Adam Jackson. +# 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"), commit 0cdda109b9fc3deb5ad860f144d3061551ad6058 Author: Guillem Jover <[email protected]> Date: Wed Feb 25 01:09:52 2009 +0200 Rename entity to entityIndex to fix build failure Regression introduced in commit 62922e27c80ac392fc35a347b2c8163fcec7decf. diff --git a/src/glide_driver.c b/src/glide_driver.c index 12cdcd7..fac93b2 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -390,9 +390,9 @@ GLIDEProbe(DriverPtr drv, int flags) GlideDevice = xf86SetIntOption(dev->options, "GlideDevice", 0); if (GlideDevice == sst) { - int entity; + int entityIndex; /* Match */ - entity = xf86ClaimNoSlot(drv, 0, dev, TRUE); + entityIndex = xf86ClaimNoSlot(drv, 0, dev, TRUE); pScrn = NULL; /* Allocate a ScrnInfoRec and claim the slot */ commit 7703441867c3d80eb89fca466c30cef024fd39bc Author: Alan Coopersmith <[email protected]> Date: Fri Jan 9 16:28:20 2009 -0800 Remove xorgconfig & xorgcfg from See Also list in man page diff --git a/man/glide.man b/man/glide.man index ad39b3e..9f82a31 100644 --- a/man/glide.man +++ b/man/glide.man @@ -274,6 +274,6 @@ $ xinit -- +xinerama .SH FILES glide_drv.o .SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHORS Author: Henrik Harmsen. commit 62922e27c80ac392fc35a347b2c8163fcec7decf Author: Adam Jackson <[email protected]> Date: Sun Nov 23 20:07:24 2008 -0500 Use "no" bus, not ISA. diff --git a/src/glide_driver.c b/src/glide_driver.c index 1f6bdae..12cdcd7 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -392,12 +392,12 @@ GLIDEProbe(DriverPtr drv, int flags) { int entity; /* Match */ - entity = xf86ClaimIsaSlot(drv, 0, dev, TRUE); + entity = xf86ClaimNoSlot(drv, 0, dev, TRUE); pScrn = NULL; /* Allocate a ScrnInfoRec and claim the slot */ - if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, entity, NULL, NULL, - NULL, NULL, NULL, NULL))) { + if ((pScrn = xf86AllocateScreen(drv, 0))) { + xf86AddEntityToScreen(pScrn, entityIndex); /* I'm not going to "claim" the glide device since no other driver than this can drive it */ /* (A glide device is not a PCI device) */ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
