diff -Nru xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/ChangeLog xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/ChangeLog --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/ChangeLog 2009-07-10 20:22:54.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/ChangeLog 2009-08-13 20:17:43.000000000 +0100 @@ -1,9 +1,82 @@ -commit 5d6043e3b3b337a0f288f88f6864129bbbc404fb -Merge: 75ce408 5bc38f7 +commit c8b254071b48fc2374725e1fb0fcd13558d1aa9d +Merge: 36ab23a 2347c3e Author: Tormod Volden -Date: Fri Jul 10 21:22:40 2009 +0200 +Date: Thu Aug 13 21:17:30 2009 +0200 - Merge commit 'origin/debian-experimental' into autoxorggit + Merge commit 'origin/debian-unstable' into autoxorggit + +commit 36ab23a95fd8d46a1206a941278df8845d5765ba +Author: Dave Airlie +Date: Thu Jul 30 12:04:29 2009 +1000 + + savage: bump for release 2.3.1 + +commit ad0b7ba4618c09c1a9d5a6da6b12f42980b7450c +Author: Dave Airlie +Date: Tue Jul 28 18:40:18 2009 +1000 + + savage: move abi check down for RAC + +commit 21f6bf3e492d328b8c7003ffb0c9deec0113fb05 +Author: Dave Airlie +Date: Tue Jul 28 15:22:41 2009 +1000 + + savage: change to using ABI version check + +commit 3c0b164ffe9e1f582cee43f89a94fc0a2899bed8 +Author: Dave Airlie +Date: Tue Jul 28 13:32:36 2009 +1000 + + savage: update for resources/RAC API removal + +commit 2347c3e039bbbbffdb93739616279f7a4d44a2a6 +Author: Brice Goglin +Date: Sun Jul 19 22:21:39 2009 +0200 + + Prepare changelog for upload + +commit 1579cd7cb9872b96630bcffc590eea344dd0b7b1 +Author: Brice Goglin +Date: Sun Jul 19 22:28:15 2009 +0200 + + Remove 01_gen_pci_ids.diff + +commit ccb3c05dc4bc9afcd1b47538180420fd88c5fba4 +Author: Brice Goglin +Date: Sun Jul 19 22:18:24 2009 +0200 + + Adding README.source means we can bump Standards-Version + +commit 4510a6cdcc134ed1280db013e60d741fbdb56b48 +Merge: ee675ff 8f72294 +Author: Brice Goglin +Date: Sun Jul 19 22:14:06 2009 +0200 + + Merge branch 'debian-unstable' of git://git.debian.org/pkg-xorg/xsfbs into debian-unstable + +commit ee675ff795ad0e494749c34fcfd20b5e6e378637 +Author: Brice Goglin +Date: Sun Jul 19 22:11:49 2009 +0200 + + New upstream release + +commit 86d2b5ec0add609acd54c23b5658788310fb3aea +Merge: 48b75b8 75ce408 +Author: Brice Goglin +Date: Sun Jul 19 22:10:21 2009 +0200 + + Merge tag 'xf86-video-savage-2.3.0' into debian-unstable + +commit 96d19b654e934fc3f85f9b45f1dee224cb40b389 +Author: Peter Hutterer +Date: Thu Jul 16 11:54:48 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 commit 75ce40850ea2ce2ed7122cf62856dcf8022187d2 Author: Adam Jackson @@ -11,6 +84,15 @@ savage 2.3.0 +commit 8f72294ada477f003888b6776883c1dd98289f3f +Author: Julien Cristau +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 + commit a75f0eaba6cb907a6ca9e506858d41f9c6f66b8b Author: Adam Jackson Date: Thu May 28 15:16:22 2009 -0400 @@ -37,12 +119,73 @@ Under some conditions (documented in this patch), the UploadToScreen implementation can make use of the AGP scratch buffer used for XVideo as a convenient source for Mastered Image Transfer. The previous implementation is still available as a fallback for when AGP acceleration is not possible. This requires the AGP scratch buffer to be persistent, so the XVideo code is also made aware of an existing DRM mapping for the scratch buffer. +commit 7deebf983f53c505bc25171ab77fdc408f250a6e +Author: Julien Cristau +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. + +commit 4178d948cd66a938222d0d7c6353ee8d60229e40 +Author: David Nusinow +Date: Mon May 25 20:08:50 2009 -0400 + + Add README.source + +commit 48b75b8091b90346a5126161fcf0ee3dbad1bc3f +Author: Julien Cristau +Date: Thu Apr 9 11:25:44 2009 +0100 + + Upload to unstable. + +commit 41fe3d82d04db99e75f632e7088cbec67b6f2079 +Merge: fc2ea2f 11e7af4 +Author: Julien Cristau +Date: Thu Apr 9 11:24:03 2009 +0100 + + Merge branch 'debian-lenny' into debian-unstable + + Conflicts: + debian/changelog + +commit fc2ea2f55640a857417064ef094dda4da8668ff9 +Merge: 5bc38f7 fa6396d +Author: Julien Cristau +Date: Thu Apr 9 11:18:14 2009 +0100 + + Merge branch 'debian-unstable' of git.debian.org:/git/pkg-xorg/xsfbs into debian-unstable + commit 0f4369c95b6ef948743c9b244709e454b8b8ef7f Author: Alex Villacís Lasso Date: Sat Mar 14 21:34:48 2009 -0500 Fix crash by null pointer access when DRI is not available. +commit 11e7af431a8562e1413abd889ed5ea567aaf0ea9 +Author: Julien Cristau +Date: Fri Mar 20 21:37:40 2009 +0100 + + Prepare changelog for upload + +commit d4f9cf894a7baeea808017a1b5a08ef7427ddb7e +Author: Tormod Volden +Date: Thu Jan 22 01:22:53 2009 -0500 + + Savage: Do not add panel modes when there is no panel + + SavageGetPanelInfo will reset DisplayType if the panel is not + active, so check again before calling SavageAddPanelMode so that + bogus modes are not added. + + This fixes startup failures in some cases, for instance when there is no + real panel and EDID is missing. The bogus sync ranges (typically 0 Hz) + would also block the default sync ranges from being applied. + + Thanks to Peter Belew for testing. + https://bugs.launchpad.net/bugs/294899 + (cherry picked from commit 0fae48235841f05d7e52e61a2450835fdb8892b3) + commit 343b2f312b1e555f9d03a499ddbe4c9b33b3a6e5 Author: Chris Ball Date: Fri Feb 27 10:55:58 2009 -0500 @@ -53,6 +196,12 @@ Signed-off-by: Chris Ball +commit fa6396d6bf68b9a0154089146287245f9ad60a1e +Author: Julien Cristau +Date: Wed Feb 25 21:31:03 2009 +0100 + + xsfbs: repack.sh needs to be executable + commit 08692dd381dc6e98d484d5bffabcbd04ebf83df6 Author: Chris Ball Date: Tue Feb 24 12:54:13 2009 -0500 @@ -73,6 +222,14 @@ Signed-off-by: Chris Ball +commit 2ed171f9f390de4e97141c0016d3ba615e8c943e +Author: Julien Cristau +Date: Tue Feb 17 17:20:42 2009 +0100 + + xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so + + libx11's postinst was the only post-sarge user, and it's gone now. + commit 5bc38f7431e3ca420593bd72ee19efa1bf6eaf07 Author: Brice Goglin Date: Tue Feb 3 23:07:47 2009 +0100 diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/configure.ac /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/configure.ac --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/configure.ac 2009-07-10 20:22:39.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/configure.ac 2009-08-13 20:17:30.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-savage], - 2.3.0, + 2.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-savage) @@ -60,6 +60,10 @@ # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.1.0 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 -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/changelog /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/changelog --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/changelog 2009-08-13 20:24:10.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/changelog 2009-08-13 20:24:10.000000000 +0100 @@ -1,10 +1,26 @@ -xserver-xorg-video-savage (1:2.3.0~git20090710.75ce4085-0ubuntu0tormod) jaunty; urgency=low +xserver-xorg-video-savage (1:2.3.1~git20090813.36ab23a9-0ubuntu0tormod) jaunty; urgency=low - * Checkout from git 20090710 (master branch) up to commit - 75ce40850ea2ce2ed7122cf62856dcf8022187d2 - * Merge with origin/debian-experimental + * Checkout from git 20090813 (master branch) up to commit + 36ab23a95fd8d46a1206a941278df8845d5765ba + * Merge with origin/debian-unstable - -- Tormod Volden Fri, 10 Jul 2009 21:22:55 +0200 + -- Tormod Volden Thu, 13 Aug 2009 21:17:44 +0200 + +xserver-xorg-video-savage (1:2.3.0-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.8.2. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + -- Brice Goglin Sun, 19 Jul 2009 22:28:54 +0200 + +xserver-xorg-video-savage (1:2.2.1-5) unstable; urgency=low + + * Merge bugfix from 1:2.2.1-2.lenny1 stable update. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 11:25:40 +0100 xserver-xorg-video-savage (1:2.2.1-4) experimental; urgency=low @@ -22,6 +38,13 @@ -- Julien Cristau Mon, 08 Sep 2008 19:32:12 +0100 +xserver-xorg-video-savage (1:2.2.1-2.lenny1) stable; urgency=low + + * Cherry-pick from upstream: Do not add panel modes when there is no panel + (closes: #520547). Thanks, Tormod Volden! + + -- Julien Cristau Fri, 20 Mar 2009 21:35:43 +0100 + xserver-xorg-video-savage (1:2.2.1-2) unstable; urgency=low * Reenable 02_temporary_revert_pciaccess.diff and append all recent diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/control /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/control --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/control 2009-08-13 20:24:10.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/control 2009-08-13 20:24:10.000000000 +0100 @@ -23,7 +23,7 @@ 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-savage Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-savage.git diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/patches/01_gen_pci_ids.diff /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/patches/01_gen_pci_ids.diff --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/patches/01_gen_pci_ids.diff 2009-08-13 20:24:10.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/patches/01_gen_pci_ids.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -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 -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/patches/series /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/patches/series --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/patches/series 2009-08-13 20:24:10.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/patches/series 2009-08-13 20:24:10.000000000 +0100 @@ -1,2 +1 @@ -01_gen_pci_ids.diff 03_request_16bit_depth.diff diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/README.source /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/README.source --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/README.source 2009-08-13 20:24:10.000000000 +0100 @@ -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. + +When the upstream sources contain some DFSG-nonfree files, they are +listed in text files in debian/prune/ in the "debian-*" branch of +the Debian repository. XSFBS' scripts then take care of removing +these listed files during the build so as to generate a modified +DFSG-free .orig.tar.gz tarball. diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/xserver-xorg-video-savage.install /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/xserver-xorg-video-savage.install --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/xserver-xorg-video-savage.install 2009-08-13 20:24:10.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/xserver-xorg-video-savage.install 2009-08-13 20:24:10.000000000 +0100 @@ -1,3 +1,2 @@ usr/lib/xorg/modules/drivers/*.so usr/share/man/man4/* -usr/share/xserver-xorg/pci/* diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/xsfbs/xsfbs.sh /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/xsfbs/xsfbs.sh --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/debian/xsfbs/xsfbs.sh 2009-08-13 20:24:10.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/debian/xsfbs/xsfbs.sh 2009-08-13 20:24:10.000000000 +0100 @@ -57,8 +57,6 @@ exit $SHELL_LIB_USAGE_ERROR fi -ARCHITECTURE="$(dpkg --print-installation-architecture)" - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then RECONFIGURE="true" else @@ -305,16 +303,6 @@ 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 # @@ -719,72 +707,6 @@ fi } -register_x_lib_dir_with_ld_so () { - # syntax: register_x_lib_dir_with_ld_so - # - # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared - # libraries. - # - # Call this function from the postinst script of a package that places a - # shared library in /usr/X11R6/lib, before invoking ldconfig. - - local dir ldsoconf - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line not already present? - if ! fgrep -qsx "$dir" "$ldsoconf"; then - observe "adding $dir directory to $ldsoconf" - echo "$dir" >> "$ldsoconf" - fi -} - -deregister_x_lib_dir_with_ld_so () { - # syntax: deregister_x_lib_dir_with_ld_so - # - # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared - # libraries, if and only if no shared libaries remain there. - # - # Call this function from the postrm script of a package that places a shared - # library in /usr/X11R6/lib, in the event "$1" is "remove", and before - # invoking ldconfig. - - local dir ldsoconf fgrep_status cmp_status - - dir="/usr/X11R6/lib" - ldsoconf="/etc/ld.so.conf" - - # is the line present? - if fgrep -qsx "$dir" "$ldsoconf"; then - # are there any shared objects in the directory? - if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then - # glob expansion produced nothing, so no shared libraries are present - observe "removing $dir directory from $ldsoconf" - # rewrite the file (very carefully) - set +e - fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp" - fgrep_status=$? - set -e - case $fgrep_status in - 0|1) ;; # we don't actually care if any lines matched or not - *) die "error reading \"$ldsoconf\"; fgrep exited with status" \ - "$fgrep_status" ;; - esac - set +e - cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf" - cmp_status=$? - set -e - case $cmp_status in - 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical - 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ - *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \ - "cmp exited with status $cmp_status" ;; - esac - fi - fi -} - make_symlink_sane () { # syntax: make_symlink_sane symlink target # diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/.lastcommit /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/.lastcommit --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/.lastcommit 2009-07-10 20:22:40.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/.lastcommit 2009-08-13 20:17:30.000000000 +0100 @@ -1 +1 @@ -commit 75ce40850ea2ce2ed7122cf62856dcf8022187d2 +commit 36ab23a95fd8d46a1206a941278df8845d5765ba diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/src/savage_driver.c /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/src/savage_driver.c --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/src/savage_driver.c 2009-07-10 20:22:56.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/src/savage_driver.c 2009-08-13 20:17:45.000000000 +0100 @@ -42,12 +42,16 @@ #include #include -#include "xf86RAC.h" #include "shadowfb.h" #include "globals.h" +#ifdef HAVE_XEXTPROTO_71 +#include +#else #define DPMS_SERVER #include +#endif + #include "xf86xv.h" @@ -56,6 +60,10 @@ #include "savage_bci.h" #include "savage_streams.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 +#include "xf86RAC.h" +#endif + #define TRANSPARENCY_KEY 0xff; #ifdef XF86DRI @@ -675,7 +683,7 @@ } pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, - RES_SHARED_VGA, NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL, NULL); if (pScrn != NULL) { EntityInfoPtr pEnt; SavagePtr psav; @@ -1388,20 +1396,24 @@ } pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS if (pEnt->resources) { xfree(pEnt); SavageFreeRec(pScrn); return FALSE; } +#endif psav->EntityIndex = pEnt->index; if (xf86LoadSubModule(pScrn, "vbe")) { psav->pVbe = VBEInit(NULL, pEnt->index); } +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index, NULL, ResNone); xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif from = X_DEFAULT; if (pEnt->device->chipset && *pEnt->device->chipset) { diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/src/savage_driver.h /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/src/savage_driver.h --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/src/savage_driver.h 2009-07-10 20:22:39.000000000 +0100 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/src/savage_driver.h 2009-08-13 20:17:30.000000000 +0100 @@ -51,7 +51,9 @@ #include "compiler.h" #include "vgaHW.h" #include "xf86.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" +#endif #include "xf86Pci.h" #include "xf86PciInfo.h" #include "xf86_OSproc.h" diff -Nru /tmp/TfOhOGIsRy/xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/src/savage_hwmc.c /tmp/5gXzGnPSRf/xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/src/savage_hwmc.c --- xserver-xorg-video-savage-2.3.0~git20090710.75ce4085/src/savage_hwmc.c 2008-12-24 16:16:10.000000000 +0000 +++ xserver-xorg-video-savage-2.3.1~git20090813.36ab23a9/src/savage_hwmc.c 2009-08-13 20:17:30.000000000 +0100 @@ -28,7 +28,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h"