[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-nv: Changes to 'debian-experimental'



 COPYING                |   26 -
 ChangeLog              |  301 +++++++++++++++
 Makefile.am            |    4 
 Makefile.in            |    9 
 README.G80             |   11 
 compat/.gitignore      |    2 
 compat/Makefile.am     |   15 
 compat/README          |    7 
 config.guess           |   32 +
 config.h.in            |    9 
 config.sub             |   16 
 configure              |  255 +++++++++----
 configure.ac           |   58 ++
 debian/changelog       |   26 +
 debian/control         |   16 
 debian/copyright       |   72 ---
 man/Makefile.in        |    5 
 man/nv.man             |   76 ++-
 src/Makefile.am        |   49 ++
 src/Makefile.in        |  146 +++++++
 src/g80_cursor.c       |  103 +++++
 src/g80_cursor.h       |    7 
 src/g80_dac.c          |  199 ++++++++++
 src/g80_display.c      |  531 +++++++++++++++++++++++++++
 src/g80_display.h      |   15 
 src/g80_dma.c          |   65 +++
 src/g80_dma.h          |   14 
 src/g80_driver.c       |  957 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/g80_exa.c          |  329 ++++++++++++++++
 src/g80_exa.h          |    1 
 src/g80_output.c       |  347 +++++++++++++++++
 src/g80_output.h       |   29 +
 src/g80_sor.c          |  151 +++++++
 src/g80_type.h         |   77 +++
 src/g80_xaa.c          |  554 ++++++++++++++++++++++++++++
 src/g80_xaa.h          |    6 
 src/local_xf86Rename.h |   23 +
 src/nv_driver.c        |  109 +++++
 src/nv_hw.c            |   15 
 src/nv_include.h       |    6 
 src/nv_local.h         |    3 
 src/nv_setup.c         |    2 
 src/nv_type.h          |    1 
 src/nv_video.c         |   13 
 src/riva_hw.c          |    2 
 src/riva_include.h     |    5 
 src/riva_local.h       |    3 
 47 files changed, 4456 insertions(+), 246 deletions(-)

New commits:
commit a6c9040f98627fd13e5c581b5be9d8f0d48020c7
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date:   Thu May 3 22:40:18 2007 +0200

    Update upstream ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ac9c0ee..54f7992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,111 @@
+commit 0415ecaead518123ac6774300241867883a6dd57
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Thu May 3 11:54:28 2007 -0700
+
+    Bump to 2.0.95.
+
+commit c511debc07e96e66335cfa82f1db8207ff5bb690
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed May 2 15:23:14 2007 -0700
+
+    Fix some harmless warnings.
+
+commit 100d7c7393eda92e5b26ac4f4cc33a8dce86c364
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed May 2 09:33:33 2007 -0700
+
+    GeForce 8800 Ultra
+
+commit ed9f98853a781344c10cb801214917e13bddf27c
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Apr 24 20:57:43 2007 -0700
+
+    Remove some old stuff from README.G80.
+
+commit 88d44d5e4fd0025c30e9d67b55c603c59bd1c0c1
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Apr 24 20:45:52 2007 -0700
+
+    Get EXA resizing working and document it.
+
+commit 29433b76969b73a2a22081bf965bb0cdbaad75af
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Sat Apr 21 21:43:06 2007 -0700
+
+    EXA: Add solid, copy, and UTS hooks.
+
+commit 339e30cb49a48344ec7b0dfd701b958b07ed32e5
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Mon Apr 16 02:23:26 2007 -0700
+
+    G80: EXA infrastructure.
+    
+    No acceleration yet.
+
+commit c6e4105ce40ef053e026cc0ffe4925ab568ea700
+Merge: 5d9b75b... 4ff648c...
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Apr 24 15:43:48 2007 -0700
+
+    Merge branch 'randr-1.2'
+    
+    Conflicts:
+    
+    	configure.ac
+    	man/Makefile.am
+    	man/nv.man
+    	src/g80_display.h
+    	src/g80_output.c
+    	src/nv_driver.c
+
+commit 4ff648c85f8aa90b343b7e2df176c0511b3cdaa5
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 16:24:15 2007 -0700
+
+    Depend on server 1.2 or higher.
+    
+    Remove support for building with the libc wrapper or without the Drawable XV
+    argument.
+
+commit 48f9a6f94550acea4fce81d2539a6508049c1551
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 15:37:09 2007 -0700
+
+    G80: Remove AdjustFrame printout.
+
+commit 5d9b75b432dbc525e10c1c00436a1820456f6fb4
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 15:23:26 2007 -0700
+
+    GeForce 8300 GS and GeForce 8400 GS.
+
+commit 7a07a765c2a3816e8cd0487e8f66bc767024142d
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 14:30:45 2007 -0700
+
+    Steal RandR1.2 compat code from the Intel driver.
+    
+    Spruce it up a bit so that --with-xserver-source works even if there's a local
+    compat copy.
+
+commit 2971fd0a18e947c5d39d6af78b0b77d6e4fe00d8
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 13:40:33 2007 -0700
+
+    Remove unused g80_ddc.h.
+
+commit 1261f12714746dcb2b58bc04c373594ace4f053b
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 09:01:02 2007 -0700
+
+    Add new chips to the manpage.
+
+commit ae582bdd2107d7e0106d1d5a9a9d6b9e39f1c901
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 20 00:13:31 2007 -0700
+
+    Always support G80.
+
 commit b4e26dfcc01b2816b6f8445fa8e9388b5e254df9
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Tue Apr 17 15:00:24 2007 -0700
@@ -16,6 +124,33 @@ Date:   Tue Apr 17 12:47:11 2007 -0700
 
     Add GeForce 8600 and 8500 PCI IDs.
 
+commit f7c62016f8bf9ced7d56f74ce26e13b6df040379
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 13 23:02:35 2007 -0700
+
+    G80: Get rid of debug printouts.
+
+commit f1cda5eaba9cbbfeb913d249d014586a6e8fd7a6
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Fri Apr 13 22:29:57 2007 -0700
+
+    G80: Get DPMS working with RandR 1.2.
+    
+    Work around xf86DisableUnusedFunctions lameness by forcing DPMSModeOn at modeset
+    time.
+
+commit 550af781bd9f7cb7256b298281c2c27febfc4722
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Mon Apr 2 09:42:11 2007 -0700
+
+    G80: Use the right mode struct when setting up an SOR.
+
+commit 5c03bd8acfcc814890fb13c891be4f135ea800d4
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Mon Apr 2 01:37:38 2007 -0700
+
+    G80: Get HW cursor working with RandR 1.2.
+
 commit 0126c809544cb3a0242fc3bce7ad82d4962aaf1c
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Sun Apr 1 01:17:31 2007 -0700
@@ -30,6 +165,22 @@ Date:   Sat Mar 31 18:47:30 2007 -0800
 
     10360: Need to inject a mode corresponding panel width/height for validation
 
+commit 8f7769aadf175e8298f27387428214d6de49e6a5
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Wed Mar 28 14:10:41 2007 -0700
+
+    G80: Use xf86CrtcScreenInit and xf86SetDesiredModes.
+
+commit 2d8d5bd597d760968b683d41ced6a0a76518ec26
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Mar 27 17:12:21 2007 -0700
+
+    G80: Improve output detection.
+    
+    Detect output status for paired outputs together and cache status until the
+    BlockHandler to avoid redundantly probing for EDIDs or performing load
+    detection.
+
 commit 4d929d383abe064b5334847eb466321a6bf30999
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Tue Mar 27 15:56:52 2007 -0700
@@ -44,6 +195,21 @@ Date:   Tue Mar 27 15:46:38 2007 -0700
 
     Fix warnings and bump to 2.0.1.
 
+commit 4b8ed8497a9ab6ef1316bfcce9f31d96dd4b3540
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Mar 27 13:33:11 2007 -0700
+
+    G80: Create output partners.
+    
+    Each pair of outputs shares an I2C rec.  This will be used in a future change
+    for the detect and get_modes routines.
+
+commit ad4abba20b8a6db7b52898bc7159809539cbed43
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date:   Tue Mar 27 14:49:30 2007 -0700
+
+    Fix warnings.
+
 commit 7c2a31dec3d04111eaee5292c156753c316d52a9
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Tue Mar 27 14:45:17 2007 -0700
@@ -101,6 +267,20 @@ Date:   Mon Mar 12 14:56:10 2007 -0700
 
     Get rid of non-portable := assignments.
 
+commit 7e0e5c1fb38922add99db33f282baf2ee1531685
+Author: root <root@treble.(none)>
+Date:   Sun Mar 11 00:38:11 2007 -0800
+
+    Initial RandR 1.2 support for G80.
+    
+    Mostly just rearranging code.
+
+commit 636adcd57f1c5b33edf2d8fbf9e7fa9aac1ccb1a
+Author: root <root@treble.(none)>
+Date:   Sat Mar 10 22:12:39 2007 -0800
+
+    Get rid of BackendMode and disable hw cursor for now.
+
 commit 8b2c7bc457d34b7ed59cd08719bec8754ebf6fb8
 Author: Aaron Plattner <aplattner@nvidia.com>
 Date:   Fri Mar 9 12:43:12 2007 -0800

commit a8e1803286d0b5d86716dbb0f2201259a58c1e22
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date:   Thu May 3 22:37:30 2007 +0200

    autoreconf

diff --git a/Makefile.in b/Makefile.in
index 1afc047..514ce50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_XMODES_FALSE = @BUILD_XMODES_FALSE@
+BUILD_XMODES_TRUE = @BUILD_XMODES_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -161,9 +163,8 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
-SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
 VERSION = @VERSION@
+XMODES_CFLAGS = @XMODES_CFLAGS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 ac_ct_CC = @ac_ct_CC@
@@ -204,8 +205,10 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+modes_dir = @modes_dir@
 moduledir = @moduledir@
 oldincludedir = @oldincludedir@
+parser_dir = @parser_dir@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -215,7 +218,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src man compat
 EXTRA_DIST = README.NV1 README.G80 ChangeLog
 CLEANFILES = ChangeLog
 all: config.h
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-07-02'
+timestamp='2007-03-06'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -950,6 +954,9 @@ EOF
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff --git a/config.h.in b/config.h.in
index 016c8f0..c913ec7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -2,6 +2,9 @@
 
 #include "xorg-server.h"
 
+/* X server doesn't have built-in mode code, so we need to build it */
+#undef BUILD_XMODES
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -32,9 +35,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* XV hooks take a DrawablePtr */
-#undef HAVE_XV_DRAWABLE
-
 /* Name of package */
 #undef PACKAGE
 
@@ -65,14 +65,5 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Enable G80 support */
-#undef SUPPORT_G80
-
-/* Use xf86CVTMode func */
-#undef USE_CVTMODE_FUNC
-
-/* Use the libc wrapper */
-#undef USE_LIBC_WRAPPER
-
 /* Version number of package */
 #undef VERSION
diff --git a/config.sub b/config.sub
index fab0aa3..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2007-01-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -925,6 +925,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1219,7 +1222,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
diff --git a/configure b/configure
index fb7ff99..cce1d95 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.0.2.
+# Generated by GNU Autoconf 2.61 for xf86-video-nv 2.0.95.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='2.0.2'
-PACKAGE_STRING='xf86-video-nv 2.0.2'
+PACKAGE_VERSION='2.0.95'
+PACKAGE_STRING='xf86-video-nv 2.0.95'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -875,8 +875,11 @@ LIBTOOL
 PKG_CONFIG
 XORG_CFLAGS
 XORG_LIBS
-SUPPORT_G80_TRUE
-SUPPORT_G80_FALSE
+BUILD_XMODES_TRUE
+BUILD_XMODES_FALSE
+XMODES_CFLAGS
+parser_dir
+modes_dir
 moduledir
 DRIVER_NAME
 APP_MAN_SUFFIX
@@ -1414,7 +1417,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 2.0.2 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.0.95 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1484,7 +1487,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-nv 2.0.2:";;
+     short | recursive ) echo "Configuration of xf86-video-nv 2.0.95:";;
    esac
   cat <<\_ACEOF
 
