ChangeLog | 1073 ++++++++- Makefile.in | 127 - aclocal.m4 | 676 +++-- config.guess | 32 config.sub | 16 configure | 1147 ++++++---- configure.ac | 2 debian/changelog | 57 debian/control | 13 debian/patches/01_gen_pci_ids.diff | 39 debian/patches/01_savage_driver_disable_randr_on_rotation.diff | 58 debian/patches/02_fix_respawn_crash_regression.diff | 23 debian/patches/series | 3 debian/rules | 4 debian/xserver-xorg-video-savage.install | 1 debian/xsfbs/xsfbs.mk | 36 depcomp | 64 install-sh | 348 ++- ltmain.sh | 233 +- man/Makefile.in | 94 man/savage.man | 19 missing | 61 mkinstalldirs | 5 src/Makefile.in | 151 - src/savage_bci.h | 6 src/savage_driver.c | 101 src/savage_driver.h | 8 src/savage_exa.c | 142 - src/savage_image.c | 204 - 29 files changed, 3237 insertions(+), 1506 deletions(-)
New commits: commit c3e06ad850cf7f857b2c44903522922b216176b7 Author: David Nusinow <[EMAIL PROTECTED]> Date: Thu Sep 13 20:41:36 2007 -0400 * Build against X server 1.4 and build-dep on it as well diff --git a/debian/changelog b/debian/changelog index d5c0bb9..235fd18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,12 +5,12 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low thanks Tormod Volden, closes: #438975. [ David Nusinow ] - * Build against X server 1.3.99.0 and build-dep on it as well + * Build against X server 1.4 and build-dep on it as well * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it * Exclude savage_drv.la from dh_install - -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:09:56 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Thu, 13 Sep 2007 20:40:23 -0400 xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a0264c9..7114062 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit 23e26098563ab2c9090dd765ef51eb8c92edd19a Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Aug 31 18:11:42 2007 -0400 Exclude savage_drv.la from dh_install diff --git a/debian/changelog b/debian/changelog index 97abd67..d5c0bb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low * Build against X server 1.3.99.0 and build-dep on it as well * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it + * Exclude savage_drv.la from dh_install - -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:04:25 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:09:56 -0400 xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 0dfa1a3..9af5d18 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs ChangeLog - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --list-missing --exclude=savage_drv.la dh_link dh_strip dh_compress commit 96703c6c0448e969f2fd78a9e2b0e3bbc40f3827 Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Aug 31 18:09:08 2007 -0400 Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this driver supports so that the server can automatically load it Autoreconf diff --git a/debian/changelog b/debian/changelog index fd81cc8..97abd67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low +xserver-xorg-video-savage (1:2.1.3-2) experimental; urgency=low [ Brice Goglin ] * Drop the obsolete src/savage_image.c from the .diff.gz, @@ -6,6 +6,8 @@ xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low [ David Nusinow ] * Build against X server 1.3.99.0 and build-dep on it as well + * Add 01_gen_pci_ids.diff. This patch provides a set of pci id's that this + driver supports so that the server can automatically load it -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:04:25 -0400 diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff new file mode 100644 index 0000000..d1d3811 --- /dev/null +++ b/debian/patches/01_gen_pci_ids.diff @@ -0,0 +1,39 @@ +Index: xserver-xorg-video-savage/src/savage.ids +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xserver-xorg-video-savage/src/savage.ids 2007-08-31 18:03:03.000000000 -0400 +@@ -0,0 +1,23 @@ ++53338A22 ++53338A20 ++53338A21 ++53339102 ++53338C10 ++53338C11 ++53338C12 ++53338C13 ++53338A25 ++53338A26 ++53338D01 ++53338D02 ++53338C22 ++53338C24 ++53338C26 ++53338C2A ++53338C2B ++53338C2C ++53338C2D ++53338C2E ++53338C2F ++53338D03 ++53338D04 +Index: xserver-xorg-video-savage/src/Makefile.am +=================================================================== +--- xserver-xorg-video-savage.orig/src/Makefile.am 2007-08-31 18:03:21.000000000 -0400 ++++ xserver-xorg-video-savage/src/Makefile.am 2007-08-31 18:04:03.000000000 -0400 +@@ -56,3 +56,6 @@ + savage_dri.h \ + savage_dripriv.h + endif ++ ++pcidatadir = $(datadir)/xserver-xorg/pci ++pcidata_DATA = savage.ids diff --git a/debian/patches/series b/debian/patches/series index e69de29..b55d79f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +01_gen_pci_ids.diff diff --git a/debian/xserver-xorg-video-savage.install b/debian/xserver-xorg-video-savage.install index 614cfb4..8a9f4ba 100644 --- a/debian/xserver-xorg-video-savage.install +++ b/debian/xserver-xorg-video-savage.install @@ -1,2 +1,3 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* +usr/share/xserver-xorg/pci/* diff --git a/src/Makefile.in b/src/Makefile.in index da42165..1988bdb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -34,6 +34,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. + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -73,7 +74,8 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(savage_drv_ladir)" +am__installdirs = "$(DESTDIR)$(savage_drv_ladir)" \ + "$(DESTDIR)$(pcidatadir)" savage_drv_laLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(savage_drv_la_LTLIBRARIES) savage_drv_la_LIBADD = @@ -107,6 +109,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(savage_drv_la_SOURCES) DIST_SOURCES = $(am__savage_drv_la_SOURCES_DIST) +pcidataDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pcidata_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -252,6 +256,8 @@ savage_drv_la_SOURCES = savage_accel.c savage_xaa.c savage_exa.c \ savage_regs.h savage_sarea.h savage_shadow.c savage_streams.c \ savage_streams.h savage_vbe.c savage_vbe.h savage_video.c \ $(am__append_1) +pcidatadir = $(datadir)/xserver-xorg/pci +pcidata_DATA = savage.ids all: all-am .SUFFIXES: @@ -361,6 +367,23 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-pcidataDATA: $(pcidata_DATA) + @$(NORMAL_INSTALL) + test -z "$(pcidatadir)" || $(MKDIR_P) "$(DESTDIR)$(pcidatadir)" + @list='$(pcidata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pcidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcidatadir)/$$f'"; \ + $(pcidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcidatadir)/$$f"; \ + done + +uninstall-pcidataDATA: + @$(NORMAL_UNINSTALL) + @list='$(pcidata_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pcidatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(pcidatadir)/$$f"; \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -438,9 +461,9 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: - for dir in "$(DESTDIR)$(savage_drv_ladir)"; do \ + for dir in "$(DESTDIR)$(savage_drv_ladir)" "$(DESTDIR)$(pcidatadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -488,7 +511,7 @@ info: info-am info-am: -install-data-am: install-savage_drv_laLTLIBRARIES +install-data-am: install-pcidataDATA install-savage_drv_laLTLIBRARIES install-dvi: install-dvi-am @@ -524,7 +547,7 @@ ps: ps-am ps-am: -uninstall-am: uninstall-savage_drv_laLTLIBRARIES +uninstall-am: uninstall-pcidataDATA uninstall-savage_drv_laLTLIBRARIES .MAKE: install-am install-strip @@ -535,12 +558,13 @@ uninstall-am: uninstall-savage_drv_laLTLIBRARIES install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-savage_drv_laLTLIBRARIES install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-pcidataDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-savage_drv_laLTLIBRARIES install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-savage_drv_laLTLIBRARIES + tags uninstall uninstall-am uninstall-pcidataDATA \ + uninstall-savage_drv_laLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. commit cb39294c5d588db5805a02c7ead4a703f9d9e44a Author: David Nusinow <[EMAIL PROTECTED]> Date: Fri Aug 31 18:04:46 2007 -0400 * Build against X server 1.3.99.0 and build-dep on it as well diff --git a/debian/changelog b/debian/changelog index ccc953a..fd81cc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low + [ Brice Goglin ] * Drop the obsolete src/savage_image.c from the .diff.gz, thanks Tormod Volden, closes: #438975. - -- Brice Goglin <[EMAIL PROTECTED]> Tue, 21 Aug 2007 20:27:33 +0200 + [ David Nusinow ] + * Build against X server 1.3.99.0 and build-dep on it as well + + -- David Nusinow <[EMAIL PROTECTED]> Fri, 31 Aug 2007 18:04:25 -0400 xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4b87f6a..a0264c9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt +Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-xext-dev, x11proto-gl-dev, libgl1-mesa-dev | libgl-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, libdrm-dev (>> 2.0) [!hurd-i386], x11proto-xf86dri-dev, quilt Standards-Version: 3.7.2.0 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-savage XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git commit 77e220f2b27ec9f0c491ec903d1a4daf7b182275 Author: Brice Goglin <[EMAIL PROTECTED]> Date: Tue Aug 21 20:28:58 2007 +0200 Drop the obsolete src/savage_image.c from the .diff.gz diff --git a/debian/changelog b/debian/changelog index fec184a..ccc953a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-savage (1:2.1.3-2) UNRELEASED; urgency=low + + * Drop the obsolete src/savage_image.c from the .diff.gz, + thanks Tormod Volden, closes: #438975. + + -- Brice Goglin <[EMAIL PROTECTED]> Tue, 21 Aug 2007 20:27:33 +0200 + xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low * New upstream release. diff --git a/src/savage_image.c b/src/savage_image.c deleted file mode 100644 index 766c810..0000000 --- a/src/savage_image.c +++ /dev/null @@ -1,204 +0,0 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_image.c,v 1.4 2001/05/18 23:35:32 dawes Exp $ */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "savage_driver.h" -#include "xaarop.h" -#include "savage_bci.h" - -void SavageSubsequentImageWriteRect ( - ScrnInfoPtr pScrn, - int x, - int y, - int w, - int h, - int skipleft); - -void SavageSetupForImageWrite ( - ScrnInfoPtr pScrn, - int rop, - unsigned planemask, - int transparency_color, - int bpp, - int depth); - -void SavageWriteBitmapCPUToScreenColorExpand ( - ScrnInfoPtr pScrn, - int x, int y, int w, int h, - unsigned char * src, - int srcwidth, - int skipleft, - int fg, int bg, - int rop, - unsigned int planemask); - -#if 0 -void SavageWriteBitmapScreenToScreenColorExpand( - ScrnPtr pScrn, - int x, - int y, - int w, - int h, - unsigned char * src, - int srcwidth, - int srcx, - int srcy, - int bg, - int fg, - int rop, - unsigned int planemask -) -{ - SavagePtr psav = SAVPTR(pScrn); - BCI_GET_PTR; - unsigned int cmd; - unsigned char * bd_offset; - unsigned int bd; - - cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP - | BCI_CMD_SEND_COLOR - | BCI_CMD_DEST_GBD | BCI_CMD_SRC_SBD_MONO_NEW; - cmd |= (bg != -1) ? BCI_CMD_SEND_COLOR : BCI_CMD_SRC_TRANSPARENT; - cmd |= s3vAlu[rop]; - - bd |= BCI_BD_BW_DISABLE; - BCI_BD_SET_BPP(bd, 1); - BCI_BD_SET_STRIDE(bd, srcwidth); - bd_offset = srcwidth * srcy + (srcx >> 3) + src; - - psav->WaitQueue(psav,10); - BCI_SEND(cmd); - BCI_SEND((unsigned int)bd_offset); - BCI_SEND(bd); - BCI_SEND(fg); - BCI_SEND((bg != -1) ? bg : 0); - BCI_SEND(BCI_X_Y(srcx, srcy)); - BCI_SEND(BCI_X_Y(x, y)); - BCI_SEND(BCI_W_H(w, h)); -} -#endif - -void -SavageWriteBitmapCPUToScreenColorExpand ( - ScrnInfoPtr pScrn, - int x, int y, int w, int h, - unsigned char * src, - int srcwidth, - int skipleft, - int fg, int bg, - int rop, - unsigned int planemask -) -{ - SavagePtr psav = SAVPTR(pScrn); - BCI_GET_PTR; - int i, j, count, reset; - unsigned int cmd; - CARD32 * srcp; - -/* We aren't using planemask at all here... */ - - if( !srcwidth ) - return; - - cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP - | BCI_CMD_SEND_COLOR | BCI_CMD_CLIP_LR - | BCI_CMD_DEST_PBD_NEW | BCI_CMD_SRC_MONO; - cmd |= XAAGetCopyROP(rop) << 16; - - if( bg == -1 ) - cmd |= BCI_CMD_SRC_TRANSPARENT; - - BCI_SEND(cmd); - - BCI_SEND(psav->GlobalBD.bd2.LoPart); - BCI_SEND(psav->GlobalBD.bd2.HiPart); - - BCI_SEND(BCI_CLIP_LR(x+skipleft, x+w-1)); - BCI_SEND(fg); - if( bg != -1 ) - BCI_SEND(bg); - - /* Bitmaps come in in units of DWORDS, LSBFirst. This is exactly */ - /* reversed of what we expect. */ - - count = (w + 31) / 32; -/* src += ((srcx & ~31) / 8); */ - - /* The BCI region is 128k bytes. A screen-sized mono bitmap can */ - /* exceed that. */ - - reset = 65536 / count; - - for (j = 0; j < h; j ++) { - BCI_SEND(BCI_X_Y(x, y+j)); - BCI_SEND(BCI_W_H(w, 1)); - srcp = (CARD32 *) src; - for (i = count; i > 0; srcp ++, i --) { - /* We have to invert the bits in each byte. */ - CARD32 u = *srcp; - u = ((u & 0x0f0f0f0f) << 4) | ((u & 0xf0f0f0f0) >> 4); - u = ((u & 0x33333333) << 2) | ((u & 0xcccccccc) >> 2); - u = ((u & 0x55555555) << 1) | ((u & 0xaaaaaaaa) >> 1); - BCI_SEND(u); - } - src += srcwidth; - if( !--reset ) { - BCI_RESET; - reset = 65536 / count; - } - } -} - -void -SavageSetupForImageWrite( - ScrnInfoPtr pScrn, - int rop, - unsigned planemask, - int transparency_color, - int bpp, - int depth) -{ - SavagePtr psav = SAVPTR(pScrn); - int cmd; - - cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP - | BCI_CMD_CLIP_LR - | BCI_CMD_DEST_PBD_NEW | BCI_CMD_SRC_COLOR; - - cmd |= XAAGetCopyROP(rop) << 16; - - if( transparency_color != -1 ) - cmd |= BCI_CMD_SRC_TRANSPARENT; - - psav->SavedBciCmd = cmd; - psav->SavedBgColor = transparency_color; -} - - -void SavageSubsequentImageWriteRect -( - ScrnInfoPtr pScrn, - int x, - int y, - int w, - int h, - int skipleft) -{ - SavagePtr psav = SAVPTR(pScrn); - BCI_GET_PTR; - - psav->WaitQueue( psav, 8 ); - BCI_SEND(psav->SavedBciCmd); - - BCI_SEND(psav->GlobalBD.bd2.LoPart); - BCI_SEND(psav->GlobalBD.bd2.HiPart); - - BCI_SEND(BCI_CLIP_LR(x+skipleft, x+w-1)); - if( psav->SavedBgColor != 0xffffffff ) - BCI_SEND(psav->SavedBgColor); - BCI_SEND(BCI_X_Y(x, y)); - BCI_SEND(BCI_W_H(w, h)); -} commit 590a5fec0cf51dae55837d77ce630734545e9680 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Aug 17 04:15:06 2007 +0200 Update changelogs. diff --git a/ChangeLog b/ChangeLog index 6d06333..bd4b1b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +commit bf5e2a5d33fbab07bc3606927c58a3a04a5c9b1e +Author: Julien Cristau <[EMAIL PROTECTED]> +Date: Fri Aug 17 03:25:48 2007 +0200 + + Include <unistd.h> to get a declaration for usleep() + commit 83f3db97b107a84d79e21c64039328c05095719e Author: Alex Deucher <[EMAIL PROTECTED]> Date: Thu Aug 16 20:45:12 2007 -0400 diff --git a/debian/changelog b/debian/changelog index fdb0377..fec184a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low * New upstream release. + * Fix implicit declaration of usleep() in savage_driver.c. - -- Julien Cristau <[EMAIL PROTECTED]> Fri, 17 Aug 2007 03:17:22 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 17 Aug 2007 04:14:31 +0200 xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low commit bf5e2a5d33fbab07bc3606927c58a3a04a5c9b1e Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Aug 17 03:25:48 2007 +0200 Include <unistd.h> to get a declaration for usleep() diff --git a/src/savage_driver.c b/src/savage_driver.c index c56edf1..ab91bc4 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -39,6 +39,8 @@ #include "config.h" #endif +#include <unistd.h> + #include "xf86RAC.h" #include "shadowfb.h" commit 8d2fc95e243ca568167c2c7c928dd8168bd27574 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Aug 17 03:19:35 2007 +0200 Update changelogs. diff --git a/ChangeLog b/ChangeLog index 3237e30..6d06333 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +commit 83f3db97b107a84d79e21c64039328c05095719e +Author: Alex Deucher <[EMAIL PROTECTED]> +Date: Thu Aug 16 20:45:12 2007 -0400 + + update for 2.1.3 release + +commit 1f6258c7f4c4073de0bdd72f06c1e94bb6895c73 +Author: Brice Goglin <[EMAIL PROTECTED]> +Date: Tue Aug 7 09:54:47 2007 +0200 + + Define SAVAGE_VERSION* using PACKAGE_VERSION* + commit b706ffe07fc61281d2dea406f828418f42e3da85 Author: Alex Deucher <[EMAIL PROTECTED]> Date: Thu Jul 12 00:03:13 2007 -0400 diff --git a/debian/changelog b/debian/changelog index c38e325..fdb0377 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-savage (1:2.1.3-1) unstable; urgency=low + + * New upstream release. + + -- Julien Cristau <[EMAIL PROTECTED]> Fri, 17 Aug 2007 03:17:22 +0200 + xserver-xorg-video-savage (1:2.1.2-6) unstable; urgency=low [ Brice Goglin ] commit fc8476b343b1f457f6cb81e6171c45dbb7111bdd Author: Julien Cristau <[EMAIL PROTECTED]> Date: Fri Aug 17 03:17:20 2007 +0200 autoreconf diff --git a/Makefile.in b/Makefile.in index 7fe234f..340f363 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -33,15 +33,11 @@ # 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. -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -55,17 +51,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure COPYING ChangeLog config.guess \ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -73,10 +69,13 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ APP_MAN_DIR = @APP_MAN_DIR@ APP_MAN_SUFFIX = @APP_MAN_SUFFIX@ @@ -120,9 +117,7 @@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DRIVER_NAME = @DRIVER_NAME@ DRI_CFLAGS = @DRI_CFLAGS@ -DRI_FALSE = @DRI_FALSE@ DRI_LIBS = @DRI_LIBS@ -DRI_TRUE = @DRI_TRUE@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -134,6 +129,7 @@ FFLAGS = @FFLAGS@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -147,11 +143,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -162,19 +157,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ XORG_CFLAGS = @XORG_CFLAGS@ XORG_LIBS = @XORG_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -186,6 +182,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -214,8 +211,11 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man all: config.h @@ -259,7 +259,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -281,7 +281,6 @@ clean-libtool: distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -314,8 +313,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -417,23 +415,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -447,7 +444,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -455,6 +452,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -462,7 +461,7 @@ distdir: $(DISTFILES) -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -537,7 +536,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -607,12 +606,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -633,24 +640,26 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]