xserver-xorg-video-mach64: Changes to 'debian-unstable'
COPYING | 109 +++++++++++++++++++++++++++++++++++++++++---
ChangeLog | 54 ++++++++++++++++++++++
README | 13 +++--
configure.ac | 6 ++
debian/README.source | 73 +++++++++++++++++++++++++++++
debian/changelog | 7 +-
debian/control | 3 -
debian/copyright | 122 ++++++++++++++++++++++----------------------------
debian/rules | 4 -
debian/xsfbs/xsfbs.sh | 12 ----
src/atibus.c | 3 -
src/atimach64.c | 5 ++
src/atimach64render.c | 6 ++
src/atipreinit.c | 18 ++++++-
src/atistruct.h | 8 ++-
15 files changed, 338 insertions(+), 105 deletions(-)
New commits:
commit ae5ac9d3cab04e087368c1c11ff70f0254a7d8eb
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:17:08 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9daf644..e63557e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low
* New upstream release.
* Move -dbg package to section debug.
@@ -7,7 +7,7 @@ xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
* Add README.source, bump Standards-Version to 3.8.2.
* Update debian/copyright from upstream COPYING.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:16:29 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:17:03 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
commit 15cd3b0758cb1e410865153a2cf561d5224c6247
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:16:58 2009 +0200
Update debian/copyright from upstream COPYING
diff --git a/debian/changelog b/debian/changelog
index c4f2864..9daf644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
* Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
choose drivers.
* Add README.source, bump Standards-Version to 3.8.2.
+ * Update debian/copyright from upstream COPYING.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:14:02 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:16:29 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 5b3245c..cf43978 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,6 +21,36 @@ 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 1999, 2000 ATI Technologies Inc., Markham, Ontario,
+ Precision Insight, Inc., Cedar Park, Texas, and
+ VA Linux Systems Inc., Fremont, California.
+
+All Rights Reserved.
+
+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, 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
+NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
+SYSTEMS AND/OR THEIR SUPPLIERS 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.
+
+*************************************************************************
Copyright 2000 Gareth Hughes
All Rights Reserved.
@@ -42,17 +72,28 @@ GARETH HUGHES 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.
-(c) 2004 Adam Jackson. Standard MIT license applies.
+*************************************************************************
+
+Copyright 2006, 2007 George Sapountzis
+All Rights Reserved.
-Copyright 1999-2000 Precision Insight, Inc., Cedar Park, Texas.
+Based on the mach64 DRI and DRM drivers:
+Copyright 2000 Gareth Hughes
+Copyright 2002-2003 Leif Delgass
All Rights Reserved.
-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:
+Based on the ati hw/kdrive driver:
+Copyright 2003 Eric Anholt, Anders Carlsson
+
+Based on the via hw/xfree86 driver:
+Copyright 2006 Thomas Hellstrom. All Rights Reserved.
+
+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
@@ -60,63 +101,8 @@ 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
-PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
-
-Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
-Precision Insight, Inc., Cedar Park, Texas, and
-VA Linux Systems Inc., Fremont, California.
-
-All Rights Reserved.
-
-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, 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
-NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-SYSTEMS AND/OR THEIR SUPPLIERS 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.
-
-Copyright 2003 Alex Deucher.
-
-All Rights Reserved.
-
-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, 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
-NON-INFRINGEMENT. IN NO EVENT SHALL ALEX DEUCHER, OR ANY OTHER
-CONTRIBUTORS 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.
-
-Created by Bogdan D. bogdand@users.sourceforge.net
-License: GPL (see /usr/share/common-licenses/GPL)
+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.
commit adc5b130ccb4473a9fc41790e1d5200fca568243
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:14:38 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index 858e94b..24ac0cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+commit 2013b64cf19fce32edb052ee6d8529d3ce69d409
+Author: Dave Airlie <airlied@redhat.com>
+Date: Thu Jul 30 12:04:28 2009 +1000
+
+ mach64: bump for release 6.8.2
+
+commit 4f08e83e50059df494f5f53cd05eb8809d18656e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ mach64: change to using ABI version check
+
+commit 64960253ea5dcfb01d92b5b684790f16be5b73be
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jul 28 13:32:31 2009 +1000
+
+ mach64: update for resources/RAC API removal
+
+commit 965614f27d42106e859000264a6eb89d9fcba67e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Jul 16 11:43:33 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9caef14defaf892d957875f6d774003a036bad45
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon May 11 22:06:40 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
+commit d9d787167795862909738892195fcdc751c413ed
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sun May 10 16:56:02 2009 -0700
+
+ Doublecheck pictFormat is a supported format
+
+ Fixes these warnings from parfait source checker:
+
+ Error: Read buffer overflow at src/atimach64render.c:601
+ in function 'Mach64PrepareTexture' [Symbolic analysis]
+ In array dereference of Mach64TexFormats[i] with index 'i'
+ Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
+ Error: Read buffer overflow at src/atimach64render.c:712
+ in function 'Mach64PrepareComposite' [Symbolic analysis]
+ In array dereference of Mach64TexFormats[i] with index 'i'
+ Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 29 17:32:47 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 80b58b8..c4f2864 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-mach64 (6.8.2-1) UNRELEASED; urgency=low
* New upstream release.
* Move -dbg package to section debug.
@@ -6,7 +6,7 @@ xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
choose drivers.
* Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:10:19 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:14:02 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
commit 020917b745b41957436132fec7c243b7f5516516
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
mach64: bump for release 6.8.2
diff --git a/configure.ac b/configure.ac
index 68e2a5f..2e6bc91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-mach64],
- 6.8.1,
+ 6.8.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-mach64)
commit 58da6804a3f4775d2c14fae89d0fe7c1224af0cb
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
mach64: change to using ABI version check
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 6c742fd..34b851c 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -52,7 +52,7 @@
#include "atixv.h"
#include "vbe.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#endif
diff --git a/src/atistruct.h b/src/atistruct.h
index ac76b1f..5225256 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -59,7 +59,7 @@
#endif
#include "xf86Cursor.h"
#include "xf86Pci.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
commit 605ab90b346a436c1d06fe2e279a82a140b97f9c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:31 2009 +1000
mach64: update for resources/RAC API removal
diff --git a/src/atibus.c b/src/atibus.c
index 69a3089..7b6cb48 100644
--- a/src/atibus.c
+++ b/src/atibus.c
@@ -59,6 +59,7 @@ ATIClaimResources
)
{
+#ifndef XSERVER_LIBPCIACCESS
#ifndef AVOID_CPIO
resRange Resources[2] = {{0, 0, 0}, _END};
@@ -101,7 +102,7 @@ ATIClaimResources
}
#endif /* AVOID_CPIO */
-
+#endif
}
/*
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 2b84a6c..6c742fd 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -52,7 +52,9 @@
#include "atixv.h"
#include "vbe.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86RAC.h"
+#endif
/*
* FreeScreen handles the clean-up.
@@ -507,7 +509,9 @@ ATIPreInit
ATIPtr pATI;
GDevPtr pGDev;
EntityInfoPtr pEntity;
+#ifndef XSERVER_LIBPCIACCESS
resPtr pResources;
+#endif
pciVideoPtr pVideo;
DisplayModePtr pMode;
CARD32 IOValue;
@@ -548,7 +552,9 @@ ATIPreInit
/* Register resources */
pEntity = xf86GetEntityInfo(pScreenInfo->entityList[0]);
pGDev = pEntity->device;
+#ifndef XSERVER_LIBPCIACCESS
pResources = pEntity->resources;
+#endif
pATI->iEntity = pEntity->index;
pATI->Chip = pEntity->chipset;
@@ -556,6 +562,7 @@ ATIPreInit
xfree(pEntity);
+#ifndef XSERVER_LIBPCIACCESS
if (!pResources)
pResources = xf86RegisterResources(pATI->iEntity, NULL, ResShared);
if (pResources)
@@ -565,7 +572,7 @@ ATIPreInit
xf86FreeResList(pResources);
return FALSE;
}
-
+#endif
ConfiguredMonitor = NULL;
(void)memset(BIOS, 0, SizeOf(BIOS));
@@ -753,6 +760,7 @@ ATIPreInit
#endif /* AVOID_CPIO */
+#ifndef XSERVER_LIBPCIACCESS
#ifdef AVOID_CPIO
pScreenInfo->racMemFlags =
@@ -765,7 +773,7 @@ ATIPreInit
pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
#endif /* AVOID_CPIO */
-
+#endif
/* Finish private area initialisation */
pATI->nFIFOEntries = 16; /* For now */
@@ -1056,6 +1064,7 @@ ATIPreInit
xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED, "%s.\n", Buffer);
}
+#ifndef XSERVER_LIBPCIACCESS
#ifndef AVOID_CPIO
if (pATI->CPIO_VGAWonder)
@@ -1064,6 +1073,7 @@ ATIPreInit
pATI->CPIO_VGAWonder);
#endif /* AVOID_CPIO */
+#endif
xf86DrvMsg(pScreenInfo->scrnIndex, X_PROBED,
"ATI Mach64 adapter detected.\n");
@@ -1174,6 +1184,7 @@ ATIPreInit
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
"Using Mach64 accelerator CRTC.\n");
+#ifndef XSERVER_LIBPCIACCESS
#ifndef AVOID_CPIO
if (pATI->VGAAdapter)
@@ -1206,6 +1217,7 @@ ATIPreInit
}
#endif /* AVOID_CPIO */
+#endif
}
@@ -1961,6 +1973,7 @@ ATIPreInit
}
}
+#ifndef XSERVER_LIBPCIACCESS
#ifndef AVOID_CPIO
if (pATI->VGAAdapter)
@@ -1981,6 +1994,7 @@ ATIPreInit
}
#endif /* AVOID_CPIO */
+#endif
/*
* Remap apertures. Must lock and re-unlock around this in case the
diff --git a/src/atistruct.h b/src/atistruct.h
index b9f4d08..ac76b1f 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -59,7 +59,9 @@
#endif
#include "xf86Cursor.h"
#include "xf86Pci.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#endif
#include "atipcirename.h"
@@ -269,9 +271,9 @@ typedef struct _ATIRec
CARD8 BusType;
#ifndef AVOID_CPIO
-
- resRange VGAWonderResources[2];
-
+#ifndef XSERVER_LIBPCIACCESS
+ resRange VGAWonderResources[2];
+#endif
#endif /* AVOID_CPIO */
/*
commit 89ad9dff08489dfb49c3afca1c86e43ec6b92c51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 11:43:33 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index e22b987..68e2a5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/atimach64.c b/src/atimach64.c
index c7b0ecc..e3897ea 100644
--- a/src/atimach64.c
+++ b/src/atimach64.c
@@ -63,10 +63,15 @@
#include "atimach64io.h"
#include "atirgb514.h"
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#ifndef DPMS_SERVER
# define DPMS_SERVER
#endif
#include <X11/extensions/dpms.h>
+#endif
+
/*
* ATIMach64PreInit --
commit 0b7eb950499bb84f08013a4a3dfa94c538dc26b3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 11 22:06:40 2009 -0700
Fill in COPYING file, add SubmittingPatches URL to README
diff --git a/COPYING b/COPYING
index 7f33cbf..8ddc658 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,105 @@
-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 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-Please submit updated COPYING files to the Xorg bugzilla:
+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 Marc Aurele La France not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. Marc Aurele La France makes no representations
+about the suitability of this software for any purpose. It is provided
+"as-is" without express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL MARC AURELE LA FRANCE 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.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+*************************************************************************
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
+ Precision Insight, Inc., Cedar Park, Texas, and
+ VA Linux Systems Inc., Fremont, California.
+
+All Rights Reserved.
+
+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, 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
+NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
+SYSTEMS AND/OR THEIR SUPPLIERS 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.
+
+*************************************************************************
+Copyright 2000 Gareth Hughes
+All Rights Reserved.
+
+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
+GARETH HUGHES 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.
+
+*************************************************************************
+
+Copyright 2006, 2007 George Sapountzis
+All Rights Reserved.
+
+Based on the mach64 DRI and DRM drivers:
+Copyright 2000 Gareth Hughes
+Copyright 2002-2003 Leif Delgass
+All Rights Reserved.
+
+Based on the ati hw/kdrive driver:
+Copyright 2003 Eric Anholt, Anders Carlsson
+
+Based on the via hw/xfree86 driver:
+Copyright 2006 Thomas Hellstrom. All Rights Reserved.
+
+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 143816b..f2e2bb5 100644
--- a/README
+++ b/README
@@ -1,20 +1,25 @@
xf86-video-mach64 - ATI Mach64 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
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mach64
http://cgit.freedesktop.org/xorg/driver/xf86-video-mach64
+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
+
commit ea7c64706b3c70970803cd203bdbf9b25a41b81d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sun May 10 16:56:02 2009 -0700
Doublecheck pictFormat is a supported format
Fixes these warnings from parfait source checker:
Error: Read buffer overflow at src/atimach64render.c:601
in function 'Mach64PrepareTexture' [Symbolic analysis]
In array dereference of Mach64TexFormats[i] with index 'i'
Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
Error: Read buffer overflow at src/atimach64render.c:712
in function 'Mach64PrepareComposite' [Symbolic analysis]
In array dereference of Mach64TexFormats[i] with index 'i'
Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/atimach64render.c b/src/atimach64render.c
index dda3938..1e9485e 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -598,6 +598,9 @@ Mach64PrepareTexture(PicturePtr pPict, PixmapPtr pPix)
if (Mach64TexFormats[i].pictFormat == pPict->format)
break;
}
+ if (i == MACH64_NR_TEX_FORMATS)
+ MACH64_FALLBACK(("Unsupported picture format 0x%x\n",
+ (int)pPict->format));
texFormat = Mach64TexFormats[i].texFormat;
/* Prepare picture size */
@@ -709,6 +712,9 @@ Mach64PrepareComposite
if (Mach64TexFormats[i].pictFormat == pDstPicture->format)
break;
}
+ if (i == MACH64_NR_TEX_FORMATS)
+ MACH64_FALLBACK(("Unsupported picture format 0x%x\n",
+ (int)pPict->format));
dstFormat = Mach64TexFormats[i].dstFormat;
m3d->dp_pix_width = SetBits(dstFormat, DP_DST_PIX_WIDTH) |
commit 9576c68245509f484501a54d949fea9496620f7a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:12:22 2009 +0200
Bring back the patching system
that was removed in commit 0c7e358f9879d06c24704ee5f0f6f010106d1b23.
diff --git a/debian/changelog b/debian/changelog
index ceaf1f3..80b58b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
* Move -dbg package to section debug.
* Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
choose drivers.
- + Disable patch system and remove quilt from build-depends
* Add README.source, bump Standards-Version to 3.8.2.
-- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:10:19 +0200
diff --git a/debian/control b/debian/control
index d784333..3621ec8 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
x11proto-render-dev,
libdrm-dev (>> 2.2) [!hurd-i386],
x11proto-xf86dri-dev,
+ quilt,
dpkg-dev (>= 1.14.17),
automake,
libtool,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index dae3db7..7794d15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-configure:
+configure: $(STAMP_DIR)/patch
autoreconf -vfi
obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
@@ -48,7 +48,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
>$@
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
commit b5c7e075749e00f304a47abc79bc81b7c474a68d
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Aug 1 01:10:53 2009 +0200
Bump Standards-Version to 3.8.2 now that we have README.source
diff --git a/debian/changelog b/debian/changelog
index fcc3b6a..ceaf1f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-mach64 (6.8.1-1) UNRELEASED; urgency=low
* Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to
choose drivers.
+ Disable patch system and remove quilt from build-depends
+ * Add README.source, bump Standards-Version to 3.8.2.
- -- Brice Goglin <bgoglin@debian.org> Thu, 30 Apr 2009 07:02:27 +0200
+ -- Brice Goglin <bgoglin@debian.org> Sat, 01 Aug 2009 01:10:19 +0200
xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 61bf843..d784333 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mach64
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
Reply to: