Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Sun Apr 22 01:03:46 CEST 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-20 07:23:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-21 11:21:38.273009000 +0200
@@ -1,0 +2,16 @@
+Sat Apr 21 11:13:45 CEST 2007 - sndirsch@suse.de
+
+- xf86-video-nv-G84_G86.diff:
+ * GeForce 8300 GS and GeForce 8400 GS.
+ * Add new chips to the manpage.
+- updated "nvrandr12" driver to current git:
+ * Depend on server 1.2 or higher. Remove support for building
+ with the libc wrapper or without the Drawable XV argument.
+ * G80: Remove AdjustFrame printout.
+ * 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.
+ * Remove unused g80_ddc.h.
+ * Always support G80.
+
+-------------------------------------------------------------------
Old:
----
xf86-video-nv.randr12-20070416.tar.bz2
New:
----
xf86-video-nv-G84_G86.diff
xf86-video-nv.randr12-20070421.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.a27287/_old 2007-04-22 01:03:23.000000000 +0200
+++ /var/tmp/diff_new_pack.a27287/_new 2007-04-22 01:03:23.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 83
+Release: 84
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -68,12 +68,13 @@
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.0.0.tar.bz2
Source46: xf86-video-ati.randr12-20070318.tar.bz2
-Source47: xf86-video-nv.randr12-20070416.tar.bz2
+Source47: xf86-video-nv.randr12-20070421.tar.bz2
Source48: xf86-video-mga.randr12-20070417.tar.bz2
Patch: xf86-video-intel.diff
Patch1: radeon-xrandr-dotclock.diff
Patch2: radeon_dell.diff
Patch3: ps_nv.diff
+Patch4: xf86-video-nv-G84_G86.diff
Patch5: mga-g200se_pci-fix.diff
Patch9: xf86-video-sunffb.diff
Patch10: xf86-video-tdfx.diff
@@ -125,6 +126,9 @@
pushd xf86-video-nv-*/src
%patch3 -p6
popd
+pushd xf86-video-nv-*
+%patch4 -p1
+popd
pushd xf86-video-mga-*/src
tar xzf %{SOURCE44}
%patch5 -p1
@@ -262,6 +266,19 @@
%{_mandir}/man4/*
%changelog
+* Sat Apr 21 2007 - sndirsch@suse.de
+- xf86-video-nv-G84_G86.diff:
+ * GeForce 8300 GS and GeForce 8400 GS.
+ * Add new chips to the manpage.
+- updated "nvrandr12" driver to current git:
+ * Depend on server 1.2 or higher. Remove support for building
+ with the libc wrapper or without the Drawable XV argument.
+ * G80: Remove AdjustFrame printout.
+ * 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.
+ * Remove unused g80_ddc.h.
+ * Always support G80.
* Fri Apr 20 2007 - sndirsch@suse.de
- intel driver release 2.0.0
* Check for the PENDING message when reading the attached
++++++ xf86-video-nv-G84_G86.diff ++++++
man/nv.man | 4 ++--
src/nv_driver.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
diff-tree 5d9b75b432dbc525e10c1c00436a1820456f6fb4 (from 1261f12714746dcb2b58bc04c373594ace4f053b)
Author: Aaron Plattner
Date: Fri Apr 20 15:23:26 2007 -0700
GeForce 8300 GS and GeForce 8400 GS.
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 6c15cdf..d90dd37 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -341,6 +341,8 @@ static SymTabRec NVKnownChipsets[] =
{ 0x10DE0400, "GeForce 8600 GTS" },
{ 0x10DE0402, "GeForce 8600 GT" },
{ 0x10DE0421, "GeForce 8500 GT" },
+ { 0x10DE0422, "GeForce 8400 GS" },
+ { 0x10DE0423, "GeForce 8300 GS" },
#endif
{-1, NULL}
diff-tree 1261f12714746dcb2b58bc04c373594ace4f053b (from b4e26dfcc01b2816b6f8445fa8e9388b5e254df9)
Author: Aaron Plattner
Date: Fri Apr 20 09:01:02 2007 -0700
Add new chips to the manpage.
diff --git a/man/nv.man b/man/nv.man
index 243b406..0d8d079 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -61,7 +61,7 @@ G70, G71, G72, G73
.de G8
.TP 22
.B GeForce 8XXX
-G80
+G80, G84, G86
..
.if __support_g80__ .G8
@@ -140,7 +140,7 @@ Enable or disable use of the shadow fram
.PP
The following driver
.B Options
-are available for G80:
+are available for G80 and higher:
.TP
.BI "Option \*qHWCursor\*q \*q" boolean \*q
Enable or disable the hardware cursor. Default: on.
_______________________________________________
xorg-commit mailing list
xorg-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg-commit
++++++ xf86-video-nv.randr12-20070416.tar.bz2 -> xf86-video-nv.randr12-20070421.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/compat/Makefile.am new/xf86-video-nv.randr12/compat/Makefile.am
--- old/xf86-video-nv.randr12/compat/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-nv.randr12/compat/Makefile.am 2007-04-21 11:15:09.000000000 +0200
@@ -0,0 +1,15 @@
+EXTRA_DIST = \
+ parser/xf86Parser.h \
+ parser/xf86Optrec.h \
+ modes/xf86Crtc.c \
+ modes/xf86Crtc.h \
+ modes/xf86Cursors.c \
+ modes/xf86cvt.c \
+ modes/xf86DiDGA.c \
+ modes/xf86EdidModes.c \
+ modes/xf86Modes.c \
+ modes/xf86Modes.h \
+ modes/xf86RandR12.c \
+ modes/xf86RandR12.h \
+ modes/xf86Rename.h \
+ modes/xf86Rotate.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/compat/README new/xf86-video-nv.randr12/compat/README
--- old/xf86-video-nv.randr12/compat/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-nv.randr12/compat/README 2007-04-21 11:15:09.000000000 +0200
@@ -0,0 +1,7 @@
+This directory contains a copy of the mode and parser code from RandR 1.2.
+
+If you are building from git and you don't have xorg-server-1.3 or higher or you
+want to be able to make dist, you should create symlinks to the modes and parser
+directories from a RandR 1.2-enabled server here:
+
+ $ ln -s /path/to/xorg/xserver/hw/xfree86/{modes,parser} .
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/configure.ac new/xf86-video-nv.randr12/configure.ac
--- old/xf86-video-nv.randr12/configure.ac 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/configure.ac 2007-04-21 11:15:09.000000000 +0200
@@ -41,44 +41,74 @@
AH_TOP([#include "xorg-server.h"])
+# Options
AC_ARG_WITH(xorg-module-dir,
AC_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
+ [Path to X server source tree]),
+ [ XSERVER_SOURCE="$withval" ],
+ [ XSERVER_SOURCE="" ])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Determine whether XV PutImage takes a DrawablePtr and whether or not to use
-# the libcwrapper.
-PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
- [AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])],
- [AC_DEFINE(USE_LIBC_WRAPPER,1,[Use the libc wrapper])])
-
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-# Check for optional compile-time support
-AC_ARG_ENABLE(g80, AC_HELP_STRING([--disable-g80],
- [Disable G80 support [[default=no]]]),
- [SUPPORT_G80="$enableval"],
- [SUPPORT_G80=yes])
-AM_CONDITIONAL(SUPPORT_G80, test x$SUPPORT_G80 = xyes)
-if test "$SUPPORT_G80" = yes; then
- AC_DEFINE(SUPPORT_G80,1,[Enable G80 support])
- echo "Enabling G80 support"
-fi
-
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_HEADER(xf86Modes.h,[BUILD_XMODES=no],[BUILD_XMODES=yes],[#include "xorg-server.h"])
+CFLAGS="$save_CFLAGS"
+AM_CONDITIONAL(BUILD_XMODES, test "x$BUILD_XMODES" = xyes)
+if test "x$XSERVER_SOURCE" != x; then
+ if test -d "$XSERVER_SOURCE"; then
+ XSERVER_SOURCE=`cd "$XSERVER_SOURCE" && pwd`
+ if test -f "$XSERVER_SOURCE/hw/xfree86/modes/xf86Modes.h" -a -f "$XSERVER_SOURCE/hw/xfree86/parser/xf86Parser.h"; then
+ :
+ else
+ AC_ERROR([Server source at $XSERVER_SOURCE doesn't have the new mode code])
+ fi
+ else
+ AC_ERROR([Can't find xserver-source path $XSERVER_SOURCE])
+ fi
+fi
+if test "x$BUILD_XMODES" = xno; then
+ AC_MSG_NOTICE([X server has new mode code])
+ XMODES_CFLAGS=
+ parser_dir=
+ modes_dir=
+else
+ if test "x$XSERVER_SOURCE" = x; then
+ AC_MSG_NOTICE([X server is missing new mode code and --with-xserver-source not specified, using local copy])
+ AC_MSG_NOTICE([If you're building from git, please read compat/README])
+ parser_dir='$(top_srcdir)/compat/parser'
+ modes_dir='$(top_srcdir)/compat/modes'
+ else
+ AC_MSG_NOTICE([Using mode code from $XSERVER_SOURCE])
+ parser_dir="$XSERVER_SOURCE/hw/xfree86/parser"
+ modes_dir="$XSERVER_SOURCE/hw/xfree86/modes"
+ fi
+ XMODES_CFLAGS="-DXF86_MODES_RENAME -I\"$modes_dir\" -I\"$parser_dir\""
+ AC_DEFINE(BUILD_XMODES, 1,[X server doesn't have built-in mode code, so we need to build it])
+fi
+AC_SUBST([XMODES_CFLAGS])
+AC_SUBST([parser_dir])
+AC_SUBST([modes_dir])
+
+# Substitutions
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
@@ -92,4 +122,5 @@
Makefile
src/Makefile
man/Makefile
+ compat/Makefile
])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/Makefile.am new/xf86-video-nv.randr12/Makefile.am
--- old/xf86-video-nv.randr12/Makefile.am 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/Makefile.am 2007-04-21 11:15:09.000000000 +0200
@@ -19,7 +19,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src man
+SUBDIRS = src man compat
EXTRA_DIST = README.NV1 ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/man/Makefile.am new/xf86-video-nv.randr12/man/Makefile.am
--- old/xf86-video-nv.randr12/man/Makefile.am 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/man/Makefile.am 2007-04-21 11:15:09.000000000 +0200
@@ -41,12 +41,6 @@
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
-if SUPPORT_G80
-MAN_SUPPORT_G80 := 1
-else
-MAN_SUPPORT_G80 := 0
-endif
-
MAN_SUBSTS = \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@@ -57,8 +51,7 @@
-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
- -e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/man/nv.man new/xf86-video-nv.randr12/man/nv.man
--- old/xf86-video-nv.randr12/man/nv.man 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/man/nv.man 2007-04-21 11:15:09.000000000 +0200
@@ -58,12 +58,9 @@
.TP 22
.B GeForce 7XXX
G70, G71, G72, G73
-.de G8
.TP 22
.B GeForce 8XXX
G80
-..
-.if __support_g80__ .G8
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
@@ -136,7 +133,6 @@
Enable or disable use of the shadow framebuffer layer. Default: off.
.
.\" ******************** begin G80 section ********************
-.de G8
.PP
The following driver
.B Options
@@ -147,8 +143,6 @@
.TP
.BI "Option \*qNoAccel\*q \*q" boolean \*q
Disable or enable acceleration. Default: acceleration is enabled.
-..
-.if __support_g80__ .G8
.\" ******************** end G80 section ********************
.
.SH "SEE ALSO"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/g80_ddc.h new/xf86-video-nv.randr12/src/g80_ddc.h
--- old/xf86-video-nv.randr12/src/g80_ddc.h 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/src/g80_ddc.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Bool G80ProbeDDC(ScrnInfoPtr pScrn);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/g80_display.h new/xf86-video-nv.randr12/src/g80_display.h
--- old/xf86-video-nv.randr12/src/g80_display.h 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/src/g80_display.h 2007-04-21 11:15:09.000000000 +0200
@@ -11,6 +11,5 @@
void G80CrtcEnableCursor(xf86CrtcPtr, Bool update);
void G80CrtcDisableCursor(xf86CrtcPtr, Bool update);
void G80CrtcSetCursorPosition(xf86CrtcPtr, int x, int y);
-void G80CrtcSetDither(xf86CrtcPtr, CARD32 mask, CARD32 val);
void G80DispCreateCrtcs(ScrnInfoPtr pScrn);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/g80_driver.c new/xf86-video-nv.randr12/src/g80_driver.c
--- old/xf86-video-nv.randr12/src/g80_driver.c 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/src/g80_driver.c 2007-04-21 11:15:09.000000000 +0200
@@ -43,7 +43,6 @@
#include "g80_type.h"
#include "g80_cursor.h"
#include "g80_display.h"
-#include "g80_ddc.h"
#include "g80_dma.h"
#include "g80_output.h"
#include "g80_xaa.h"
@@ -843,7 +842,6 @@
static void
G80AdjustFrame(int scrnIndex, int x, int y, int flags)
{
- ErrorF("AdjustFrame unimplemented\n");
}
static Bool
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/g80_output.c new/xf86-video-nv.randr12/src/g80_output.c
--- old/xf86-video-nv.randr12/src/g80_output.c 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/src/g80_output.c 2007-04-21 11:15:09.000000000 +0200
@@ -30,7 +30,6 @@
#include
#include "g80_type.h"
-#include "g80_ddc.h"
#include "g80_output.h"
static Bool G80ReadPortMapping(int scrnIndex, G80Ptr pNv)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/local_xf86Rename.h new/xf86-video-nv.randr12/src/local_xf86Rename.h
--- old/xf86-video-nv.randr12/src/local_xf86Rename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-nv.randr12/src/local_xf86Rename.h 2007-04-21 11:15:09.000000000 +0200
@@ -0,0 +1,23 @@
+/*
+ *Copyright © 2006 Keith Packard
+ *
+ * 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 the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.
+ */
+
+#define XF86NAME(x) nv_##x
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/Makefile.am new/xf86-video-nv.randr12/src/Makefile.am
--- old/xf86-video-nv.randr12/src/Makefile.am 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/src/Makefile.am 2007-04-21 11:15:09.000000000 +0200
@@ -23,7 +23,7 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@
nv_drv_la_LTLIBRARIES = nv_drv.la
nv_drv_la_LDFLAGS = -module -avoid-version
nv_drv_ladir = @moduledir@/drivers
@@ -66,7 +66,6 @@
riva_type.h \
riva_xaa.c
-if SUPPORT_G80
g80_sources = \
g80_cursor.c \
g80_cursor.h \
@@ -82,4 +81,24 @@
g80_type.h \
g80_xaa.c \
g80_xaa.h
+
+xmode_sources = \
+ @parser_dir@/xf86Parser.h \
+ @parser_dir@/xf86Optrec.h \
+ @modes_dir@/xf86Modes.h \
+ @modes_dir@/xf86Modes.c \
+ @modes_dir@/xf86cvt.c \
+ @modes_dir@/xf86Crtc.h \
+ @modes_dir@/xf86Crtc.c \
+ @modes_dir@/xf86Cursors.c \
+ @modes_dir@/xf86EdidModes.c \
+ @modes_dir@/xf86RandR12.c \
+ @modes_dir@/xf86RandR12.h \
+ @modes_dir@/xf86Rename.h \
+ @modes_dir@/xf86Rotate.c \
+ @modes_dir@/xf86DiDGA.c
+
+if BUILD_XMODES
+EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
+nodist_nv_drv_la_SOURCES = $(xmode_sources)
endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/nv_driver.c new/xf86-video-nv.randr12/src/nv_driver.c
--- old/xf86-video-nv.randr12/src/nv_driver.c 2007-04-16 12:56:26.000000000 +0200
+++ new/xf86-video-nv.randr12/src/nv_driver.c 2007-04-21 11:15:09.000000000 +0200
@@ -333,12 +333,11 @@
{ 0x10DE0244, "GeForce Go 6150" },
{ 0x10DE0247, "GeForce Go 6100" },
-#if SUPPORT_G80
+/*************** G8x ***************/
{ 0x10DE0191, "GeForce 8800 GTX" },
{ 0x10DE0193, "GeForce 8800 GTS" },
{ 0x10DE019D, "Quadro FX 5600" },
{ 0x10DE019E, "Quadro FX 4600" },
-#endif
{-1, NULL}
};
@@ -655,7 +654,6 @@
return pciid;
}
-#if SUPPORT_G80
static Bool
NVIsG80(int chipType)
{
@@ -668,7 +666,6 @@
return FALSE;
}
-#endif
/* Mandatory */
static Bool
@@ -754,10 +751,8 @@
default: break; /* we don't recognize it */
}
-#if SUPPORT_G80
if(NVIsG80((*ppPci)->chipType))
canHandle = TRUE;
-#endif
if(canHandle) {
NVChipsets[numUsed].token = pciid;
@@ -795,11 +790,9 @@
if(pPci->vendor == PCI_VENDOR_NVIDIA_SGS) {
if(RivaGetScrnInfoRec(NVPciChipsets, usedChips[i]))
foundScreen = TRUE;
-#if SUPPORT_G80
} else if (NVIsG80(pPci->chipType)) {
if(G80GetScrnInfoRec(NVPciChipsets, usedChips[i]))
foundScreen = TRUE;
-#endif
} else {
if(NVGetScrnInfoRec(NVPciChipsets, usedChips[i]))
foundScreen = TRUE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/nv_include.h new/xf86-video-nv.randr12/src/nv_include.h
--- old/xf86-video-nv.randr12/src/nv_include.h 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/src/nv_include.h 2007-04-21 11:15:09.000000000 +0200
@@ -3,19 +3,14 @@
#ifndef __NV_INCLUDE_H__
#define __NV_INCLUDE_H__
-#if !USE_LIBC_WRAPPER
#include
#include
#include
-#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
/* Drivers for PCI hardware need this */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/nv_local.h new/xf86-video-nv.randr12/src/nv_local.h
--- old/xf86-video-nv.randr12/src/nv_local.h 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/src/nv_local.h 2007-04-21 11:15:09.000000000 +0200
@@ -46,9 +46,6 @@
* HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files
* can stay generic in nature.
*/
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
#include "xf86_OSproc.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/nv_video.c new/xf86-video-nv.randr12/src/nv_video.c
--- old/xf86-video-nv.randr12/src/nv_video.c 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/src/nv_video.c 2007-04-21 11:15:09.000000000 +0200
@@ -7,9 +7,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
@@ -83,11 +80,7 @@
static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool);
static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool);
-#if HAVE_XV_DRAWABLE
static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
-#else
-static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer);
-#endif
static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
static int NVQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *);
@@ -1012,10 +1005,8 @@
short height,
Bool Sync,
RegionPtr clipBoxes,
- pointer data
-#if HAVE_XV_DRAWABLE
- , DrawablePtr pDraw
-#endif
+ pointer data,
+ DrawablePtr pDraw
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/riva_include.h new/xf86-video-nv.randr12/src/riva_include.h
--- old/xf86-video-nv.randr12/src/riva_include.h 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/src/riva_include.h 2007-04-21 11:15:09.000000000 +0200
@@ -3,17 +3,12 @@
#ifndef __RIVA_INCLUDE_H__
#define __RIVA_INCLUDE_H__
-#if !USE_LIBC_WRAPPER
#include
-#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
/* Drivers for PCI hardware need this */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-nv.randr12/src/riva_local.h new/xf86-video-nv.randr12/src/riva_local.h
--- old/xf86-video-nv.randr12/src/riva_local.h 2007-03-11 13:20:03.000000000 +0100
+++ new/xf86-video-nv.randr12/src/riva_local.h 2007-04-21 11:15:09.000000000 +0200
@@ -46,9 +46,6 @@
* HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files
* can stay generic in nature.
*/
-#if USE_LIBC_WRAPPER
-#include "xf86_ansic.h"
-#endif
#include "compiler.h"
#include "xf86_OSproc.h"
++++++ xf86-video-nv.randr12.diff ++++++
--- /var/tmp/diff_new_pack.a27287/_old 2007-04-22 01:03:26.000000000 +0200
+++ /var/tmp/diff_new_pack.a27287/_new 2007-04-22 01:03:26.000000000 +0200
@@ -10,28 +10,13 @@
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
-diff -u -r xf86-video-nv.randr12.orig/man/Makefile.am xf86-video-nv.randr12/man/Makefile.am
---- xf86-video-nv.randr12.orig/man/Makefile.am 2007-03-12 12:28:13.302859000 +0100
-+++ xf86-video-nv.randr12/man/Makefile.am 2007-03-12 15:31:33.575110000 +0100
-@@ -42,9 +42,9 @@
- XORGMANNAME = X Version 11
-
- if SUPPORT_G80
--MAN_SUPPORT_G80 := 1
-+MAN_SUPPORT_G80 = 1
- else
--MAN_SUPPORT_G80 := 0
-+MAN_SUPPORT_G80 = 0
- endif
-
- MAN_SUBSTS = \
diff -u -r xf86-video-nv.randr12.orig/src/Makefile.am xf86-video-nv.randr12/src/Makefile.am
--- xf86-video-nv.randr12.orig/src/Makefile.am 2007-03-12 12:28:13.426737000 +0100
+++ xf86-video-nv.randr12/src/Makefile.am 2007-03-12 15:58:41.268795000 +0100
@@ -24,11 +24,11 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
- AM_CFLAGS = @XORG_CFLAGS@
+ AM_CFLAGS = @XMODES_CFLAGS@ @XORG_CFLAGS@
-nv_drv_la_LTLIBRARIES = nv_drv.la
-nv_drv_la_LDFLAGS = -module -avoid-version
-nv_drv_ladir = @moduledir@/drivers
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org