ChangeLog | 49 ++++++++++ Makefile.am | 2 configure.ac | 12 ++ debian/changelog | 6 + debian/xsfbs/xsfbs.mk | 21 ---- debian/xsfbs/xsfbs.sh | 233 -------------------------------------------------- src/g80_dac.c | 5 + src/g80_driver.c | 14 ++- src/g80_sor.c | 5 + src/nv_driver.c | 4 src/nv_include.h | 6 - src/nv_video.c | 1 src/riva_driver.c | 5 - src/riva_include.h | 5 - src/riva_type.h | 2 15 files changed, 110 insertions(+), 260 deletions(-)
New commits: commit 86e6adfa8e301165be15b02ea08da457c0d57033 Author: Timo Aaltonen <[email protected]> Date: Mon Nov 30 16:59:53 2009 +0200 Update the changelogs. diff --git a/ChangeLog b/ChangeLog index be2cfc4..f055e22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,52 @@ +commit 0250f0d7ebe30368c5a63809ed1f58673493627c +Author: Peter Hutterer <[email protected]> +Date: Fri Sep 11 12:24:18 2009 +1000 + + nv 2.1.15 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit 5486e55c9feb5734b967c2618e0c96cd4a2322ce +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 18:37:42 2009 +1000 + + abi: fixup so the define is picked up + +commit 85b5ff3fdf3141ef01604bd7eb8e71e30d24717f +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 15:22:40 2009 +1000 + + nv: change to using ABI version check + +commit 445498d2cc977b8c4f22fca881c75637dc7b058a +Author: Dave Airlie <[email protected]> +Date: Tue Jul 28 13:32:32 2009 +1000 + + nv: update for resources/RAC API removal + +commit 957b8c1a240884b26ee5b91856c251622cc0b2a7 +Author: Peter Hutterer <[email protected]> +Date: Thu Jul 16 11:49:24 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 <[email protected]> + +commit e8d4dd85de02c689d3e0cc86a99aae6e61a7d17e +Author: Gaetan Nadon <[email protected]> +Date: Thu Jul 9 14:07:09 2009 -0400 + + xf86-video-nv: use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + + Signed-off-by: Gaetan Nadon <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + commit c56b92149c6291e7ef96b30a4fc7bee30073b90c Author: Aaron Plattner <[email protected]> Date: Thu Jul 2 12:03:13 2009 -0700 diff --git a/debian/changelog b/debian/changelog index b5ef46a..ff8dc3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-nv (1:2.1.15-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Timo Aaltonen <[email protected]> Mon, 30 Nov 2009 16:59:35 +0200 + xserver-xorg-video-nv (1:2.1.14-2) unstable; urgency=low * Add README.source, bump Standards-Version to 3.8.2. commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1 Author: Julien Cristau <[email protected]> Date: Fri Sep 25 16:39:23 2009 +0200 xsfbs.mk: remove more obsolete code We can use plain debconf-updatepo, and don't need to clean the 'imports' directory or shlibs.local. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 82eb45f..5e16b10 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc rm -rf $(STAMP_DIR) - rm -rf imports - dh_clean debian/shlibs.local \ - debian/po/pothead - -# Generate the debconf templates POT file header. -debian/po/pothead: debian/po/pothead.in - sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \ - -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@ - -# Update POT and PO files. -.PHONY: updatepo -updatepo: debian/po/pothead - debian/scripts/debconf-updatepo --pot-header=pothead --verbose + dh_clean # Remove files from the upstream source tree that we don't need, or which have # licensing problems. It must be run before creating the .orig.tar.gz. commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:43:28 2009 +0200 xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage These variables aren't set anywhere. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 1f86848..82eb45f 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -176,7 +176,7 @@ cleanscripts: xsfclean: cleanscripts unpatch dh_testdir rm -rf .pc - rm -rf $(STAMP_DIR) $(SOURCE_DIR) + rm -rf $(STAMP_DIR) rm -rf imports dh_clean debian/shlibs.local \ debian/po/pothead @@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \ <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ rm $$MAINTSCRIPT.tmp; \ fi; \ commit bda208ec00d0b7b3632f57fb27e014684cdf73ba Author: Julien Cristau <[email protected]> Date: Fri Sep 25 15:33:39 2009 +0200 xsfbs.sh: fix typo and remove svn keyword diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 45acd59..813fd8d 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -1,5 +1,3 @@ -# $Id$ - # This is the X Strike Force shell library for X Window System package # maintainer scripts. It serves to define shell functions commonly used by # such packages, and performs some error checking necessary for proper operation @@ -8,7 +6,7 @@ # removal tasks. # If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can +# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can # skip past this library by scanning forward in this file to the string # "GOBSTOPPER". commit 0250f0d7ebe30368c5a63809ed1f58673493627c Author: Peter Hutterer <[email protected]> Date: Fri Sep 11 12:24:18 2009 +1000 nv 2.1.15 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 839512b..ce0b884 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nv], - 2.1.14, + 2.1.15, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-nv) commit 5693792171d885769e58dcccc053c08b11acd12a Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:53:36 2009 +0200 xsfbs.mk: no need for shlibs.local diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index f0f8953..1f86848 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -# Generate the shlibs.local file. -debian/shlibs.local: - cat debian/*.shlibs >$@ - SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) commit 1f858adff1ce2687cf542dd9b69b81137412f8a4 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:47:09 2009 +0200 xsfbs.sh: remove unused reject_whitespace function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index b3f4bbe..45acd59 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -93,22 +93,6 @@ reject_nondigits () { done } -reject_whitespace () { - # syntax: reject_whitespace [ operand ] - # - # scan operand (typically a shell variable whose value cannot be trusted) for - # whitespace characters and barf if any are found - if [ -n "$1" ]; then - # does the operand contain any whitespace? - if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - fi -} - reject_unlikely_path_chars () { # syntax: reject_unlikely_path_chars [ operand ... ] # commit 0dd71e12416aa7dc60ed68af8127e04609b125f4 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:23:53 2009 +0200 xsfbs.sh: remove unused find_culprits function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 7dbb196..b3f4bbe 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,53 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } -find_culprits () { - local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ - msg - - reject_whitespace "$1" - message "Searching for overlapping packages..." - dpkg_info_dir=/var/lib/dpkg/info - if [ -d $dpkg_info_dir ]; then - if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then - possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \ - "(xbase-clients|x11-common|xfs|xlibs)") - if [ -n "$possible_culprits" ]; then - smoking_guns=$(grep -l "$1" $possible_culprits || true) - if [ -n "$smoking_guns" ]; then - bad_packages=$(printf "\\n") - for f in $smoking_guns; do - # too bad you can't nest parameter expansion voodoo - p=${f%*.list} # strip off the trailing ".list" - package=${p##*/} # strip off the directories - bad_packages=$(printf "%s\n%s" "$bad_packages" "$package") - done - msg=$(cat <<EOF -The following packages appear to have file overlaps with the X.Org packages; -these packages are either very old, or in violation of Debian Policy. Try -upgrading each of these packages to the latest available version if possible: -for example, with the command "apt-get install". If no newer version of a -package is available, you will have to remove it; for example, with the command -"apt-get remove". If even the latest available version of the package has -this file overlap, please file a bug against that package with the Debian Bug -Tracking System. You may want to refer the package maintainer to section 12.8 -of the Debian Policy manual. -EOF -) - message "$msg" - message "The overlapping packages are: $bad_packages" - else - message "no overlaps found." - fi - fi - else - message "cannot search; no matches for $dpkg_info_dir/*.list." - fi - else - message "cannot search; $dpkg_info_dir does not exist." - fi -} - font_update () { # run $UPDATECMDS in $FONTDIRS commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:23:06 2009 +0200 xsfbs.sh: remove unused maplink function diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index f869274..7dbb196 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -199,37 +199,6 @@ usage_error () { exit $SHELL_LIB_USAGE_ERROR } - -maplink () { - # returns what symlink should point to; i.e., what the "sane" answer is - # Keep this in sync with the debian/*.links files. - # This is only needed for symlinks to directories. - # - # XXX: Most of these look wrong in the X11R7 world and need to be fixed. - # If we've stopped using this function, fixing it might enable us to re-enable - # it again and catch more errors. - case "$1" in - /etc/X11/xkb/compiled) echo /var/lib/xkb ;; - /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;; - /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;; - /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;; - /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;; - /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;; - /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;; - /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;; - /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;; - /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;; - /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;; - /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;; - /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;; - /usr/bin/X11) echo ../X11R6/bin ;; - /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;; - /usr/include/X11) echo ../X11R6/include/X11 ;; - /usr/lib/X11) echo ../X11R6/lib/X11 ;; - *) internal_error "maplink() called with unknown path \"$1\"" ;; - esac -} - find_culprits () { local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ msg commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:21:34 2009 +0200 xsfbs.sh: remove unused analyze_path diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 4461b1a..f869274 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -230,32 +230,6 @@ maplink () { esac } -analyze_path () { - # given a supplied set of pathnames, break each one up by directory and do an - # ls -dl on each component, cumulatively; i.e. - # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin - # Thanks to Randolph Chung for this clever hack. - - local f g - - while [ -n "$1" ]; do - reject_whitespace "$1" - g= - message "Analyzing $1:" - for f in $(echo "$1" | tr / \ ); do - if [ -e /$g$f ]; then - ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true - g=$g$f/ - else - message "/$g$f: nonexistent; directory contents of /$g:" - ls -l /$g - break - fi - done - shift - done -} - find_culprits () { local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \ msg commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5 Author: Julien Cristau <[email protected]> Date: Wed Aug 26 18:20:11 2009 +0200 xsfbs.sh: remove unused check_symlinks_and_{bomb,warn} diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh index 781826f..4461b1a 100644 --- a/debian/xsfbs/xsfbs.sh +++ b/debian/xsfbs/xsfbs.sh @@ -303,115 +303,6 @@ EOF fi } -check_symlink () { - # syntax: check_symlink symlink - # - # See if specified symlink points where it is supposed to. Return 0 if it - # does, and 1 if it does not. - # - # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb(). - - local symlink - - # validate arguments - if [ $# -ne 1 ]; then - usage_error "check_symlink() called with wrong number of arguments;" \ - "expected 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - symlink="$1" - - if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then - return 0 - else - return 1 - fi -} - -check_symlinks_and_warn () { - # syntax: check_symlinks_and_warn symlink ... - # - # For each argument, check for symlink sanity, and warn if it isn't sane. - # - # Call this function from a preinst script in the event $1 is "upgrade" or - # "install". - - local errmsg symlink - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "check_symlinks_and_warn() called with wrong number of" \ - "arguments; expected at least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - while [ -n "$1" ]; do - symlink="$1" - if [ -L "$symlink" ]; then - if ! check_symlink "$symlink"; then - observe "$symlink symbolic link points to wrong location" \ - "$(readlink "$symlink"); removing" - rm "$symlink" - fi - elif [ -e "$symlink" ]; then - errmsg="$symlink exists and is not a symbolic link; this package cannot" - errmsg="$errmsg be installed until this" - if [ -f "$symlink" ]; then - errmsg="$errmsg file" - elif [ -d "$symlink" ]; then - errmsg="$errmsg directory" - else - errmsg="$errmsg thing" - fi - errmsg="$errmsg is removed" - die "$errmsg" - fi - shift - done -} - -check_symlinks_and_bomb () { - # syntax: check_symlinks_and_bomb symlink ... - # - # For each argument, check for symlink sanity, and bomb if it isn't sane. - # - # Call this function from a postinst script. - - local problem symlink - - # validate arguments - if [ $# -lt 1 ]; then - usage_error "check_symlinks_and_bomb() called with wrong number of" - "arguments; expected at least 1, got $#" - exit $SHELL_LIB_USAGE_ERROR - fi - - while [ -n "$1" ]; do - problem= - symlink="$1" - if [ -L "$symlink" ]; then - if ! check_symlink "$symlink"; then - problem=yes - warn "$symlink symbolic link points to wrong location" \ - "$(readlink "$symlink")" - fi - elif [ -e "$symlink" ]; then - problem=yes - warn "$symlink is not a symbolic link" - else - problem=yes - warn "$symlink symbolic link does not exist" - fi - if [ -n "$problem" ]; then - analyze_path "$symlink" "$(readlink "$symlink")" - find_culprits "$symlink" - die "bad symbolic links on system" - fi - shift - done -} - font_update () { # run $UPDATECMDS in $FONTDIRS commit 5486e55c9feb5734b967c2618e0c96cd4a2322ce Author: Dave Airlie <[email protected]> Date: Tue Jul 28 18:37:42 2009 +1000 abi: fixup so the define is picked up diff --git a/src/g80_driver.c b/src/g80_driver.c index 9cc2bf2..13e417a 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -28,6 +28,7 @@ #include <string.h> +#include <xf86.h> #include <xf86_OSproc.h> #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include <xf86Resources.h> commit 85b5ff3fdf3141ef01604bd7eb8e71e30d24717f Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:40 2009 +1000 nv: change to using ABI version check diff --git a/src/g80_driver.c b/src/g80_driver.c index 17c85f0..9cc2bf2 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -29,7 +29,7 @@ #include <string.h> #include <xf86_OSproc.h> -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include <xf86Resources.h> #endif #include <mipointer.h> diff --git a/src/nv_include.h b/src/nv_include.h index 4442621..a0d5ad1 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -9,7 +9,7 @@ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif diff --git a/src/riva_include.h b/src/riva_include.h index a2064e1..04c35a6 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -7,7 +7,7 @@ #include "xf86.h" #include "xf86_OSproc.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" #endif commit 445498d2cc977b8c4f22fca881c75637dc7b058a Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:32 2009 +1000 nv: update for resources/RAC API removal diff --git a/src/g80_driver.c b/src/g80_driver.c index 7e06358..17c85f0 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -29,8 +29,9 @@ #include <string.h> #include <xf86_OSproc.h> +#ifndef XSERVER_LIBPCIACCESS #include <xf86Resources.h> -#include <xf86RandR12.h> +#endif #include <mipointer.h> #include <mibstore.h> #include <micmap.h> @@ -43,6 +44,7 @@ #include <X11/extensions/dpms.h> #endif +#include <xf86RandR12.h> #include "nv_const.h" #include "g80_type.h" @@ -229,8 +231,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) } /* Disable VGA access */ +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); +#endif pScrn->monitor = pScrn->confScreen->monitor; @@ -314,11 +318,13 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MMIO registers mapped at %p\n", (void*)pNv->reg); +#ifndef XSERVER_LIBPCIACCESS if(xf86RegisterResources(pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found " "resource conflicts\n"); goto fail; } +#endif pNv->architecture = pNv->reg[0] >> 20 & 0x1ff; tmp = pNv->reg[0x0010020C/4]; diff --git a/src/nv_driver.c b/src/nv_driver.c index 3a396e0..a7cf2dc 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -1264,8 +1264,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) #endif } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pNv->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pNv->pEnt->index, ResDisableOpr); +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -1642,6 +1644,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n", (unsigned long)pNv->IOAddress); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pNv->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); @@ -1649,6 +1652,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) NVFreeRec(pScrn); return FALSE; } +#endif switch (pNv->Chipset & 0x0ff0) { case 0x0100: /* GeForce 256 */ diff --git a/src/nv_include.h b/src/nv_include.h index b579b37..4442621 100644 --- a/src/nv_include.h +++ b/src/nv_include.h @@ -8,7 +8,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#include "xf86RAC.h" +#endif #include "compiler.h" /* Drivers for PCI hardware need this */ @@ -29,8 +33,6 @@ #include "vbe.h" -#include "xf86RAC.h" - #include "nv_const.h" #include "dixstruct.h" diff --git a/src/nv_video.c b/src/nv_video.c index e11e0d0..6b13e5f 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -4,7 +4,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" diff --git a/src/riva_driver.c b/src/riva_driver.c index 3540fe9..afe0972 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -396,8 +396,10 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) #endif } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVgaIo, pRiva->pEnt->index, ResUnusedOpr); xf86SetOperatingState(resVgaMem, pRiva->pEnt->index, ResDisableOpr); +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; @@ -633,6 +635,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n", (unsigned long)pRiva->IOAddress); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pRiva->pEnt->index, NULL, ResExclusive)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found resource conflicts\n"); @@ -640,7 +643,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) RivaFreeRec(pScrn); return FALSE; } - +#endif Riva3Setup(pScrn); /* diff --git a/src/riva_include.h b/src/riva_include.h index 6726fcc..a2064e1 100644 --- a/src/riva_include.h +++ b/src/riva_include.h @@ -6,7 +6,11 @@ /* All drivers should typically include these */ #include "xf86.h" #include "xf86_OSproc.h" + +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#include "xf86RAC.h" +#endif #include "compiler.h" /* Drivers for PCI hardware need this */ @@ -27,7 +31,6 @@ #include "vbe.h" -#include "xf86RAC.h" #include "riva_const.h" diff --git a/src/riva_type.h b/src/riva_type.h index 5a1317f..456f813 100644 --- a/src/riva_type.h +++ b/src/riva_type.h @@ -56,8 +56,8 @@ typedef struct { #else pciVideoPtr PciInfo; PCITAG PciTag; -#endif xf86AccessRec Access; +#endif int ChipRev; Bool Primary; CARD32 IOAddress; commit 957b8c1a240884b26ee5b91856c251622cc0b2a7 Author: Peter Hutterer <[email protected]> Date: Thu Jul 16 11:49:24 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 <[email protected]> diff --git a/configure.ac b/configure.ac index 3c874fe..839512b 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,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/g80_dac.c b/src/g80_dac.c index 404f178..307e412 100644 --- a/src/g80_dac.c +++ b/src/g80_dac.c @@ -27,8 +27,13 @@ #include <unistd.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <xf86_OSproc.h> #include "g80_type.h" diff --git a/src/g80_driver.c b/src/g80_driver.c index 5ecf895..7e06358 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -36,8 +36,13 @@ #include <micmap.h> #include <xf86cmap.h> #include <fb.h> +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include "nv_const.h" #include "g80_type.h" diff --git a/src/g80_sor.c b/src/g80_sor.c index c1ef42d..185761f 100644 --- a/src/g80_sor.c +++ b/src/g80_sor.c @@ -25,8 +25,13 @@ #include "config.h" #endif +#ifdef HAVE_XEXTPROTO_71 +#include <X11/extensions/dpmsconst.h> +#else #define DPMS_SERVER #include <X11/extensions/dpms.h> +#endif + #include <X11/Xatom.h> #include "g80_type.h" commit e8d4dd85de02c689d3e0cc86a99aae6e61a7d17e Author: Gaetan Nadon <[email protected]> Date: Thu Jul 9 14:07:09 2009 -0400 xf86-video-nv: use XORG_CHANGELOG macro to create ChangeLog. #22611 Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Signed-off-by: Gaetan Nadon <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> diff --git a/Makefile.am b/Makefile.am index cdce83e..0891338 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,6 @@ CLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index e67a1ef..3c874fe 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,11 @@ AC_INIT([xf86-video-nv], AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) + +# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) @@ -129,6 +134,7 @@ AC_SUBST([DRIVER_NAME]) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