@@ -1500,7 +1503,6 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-g80           Disable G80 support [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1512,6 +1514,8 @@ Optional Packages:
   --with-xorg-module-dir=DIR
                           Default xorg module directory
                           [default=$libdir/xorg/modules]
+  --with-xserver-source=XSERVER_SOURCE
+                          Path to X server source tree
   --with-release-version=STRING
                           Use release version string in package name
 
@@ -1597,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configure 2.0.2
+xf86-video-nv configure 2.0.95
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1611,7 +1615,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-nv $as_me 2.0.2, which was
+It was created by xf86-video-nv $as_me 2.0.95, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2286,7 +2290,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-nv'
- VERSION='2.0.2'
+ VERSION='2.0.95'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4349,7 +4353,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4352 "configure"' > conftest.$ac_ext
+  echo '#line 4356 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7081,11 +7085,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7084: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7088: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7088: \$? = $ac_status" >&5
+   echo "$as_me:7092: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7349,11 +7353,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7352: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7356: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7356: \$? = $ac_status" >&5
+   echo "$as_me:7360: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7453,11 +7457,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7456: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7460: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7460: \$? = $ac_status" >&5
+   echo "$as_me:7464: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9750,7 +9754,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9753 "configure"
+#line 9757 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9850,7 +9854,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9853 "configure"
+#line 9857 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12186,11 +12190,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12193: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12193: \$? = $ac_status" >&5
+   echo "$as_me:12197: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12290,11 +12294,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12293: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12297: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12297: \$? = $ac_status" >&5
+   echo "$as_me:12301: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13851,11 +13855,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13854: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13858: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13858: \$? = $ac_status" >&5
+   echo "$as_me:13862: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13955,11 +13959,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13958: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13962: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13962: \$? = $ac_status" >&5
+   echo "$as_me:13966: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16142,11 +16146,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16145: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16149: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16149: \$? = $ac_status" >&5
+   echo "$as_me:16153: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16410,11 +16414,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16413: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16417: \$? = $ac_status" >&5
+   echo "$as_me:16421: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16514,11 +16518,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16517: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16521: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16521: \$? = $ac_status" >&5
+   echo "$as_me:16525: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19954,6 +19958,7 @@ fi
 
 
 
+# Options
 
 # Check whether --with-xorg-module-dir was given.
 if test "${with_xorg_module_dir+set}" = set; then
@@ -19963,6 +19968,15 @@ else
 fi
 
 
+
+# Check whether --with-xserver-source was given.
+if test "${with_xserver_source+set}" = set; then
+  withval=$with_xserver_source;  XSERVER_SOURCE="$withval"
+else
+   XSERVER_SOURCE=""
+fi
+
+
 # Checks for extensions
 
 	SAVE_CFLAGS="$CFLAGS"
@@ -20197,8 +20211,7 @@ echo "${ECHO_T}$_EXT_CHECK" >&6; }
 	fi
 
 
