--- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/ChangeLog +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/ChangeLog @@ -1,3 +1,83 @@ +commit 810572536e153ac9e4615a35e2ab99dc266806da +Author: Dave Airlie +Date: Sat Nov 15 11:29:54 2014 +1000 + + mach64: fix build probably not required with pci access anyways + +commit e538ff6b2108117a7ae6644a844c6ce10fc0f1ee +Author: Connor Behan +Date: Wed Nov 27 23:53:31 2013 -0800 + + Drop dependence on xf86PciInfo.h + + It is about time we stop using this deprecated file and include pciids + locally. + + Signed-off-by: Connor Behan + Reviewed-by: Alex Deucher + +commit 2c83b465b336a012f2d2716940bf483358388000 +Author: Matthieu Herrb +Date: Mon Jun 3 13:01:23 2013 -0400 + + Deal with pPict->pDrawable == NULL for source-only pictures. + + Falling back to software rendering for such source pictures + (solid/gradient). + + Signed-off-by: Matthieu Herrb + Reviewed-by: Alex Deucher + +commit ec6ee6a112dc38cab563779583944dba9393f385 +Author: Adam Jackson +Date: Wed Apr 3 09:14:54 2013 -0400 + + Bump minimum xserver to 1.4 + + Due to the previous change we no longer support servers where ddc is not + a server builtin. + + Signed-off-by: Adam Jackson + +commit fa18180cc5f6d84168ffca6b7b8e467a5c72da14 +Author: Adam Jackson +Date: Tue Apr 2 11:15:47 2013 -0400 + + preinit: Don't bother explicitly loading int10, vbe will do it for us + + Signed-off-by: Adam Jackson + +commit 80e62cc1dfb80c3170e43c3941b56d0a84bddc3b +Author: Alan Coopersmith +Date: Wed Dec 19 22:37:07 2012 -0800 + + Remove unused atiaudio.c & ATIAudioNames declaration + + Defined a string array, which is not used anywhere. + + atiaudio.h remains for now, though for the enum it defines, only one + reference to it remains, initializing the Audio to ATI_AUDIO_NONE, so + it may be a candidate for further cleanup in the future. + + Reported by Solaris linker -z guidance option: + ld: guidance: removal of unused file recommended: atiaudio.o + + Signed-off-by: Alan Coopersmith + +commit 233270a78d41d9df5614e17d73c8c4add391459b +Author: Alan Coopersmith +Date: Wed Dec 19 22:33:48 2012 -0800 + + Remove unused atidecoder.c & atidecoder.h + + Defined a enum & string array, neither of which were used anywhere. + + Reported by Solaris linker -z guidance option: + ld: guidance: removal of unused file recommended: atidecoder.o + + Signed-off-by: Alan Coopersmith + Reviewed-by: Alex Deucher + commit 0d8639f3cd4128ae856ae27f3787c1da224bb564 Author: Alan Coopersmith Date: Wed Dec 19 22:14:08 2012 -0800 --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/autogen.sh +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/autogen.sh @@ -0,0 +1,12 @@ +#! /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 "$@" --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/configure.ac +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/configure.ac @@ -71,7 +71,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 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") --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/README.source +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +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 using 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. --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/changelog +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/changelog @@ -0,0 +1,574 @@ +xserver-xorg-video-mach64-lts-vivid (6.9.4-2ubuntu1~trusty1) trusty; urgency=medium + + * Backport for lts-vivid stack. + + -- Timo Aaltonen Wed, 13 May 2015 14:24:16 +0300 + +xserver-xorg-video-mach64 (6.9.4-2ubuntu1) vivid; urgency=medium + + * Release with build fixes from mach64.git to build against xserver-1.17.git. + + -- Maarten Lankhorst Thu, 12 Mar 2015 09:45:36 +0100 + +xserver-xorg-video-mach64 (6.9.4-2) unstable; urgency=medium + + * Deal with pPict->pDrawable == NULL for source-only pictures [cherry-picked + from upstream git]. Closes: #726585. + + -- Julien Cristau Sun, 13 Jul 2014 14:33:34 +0200 + +xserver-xorg-video-mach64 (6.9.4-1) unstable; urgency=low + + [ Maarten Lankhorst ] + * New upstream release. + * Bump Standards-Version to 3.9.3 + + [ Michele Cane ] + * New upstream release. + * Bump Standards-Version to 3.9.4, no changes needed. + * Disable silent build rules. + + -- Julien Cristau Mon, 16 Sep 2013 22:19:06 +0200 + +xserver-xorg-video-mach64 (6.9.1-2) unstable; urgency=low + + * Drop usr/share/man from dh_install, there's no manpage to ship for + this driver. + + -- Cyril Brulebois Tue, 01 May 2012 14:41:22 +0200 + +xserver-xorg-video-mach64 (6.9.1-1) unstable; urgency=low + + * New upstream release. + + -- Cyril Brulebois Mon, 02 Apr 2012 02:27:58 +0000 + +xserver-xorg-video-mach64 (6.9.0-1+exp1) experimental; urgency=low + + * Build against Xserver 1.12 RC1. + + -- Cyril Brulebois Sun, 01 Jan 2012 05:04:24 +0100 + +xserver-xorg-video-mach64 (6.9.0-1) unstable; urgency=low + + [ Cyril Brulebois ] + * Get rid of debian/NEWS, things from 2007/2008 are old now. This fixes + the epoch mismatch and NEWS prompting on every upgrade, thanks to + Jonathan Nieder for the notice (Closes: #615522). + * Add ${misc:Depends} to Depends for the debug package. + * Bump Standards-Version to 3.9.2 (no changes needed). + + [ Julien Cristau ] + * New upstream release, integrates fix for 1.10 compatibility. + + -- Cyril Brulebois Tue, 03 May 2011 17:13:20 +0200 + +xserver-xorg-video-mach64 (6.8.2-5+exp2) experimental; urgency=low + + * Rebuild against Xserver 1.10 rc3. + + -- Cyril Brulebois Fri, 25 Feb 2011 15:38:31 +0100 + +xserver-xorg-video-mach64 (6.8.2-5+exp1) experimental; urgency=low + + * Rebuild against Xserver 1.10 rc2. + * Cherry-pick from upstream to build against 1.10: + - mach64: fix the pixmap private API change. + + -- Cyril Brulebois Sun, 20 Feb 2011 14:12:20 +0100 + +xserver-xorg-video-mach64 (6.8.2-5) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + - Specify usr/share/man in .install, remove .manpages accordingly. + * Remove xsfbs accordingly. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:51:19 +0100 + +xserver-xorg-video-mach64 (6.8.2-4) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + * Add myself to Uploaders. + + -- Cyril Brulebois Sat, 16 Oct 2010 18:55:23 +0200 + +xserver-xorg-video-mach64 (6.8.2-3) unstable; urgency=medium + + * Drop obsolete build-dep on xf86miscproto. + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Update xsfbs and use new ${xviddriver:Depends} substvar. + + -- Julien Cristau Sat, 15 May 2010 11:50:16 +0200 + +xserver-xorg-video-mach64 (6.8.2-2) experimental; urgency=low + + [ Timo Aaltonen ] + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 02:54:30 +0100 + +xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low + + * New upstream release. + * Move -dbg package to section debug. + * 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 Sat, 01 Aug 2009 01:17:03 +0200 + +xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low + + * Upload to unstable. + + -- Brice Goglin Thu, 09 Apr 2009 13:33:03 +0200 + +xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-1) experimental; urgency=low + + * New upstream snapshot, up to commit d394e0b8. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + * Build against xserver 1.6 rc1. + + -- Brice Goglin Sun, 01 Feb 2009 16:50:21 +0100 + +xserver-xorg-video-mach64 (6.8.0-3) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Thu, 04 Sep 2008 20:42:00 +0200 + +xserver-xorg-video-mach64 (6.8.0-2) experimental; urgency=low + + * Build against xserver 1.5 rc5. + + -- Brice Goglin Mon, 21 Jul 2008 01:59:38 +0200 + +xserver-xorg-video-mach64 (6.8.0-1) unstable; urgency=low + + * New upstream release. + * Drop the useless epoch for the first upload to unstable. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + Build-depend on dpkg-dev >= 1.14.17. + + -- Brice Goglin Fri, 13 Jun 2008 00:42:10 +0200 + +xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-3) experimental; urgency=low + + * Add Conflicts with xserver-xorg-video-ati (<= 1:6.8.0-1) to ease switching + between unstable and experimental for now, closes: #469541. + + -- Brice Goglin Mon, 10 Mar 2008 23:59:52 +0100 + +xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-2) experimental; urgency=low + + * Fix Replaces, thanks Michael Biebl, closes: #469142. + + -- Brice Goglin Mon, 03 Mar 2008 18:21:05 +0100 + +xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-1) experimental; urgency=low + + * New upstream snapshot after the split of xf86-video-mach64 out of + xf86-video-ati. + + Replaces xserver-xorg-driver-ati (<= 1:6.8.0-1). + + Drop obsolete conflicts/replaces. + + Update 01_gen_pci_ids.diff to use all MACH64 entries from + /usr/include/xorg/xf86PciInfo.h. + + Add a NEWS entry about the need to change Driver ati into mach64. + * Bump Standards-Version: to 3.7.3, no change needed. + * Remove XS- prefix to Vcs-Browser and Vcs-Git fields. + + -- Brice Goglin Sun, 02 Mar 2008 12:55:35 +0100 + +xserver-xorg-video-ati (1:6.8.0-1) unstable; urgency=low + + * New upstream release. + + Bring back to life planar-to-packed conversion for rs4xx, + closes: #448577. + + -- Brice Goglin Tue, 19 Feb 2008 08:24:35 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080203.f65e8dfa-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to f65e8dfa. + + Reverts "Default to 1x again with non-v3 AGP cards", closes: #457767. + + -- Brice Goglin Sun, 03 Feb 2008 10:49:43 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080117.6bd510a2-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 6bd510a2. + + -- Brice Goglin Thu, 17 Jan 2008 10:54:03 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080109.10e7636c-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 10e7636c. + + -- Brice Goglin Wed, 09 Jan 2008 23:43:53 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080102.30cab1db-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 30cab1db. + + -- Brice Goglin Wed, 02 Jan 2008 22:04:12 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080101.f65374f5-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to f65374f5. + + -- Brice Goglin Tue, 01 Jan 2008 11:37:58 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20071223.ad3325f6-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to ad3325f6. + + Add IgnoreLidStatus option to enable lid even when closed, + closes: #457612, #457516. + + Fix PLL input setup on mac cards, closes: #457563. + + -- Brice Goglin Sun, 23 Dec 2007 23:24:43 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20071221.be7f8fd3-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to be7f8fd3. + + New atombios based support for r500 and r600 boards. + + Zaphod mode is back, reimplemented on top of RandR 1.2. + + -- Brice Goglin Fri, 21 Dec 2007 08:39:57 +0100 + +xserver-xorg-video-ati (1:6.7.197-1) unstable; urgency=low + + * New upstream release candidate. + * Upload to unstable since this release candidate is supposed + to be much better than the old 1:6.6.193-3. + * Add a NEWS entry pointing to some RandR 1.2 documentation. + + -- Brice Goglin Fri, 21 Dec 2007 08:11:07 +0100 + +xserver-xorg-video-ati (1:6.7.197~git20071219.ce4fa1ce-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to ce4fa1ce. + + Default to 1x again with non-v3 AGP cards, closes: #444049. + + -- Brice Goglin Wed, 19 Dec 2007 08:44:33 +0100 + +xserver-xorg-video-ati (1:6.7.196-2) experimental; urgency=low + + * New upstream snapshot, containing commits up to 5022d006. + + Fix the washed out color, closes: #440174. + + Update 01_gen_pci_ids.diff to use the new ati_pciids_gen.h. + + -- Brice Goglin Mon, 03 Dec 2007 21:26:02 +0100 + +xserver-xorg-video-ati (1:6.7.196-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Mon, 12 Nov 2007 08:38:43 +0100 + +xserver-xorg-video-ati (1:6.7.195-2) experimental; urgency=low + + * New upstream snapshot, + based on commit ddec5783103045084a66a34d71326cc6e4a3f598 + + Fixes some LVDS issues, closes: #445746. + + -- Brice Goglin Tue, 09 Oct 2007 18:27:22 +0200 + +xserver-xorg-video-ati (1:6.7.195-1) experimental; urgency=low + + * New upstream release candidate. + + -- Julien Cristau Sat, 06 Oct 2007 02:56:56 +0200 + +xserver-xorg-video-ati (1:6.7.194-1) experimental; urgency=low + + * New upstream release candidate. + + Add MacModel "mini" option to support Mac Mini connector table, + closes: #443570. + + Fix crash when Xv window is outside of either crtc, + closes: #441902. + + -- Brice Goglin Mon, 24 Sep 2007 07:59:36 +0200 + +xserver-xorg-video-ati (1:6.7.193-1) experimental; urgency=low + + * New upstream release candidate. + + Fix distortion after lid close/reopen, closes: #435114. + + Stop wrongly detecting the TV-output as connected, closes: #439322. + + Fix outputs after VT switch, closes: #443151. + + -- Brice Goglin Thu, 20 Sep 2007 07:34:02 +0200 + +xserver-xorg-video-ati (1:6.7.192-4) experimental; urgency=low + + * Really build against xserver 2:1.4. + * Pull upstream commits up to 2d78e2b6f36c21812b15eea0f1c7004e748fd5ab. + + -- Brice Goglin Thu, 13 Sep 2007 22:35:56 +0200 + +xserver-xorg-video-ati (1:6.7.192-3) experimental; urgency=low + + * Build against xserver 2:1.4-1. + + -- Brice Goglin Fri, 07 Sep 2007 17:52:57 +0200 + +xserver-xorg-video-ati (1:6.7.192-2) experimental; urgency=low + + * Build against xserver 1.3.99.2. + + -- Brice Goglin Tue, 04 Sep 2007 19:12:45 +0200 + +xserver-xorg-video-ati (1:6.7.192-1) experimental; urgency=low + + * New upstream release candidate. + + UseFBDev option removed, closes: #372920. + + Monitor detection fixed, closes: #413500. + + -- Brice Goglin Mon, 27 Aug 2007 08:26:38 +0200 + +xserver-xorg-video-ati (1:6.7.191-1) experimental; urgency=low + + * New upstream release candidate. + + TV-output support, closes: #332410, #360186, #378594, #435691. + + Bump x11proto-randr-dev build-dependency to >= 1.2 for RandR-1.2 + support. + + -- Brice Goglin Thu, 23 Aug 2007 08:15:03 +0200 + +xserver-xorg-video-ati (1:6.6.193-2) experimental; urgency=low + + * Build against xserver 1.3.99.0. + * Add 01_gen_pci_ids.diff. This patch adds a list of pci id's that the + driver supports so that the server can automatically load it. + * Use ${binary:Version} instead of ${Source-Version}. + + -- Brice Goglin Mon, 20 Aug 2007 19:49:33 +0200 + +xserver-xorg-video-ati (1:6.6.193-1) experimental; urgency=low + + [ Brice Goglin ] + * New upstream release candidate. + + Add references to radeon and r128 manpages in SEE ALSO + in the ati(4) manpage (closes: #386001). + + Fix typo in "specifying" in the radeon(4) manpage + (closes: #432059). + + Fully zero-initialize info->CRT2pScrn->monitor (closes: #422777). + + Avoid crash in MACH64 Xv code (closes: #320828). + + Drop 01_ati_r128_update_chip_identification.diff since + this information is redundant and does not matter anyway + since the driver auto-detects how the card is connected + to the system. + + Drop 02_radeon_manpage.diff, merged upstream. + + [ Julien Cristau ] + * Add upstream URL to debian/copyright. Thanks, Loïc Minier. + + -- Brice Goglin Sat, 4 Aug 2007 15:14:49 +0200 + +xserver-xorg-video-ati (1:6.6.192-1) experimental; urgency=low + + [ Brice Goglin ] + * Build a xserver-xorg-video-ati-dbg package with debugging symbols. + * Fix Provides: xf86-video-driver-atimisc to match Replaces: and + Conflicts: xserver-xorg-video-atimisc. + Thanks to Eric Lavarde (closes: #372312). + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-ati + module in the long description (closes: #425321). + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-ati. + + [ Julien Cristau ] + * New upstream release candidate + * Refresh patch 02_radeon_manpage.diff. + + -- Julien Cristau Mon, 21 May 2007 01:28:33 +0200 + +xserver-xorg-video-ati (1:6.6.191-1) experimental; urgency=low + + [ Brice Goglin ] + * New upstream release candidate. + * autoreconf. + + [ Julien Cristau ] + * Drop Fabio and Branden from Uploaders, with their permission. Hopefully + they'll come back when they have more time! + + -- Julien Cristau Wed, 28 Mar 2007 14:26:43 +0200 + +xserver-xorg-video-ati (1:6.6.3-5) experimental; urgency=low + + * Bump build-dep on libdrm-dev to >= 2.2 to fix FTBFS (closes: #413100). + Thanks, Frank Lichtenheld! + * Add patch 02_radeon_manpage.diff to replace non-ascii character with the + corresponding groff escape sequence in the radeon manpage. + + -- Julien Cristau Fri, 2 Mar 2007 22:44:03 +0100 + +xserver-xorg-video-ati (1:6.6.3-4) experimental; urgency=low + + * Generate server dependencies automatically from the ABI + * Merge changes from upstream pre-release + * Remove obsolete 02_radeon_memmap_fbdev.diff + + -- David Nusinow Wed, 21 Feb 2007 22:54:17 -0500 + +xserver-xorg-video-ati (1:6.6.3-3) UNRELEASED; urgency=low + + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + -- Julien Cristau Tue, 7 Nov 2006 07:30:39 +0100 + +xserver-xorg-video-ati (1:6.6.3-2) unstable; urgency=low + + * Add 02_radeon_memmap_fbdev.diff. This should fix breakage when using + fbdev. Thanks Michel Dänzer. Closes: #369167 + * Don't require libdrm-dev on hurd-i386. Thanks Michael Banck. + Closes: #392876 + + -- David Nusinow Sat, 14 Oct 2006 14:30:22 -0400 + +xserver-xorg-video-ati (1:6.6.3-1) unstable; urgency=low + + * New upstream release + + -- David Nusinow Fri, 13 Oct 2006 14:02:45 -0400 + +xserver-xorg-video-ati (1:6.6.2-2) unstable; urgency=low + + [ Drew Parsons ] + * Include upstream ChangeLog. Closes: #365104. + * Upload to unstable (X11R7.1 transition). + + -- David Nusinow Mon, 18 Sep 2006 19:57:28 -0400 + +xserver-xorg-video-ati (1:6.6.2-1) experimental; urgency=low + + * New upstream version. Happy birthday. + * Use debhelper 5. + * Standards version 3.7.2. + * Add reference to /usr/share/common-licenses/GPL to debian/copyright. + * Use dh_installman to install man pages. + * Exclude .la files from dh_install. + + -- Drew Parsons Thu, 31 Aug 2006 21:36:05 +1000 + +xserver-xorg-video-ati (1:6.6.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:26 +0000 + +xserver-xorg-video-ati (1:6.6.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Sun, 6 Aug 2006 20:15:19 +0000 + +xserver-xorg-video-ati (1:6.5.8.0-1) unstable; urgency=low + + * New upstream release + * Use dh_install with --list-missing + * Add build-dep on quilt + * Remove obsolete 02_ppc_fix.diff. Now incorporated upstream. + + -- David Nusinow Tue, 25 Apr 2006 22:11:48 -0400 + +xserver-xorg-video-ati (1:6.5.7.3-3) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:26 -0500 + +xserver-xorg-video-ati (1:6.5.7.3-2) experimental; urgency=low + + * Port patches from trunk + + general/043_ati_r128_update_chip_identification.diff + * Apply ppc-fix.patch and incorporate it in to our patch system instead of + just having it sit in the debian directory + + -- David Nusinow Sun, 26 Feb 2006 17:46:59 -0500 + +xserver-xorg-video-ati (1:6.5.7.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:35:49 -0500 + +xserver-xorg-driver-ati (1:6.5.7.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Also install Rage Theatre multimedia modules. + + -- Daniel Stone Wed, 4 Jan 2006 17:21:27 +1100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu3) dapper; urgency=low + + * Add missing Build-Depends (x11proto-fonts-dev, x11proto-randr-dev, + x11proto-render-dev, libdrm (>> 1.0.5), x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 14:52:47 +1100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu2) dapper; urgency=low + + * Apply patch from https://bugs.freedesktop.org/attachment.cgi?id=3620 to + fix hard crash on powerpc. The patch is also stored in + debian/ppc-fix.patch. + NOTE: according to benh the patch still needs some extra polishing. + + -- Fabio M. Di Nitto Fri, 25 Nov 2005 11:34:33 +0100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:25:16 +1100 + +xserver-xorg-driver-ati (1:6.5.6.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 18:01:13 +1000 + +xserver-xorg-driver-ati (1:6.5.6-1) breezy; urgency=low + + * First xserver-xorg-driver-ati release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/compat +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/control +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/control @@ -0,0 +1,64 @@ +Source: xserver-xorg-video-mach64-lts-vivid +Section: x11 +Priority: optional +XSBC-Orig-Maintainer: Debian X Strike Force +Maintainer: Ubuntu X-SWAT +Uploaders: Drew Parsons , Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, + xserver-xorg-dev-lts-vivid (>= 2:1.16.99.901), + x11proto-gl-dev, + x11proto-xext-dev, + x11proto-core-dev, + x11proto-video-dev, + x11proto-xinerama-dev, + libgl1-mesa-dev-lts-vivid | libgl-dev, + x11proto-fonts-dev, + x11proto-randr-dev (>= 1.2), + x11proto-render-dev, + libdrm-dev (>> 2.2) [!hurd-i386], + x11proto-xf86dri-dev, + quilt, + xutils-dev +Standards-Version: 3.9.4 +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 + +Package: xserver-xorg-video-mach64-lts-vivid +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + xserver-xorg-video-mach64, xorg-renamed-package, xorg-renamed-package-lts-vivid, + ${xviddriver:Provides} +Description: X.Org X server -- ATI Mach64 display driver + This driver for the X.Org X server (see xserver-xorg for a further description) + provides support for the ATI Mach64 series. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-mach64 driver module. +Replaces: xserver-xorg-video-mach64 +Conflicts: xserver-xorg-video-mach64, xorg-renamed-package-lts-utopic, + +Package: xserver-xorg-video-mach64-lts-vivid-dbg +Architecture: any +Depends: + xserver-xorg-video-mach64-lts-vivid (= ${binary:Version}), + ${misc:Depends}, +Section: debug +Priority: extra +Description: X.Org X server -- ATI display driver (debugging symbols) + This driver for the X.Org X server (see xserver-xorg for a further description) + provides support for the ATI Mach64 series. + . + This package provides debugging symbols for the Xorg X server ATI Mach64 + display driver. +Replaces: xserver-xorg-video-mach64-dbg +Provides: xserver-xorg-video-mach64-dbg, xorg-renamed-package, xorg-renamed-package-lts-vivid +Conflicts: xserver-xorg-video-mach64-dbg, xorg-renamed-package-lts-utopic, --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/copyright +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/copyright @@ -0,0 +1,108 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + +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. + +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. + +************************************************************************* + +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. --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/patches/series +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/patches/series @@ -0,0 +1 @@ + --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/rules +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/rules @@ -0,0 +1,24 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- --disable-silent-rules + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# Debug package: +override_dh_strip: + dh_strip --dbg-package=xserver-xorg-video-mach64-lts-vivid-dbg + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/watch +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-mach64 +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-mach64-(.*)\.tar\.gz --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/xserver-xorg-video-mach64-lts-vivid.install +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/xserver-xorg-video-mach64-lts-vivid.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/*.so --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/debian/xserver-xorg-video-mach64-lts-vivid.links +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/debian/xserver-xorg-video-mach64-lts-vivid.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-mach64-lts-vivid/script --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/src/Makefile.am +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/src/Makefile.am @@ -49,8 +49,8 @@ mach64_drv_ladir = @moduledir@/drivers mach64_drv_la_SOURCES = \ atibus.c atichip.c atiprobe.c atividmem.c \ - atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \ - atidac.c atidecoder.c atidsp.c atii2c.c \ + atiadjust.c aticlock.c aticonfig.c aticonsole.c \ + atidac.c atidsp.c atii2c.c \ atilock.c atimach64.c atimach64accel.c atimach64cursor.c \ atimach64i2c.c atimach64io.c atimach64xv.c atimode.c atipreinit.c \ atiprint.c atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c \ @@ -70,7 +70,6 @@ aticrtc.h \ aticursor.h \ atidac.h \ - atidecoder.h \ atidga.h \ atidri.h \ atidripriv.h \ --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/src/atiaudio.h +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/src/atiaudio.h @@ -46,6 +46,4 @@ ATI_AUDIO_NONE } ATIAudioType; -extern const char *ATIAudioNames[]; - #endif /* ___ATIAUDIO_H___ */ --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/src/atimach64probe.c +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/src/atimach64probe.c @@ -38,7 +38,42 @@ #include "atiadjust.h" #include "ativalid.h" -#include "xf86PciInfo.h" +/* Chip definitions */ +#define PCI_VENDOR_ATI 0x1002 +#define PCI_CHIP_MACH64CT 0x4354 +#define PCI_CHIP_MACH64CX 0x4358 +#define PCI_CHIP_MACH64ET 0x4554 +#define PCI_CHIP_MACH64GB 0x4742 +#define PCI_CHIP_MACH64GD 0x4744 +#define PCI_CHIP_MACH64GI 0x4749 +#define PCI_CHIP_MACH64GL 0x474C +#define PCI_CHIP_MACH64GM 0x474D +#define PCI_CHIP_MACH64GN 0x474E +#define PCI_CHIP_MACH64GO 0x474F +#define PCI_CHIP_MACH64GP 0x4750 +#define PCI_CHIP_MACH64GQ 0x4751 +#define PCI_CHIP_MACH64GR 0x4752 +#define PCI_CHIP_MACH64GS 0x4753 +#define PCI_CHIP_MACH64GT 0x4754 +#define PCI_CHIP_MACH64GU 0x4755 +#define PCI_CHIP_MACH64GV 0x4756 +#define PCI_CHIP_MACH64GW 0x4757 +#define PCI_CHIP_MACH64GX 0x4758 +#define PCI_CHIP_MACH64GY 0x4759 +#define PCI_CHIP_MACH64GZ 0x475A +#define PCI_CHIP_MACH64LB 0x4C42 +#define PCI_CHIP_MACH64LD 0x4C44 +#define PCI_CHIP_MACH64LG 0x4C47 +#define PCI_CHIP_MACH64LI 0x4C49 +#define PCI_CHIP_MACH64LM 0x4C4D +#define PCI_CHIP_MACH64LN 0x4C4E +#define PCI_CHIP_MACH64LP 0x4C50 +#define PCI_CHIP_MACH64LQ 0x4C51 +#define PCI_CHIP_MACH64LR 0x4C52 +#define PCI_CHIP_MACH64LS 0x4C53 +#define PCI_CHIP_MACH64VT 0x5654 +#define PCI_CHIP_MACH64VU 0x5655 +#define PCI_CHIP_MACH64VV 0x5656 #ifndef XSERVER_LIBPCIACCESS static Bool Mach64Probe(DriverPtr pDriver, int flags); --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/src/atimach64render.c +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/src/atimach64render.c @@ -339,10 +339,13 @@ static Bool Mach64CheckTexture(PicturePtr pPict) { - int w = pPict->pDrawable->width; - int h = pPict->pDrawable->height; + int h,w; int l2w, l2h, level, i; + if (pPict->pDrawable == NULL) + return FALSE; + w = pPict->pDrawable->width; + h = pPict->pDrawable->height; for (i = 0; i < MACH64_NR_TEX_FORMATS; i++) { if (Mach64TexFormats[i].pictFormat == pPict->format) break; --- xserver-xorg-video-mach64-lts-vivid-6.9.4.orig/src/atipreinit.c +++ xserver-xorg-video-mach64-lts-vivid-6.9.4/src/atipreinit.c @@ -531,9 +531,8 @@ #ifndef AVOID_CPIO - xf86Int10InfoPtr pInt10Info = NULL; vbeInfoPtr pVBE = NULL; - pointer pInt10Module, pDDCModule = NULL, pVBEModule = NULL; + pointer pVBEModule = NULL; #endif /* AVOID_CPIO */ @@ -657,42 +656,21 @@ #endif /* TV_OUT */ /* - * If there is an ix86-style BIOS, ensure its initialisation entry point - * has been executed, and retrieve DDC and VBE information from it. + * If VBE setup works, grab DDC from it */ - if (!(pInt10Module = xf86LoadSubModule(pScreenInfo, "int10"))) - { - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "Unable to load int10 module.\n"); - } - else if (!(pInt10Info = xf86InitInt10(pATI->iEntity))) - { - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "Unable to initialise int10 interface.\n"); + if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, "vbe"))) { + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, + "Unable to load vbe module.\n"); } else { - if (!(pDDCModule = xf86LoadSubModule(pScreenInfo, "ddc"))) - { - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "Unable to load ddc module.\n"); - } - else - if (!(pVBEModule = xf86LoadSubModule(pScreenInfo, "vbe"))) - { - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "Unable to load vbe module.\n"); - } - else - { - if ((pVBE = VBEInit(pInt10Info, pATI->iEntity))) - { - ConfiguredMonitor = vbeDoEDID(pVBE, pDDCModule); - } - } + if ((pVBE = VBEInit(NULL, pATI->iEntity))) + ConfiguredMonitor = vbeDoEDID(pVBE, NULL); - if (!(flags & PROBE_DETECT)) + if (pVBE && !(flags & PROBE_DETECT)) { + xf86Int10InfoPtr pInt10Info = pVBE->pInt10; + /* Validate, then make a private copy of, the initialised BIOS */ CARD8 *pBIOS = xf86int10Addr(pInt10Info, pInt10Info->BIOSseg << 4); @@ -715,15 +693,9 @@ /* De-activate VBE */ vbeFree(pVBE); xf86UnloadSubModule(pVBEModule); - - /* De-activate int10 */ - xf86FreeInt10(pInt10Info); - xf86UnloadSubModule(pInt10Module); #else - pATI->pInt10 = pInt10Info; pATI->pVBE = pVBE; pVBE = NULL; - pInt10Info = NULL; #endif /* TV_OUT */ if (ConfiguredMonitor && !(flags & PROBE_DETECT)) @@ -732,9 +704,6 @@ xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor); } - /* DDC module is no longer needed at this point */ - xf86UnloadSubModule(pDDCModule); - #endif /* AVOID_CPIO */ if (flags & PROBE_DETECT) @@ -1110,12 +1079,14 @@ } } +#ifndef XSERVER_LIBPCIACCESS if (!xf86LinearVidMem()) { xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR, "A linear aperture is not available.\n"); goto bail; } +#endif /* * Set colour weights.