-# Determine whether XV PutImage takes a DrawablePtr and whether or not to use
-# the libcwrapper.
+# Checks for pkg-config packages
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -20319,39 +20332,6 @@ echo "${ECHO_T}no" >&6; }
 	fi
 
 fi
-if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XV_DRAWABLE 1
-_ACEOF
-
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_LIBC_WRAPPER 1
-_ACEOF
-
-fi
-
-if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.1.99.901\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.1.99.901") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_CVTMODE_FUNC 1
-_ACEOF
-
-fi
-
-# Checks for pkg-config packages
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for XORG" >&5
@@ -20362,12 +20342,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2 xproto fontsproto \$REQUIRED_MODULES\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+  pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20380,12 +20360,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XORG_LIBS="$XORG_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2 xproto fontsproto \$REQUIRED_MODULES\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+  pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20404,14 +20384,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
+	        XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES"`
         else
-	        XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
+	        XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XORG_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES) were not met:
 
 $XORG_PKG_ERRORS
 
@@ -20422,7 +20402,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
 and XORG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
+echo "$as_me: error: Package requirements (xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES) were not met:
 
 $XORG_PKG_ERRORS
 
@@ -20465,33 +20445,6 @@ echo "${ECHO_T}yes" >&6; }
 fi
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-# Check for optional compile-time support
-# Check whether --enable-g80 was given.
-if test "${enable_g80+set}" = set; then
-  enableval=$enable_g80; SUPPORT_G80="$enableval"
-else
-  SUPPORT_G80=yes
-fi
-
-
-
-if test x$SUPPORT_G80 = xyes; then
-  SUPPORT_G80_TRUE=
-  SUPPORT_G80_FALSE='#'
-else
-  SUPPORT_G80_TRUE='#'
-  SUPPORT_G80_FALSE=
-fi
-
-if test "$SUPPORT_G80" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SUPPORT_G80 1
-_ACEOF
-
-        echo "Enabling G80 support"
-fi
-
 # Checks for libraries.
 
 # Checks for header files.
@@ -20670,6 +20623,118 @@ _ACEOF
 fi
 
 
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+{ echo "$as_me:$LINENO: checking for xf86Modes.h" >&5
+echo $ECHO_N "checking for xf86Modes.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_xf86Modes_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "xorg-server.h"
+
+#include <xf86Modes.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_xf86Modes_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_header_xf86Modes_h=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_xf86Modes_h" >&5
+echo "${ECHO_T}$ac_cv_header_xf86Modes_h" >&6; }
+if test $ac_cv_header_xf86Modes_h = yes; then
+  BUILD_XMODES=no
+else
+  BUILD_XMODES=yes
+fi
+
+
+CFLAGS="$save_CFLAGS"
+
+
+if test "x$BUILD_XMODES" = xyes; then



Reply to: