[src/trunk]: src + add riva128 submodule patch from Dieter Roelants

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src + add riva128 submodule patch from Dieter Roelants
From: rtr <rtr%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 16:16:17 +0000

details:   https://anonhg.NetBSD.org/src/rev/e3a3210794ce
branches:  trunk
changeset: 573170:e3a3210794ce
user:      rtr <rtr%NetBSD.org@localhost>
date:      Fri Jan 21 08:33:11 2005 +0000

description:
+ add riva128 submodule patch from Dieter Roelants
+ add riva128.o submodule to md set lists
  should resolve pr#28808

diffstat:

 distrib/sets/lists/xserver/md.amd64                |   3 +-
 distrib/sets/lists/xserver/md.cats                 |   3 +-
 distrib/sets/lists/xserver/md.i386                 |   3 +-
 distrib/sets/lists/xserver/md.macppc               |   3 +-
 x11/Xserver/hw/xfree86/drivers/nv/Makefile         |   6 ++-
 x11/Xserver/hw/xfree86/drivers/nv/riva128/Makefile |  43 ++++++++++++++++++++++
 6 files changed, 56 insertions(+), 5 deletions(-)

diffs (132 lines):

diff -r e98b852c1ae7 -r e3a3210794ce distrib/sets/lists/xserver/md.amd64
--- a/distrib/sets/lists/xserver/md.amd64       Fri Jan 21 06:19:04 2005 +0000
+++ b/distrib/sets/lists/xserver/md.amd64       Fri Jan 21 08:33:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.12 2004/11/14 19:53:59 nathanw Exp $
+# $NetBSD: md.amd64,v 1.13 2005/01/21 08:33:11 rtr Exp $
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/XFree86
 ./usr/X11R6/bin/Xvfb
@@ -120,6 +120,7 @@
 ./usr/X11R6/lib/modules/drivers/r128_drv.o
 ./usr/X11R6/lib/modules/drivers/radeon_drv.o
 ./usr/X11R6/lib/modules/drivers/rendition_drv.o
+./usr/X11R6/lib/modules/drivers/riva128.o
 ./usr/X11R6/lib/modules/drivers/s3_drv.o
 ./usr/X11R6/lib/modules/drivers/s3virge_drv.o
 ./usr/X11R6/lib/modules/drivers/savage_drv.o
diff -r e98b852c1ae7 -r e3a3210794ce distrib/sets/lists/xserver/md.cats
--- a/distrib/sets/lists/xserver/md.cats        Fri Jan 21 06:19:04 2005 +0000
+++ b/distrib/sets/lists/xserver/md.cats        Fri Jan 21 08:33:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.8 2004/11/14 19:53:59 nathanw Exp $
+# $NetBSD: md.cats,v 1.9 2005/01/21 08:33:11 rtr Exp $
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/XFree86
 ./usr/X11R6/bin/gtf
@@ -116,6 +116,7 @@
 ./usr/X11R6/lib/modules/drivers/r128_drv.o
 ./usr/X11R6/lib/modules/drivers/radeon_drv.o
 ./usr/X11R6/lib/modules/drivers/rendition_drv.o
+./usr/X11R6/lib/modules/drivers/riva128.o
 ./usr/X11R6/lib/modules/drivers/s3_drv.o
 ./usr/X11R6/lib/modules/drivers/s3virge_drv.o
 ./usr/X11R6/lib/modules/drivers/savage_drv.o
diff -r e98b852c1ae7 -r e3a3210794ce distrib/sets/lists/xserver/md.i386
--- a/distrib/sets/lists/xserver/md.i386        Fri Jan 21 06:19:04 2005 +0000
+++ b/distrib/sets/lists/xserver/md.i386        Fri Jan 21 08:33:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.28 2004/11/14 19:53:59 nathanw Exp $
+# $NetBSD: md.i386,v 1.29 2005/01/21 08:33:11 rtr Exp $
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/XFree86
 ./usr/X11R6/bin/Xvfb
@@ -130,6 +130,7 @@
 ./usr/X11R6/lib/modules/drivers/r128_drv.o
 ./usr/X11R6/lib/modules/drivers/radeon_drv.o
 ./usr/X11R6/lib/modules/drivers/rendition_drv.o
+./usr/X11R6/lib/modules/drivers/riva128.o
 ./usr/X11R6/lib/modules/drivers/s3_drv.o
 ./usr/X11R6/lib/modules/drivers/s3virge_drv.o
 ./usr/X11R6/lib/modules/drivers/savage_drv.o
diff -r e98b852c1ae7 -r e3a3210794ce distrib/sets/lists/xserver/md.macppc
--- a/distrib/sets/lists/xserver/md.macppc      Fri Jan 21 06:19:04 2005 +0000
+++ b/distrib/sets/lists/xserver/md.macppc      Fri Jan 21 08:33:11 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.20 2004/11/14 19:53:59 nathanw Exp $
+# $NetBSD: md.macppc,v 1.21 2005/01/21 08:33:11 rtr Exp $
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/XFree86
 ./usr/X11R6/bin/Xmacppc
@@ -111,6 +111,7 @@
 ./usr/X11R6/lib/modules/drivers/nv_drv.o
 ./usr/X11R6/lib/modules/drivers/r128_drv.o
 ./usr/X11R6/lib/modules/drivers/radeon_drv.o
+./usr/X11R6/lib/modules/drivers/riva128.o
 ./usr/X11R6/lib/modules/drivers/s3_drv.o
 ./usr/X11R6/lib/modules/drivers/s3virge_drv.o
 ./usr/X11R6/lib/modules/drivers/savage_drv.o
diff -r e98b852c1ae7 -r e3a3210794ce x11/Xserver/hw/xfree86/drivers/nv/Makefile
--- a/x11/Xserver/hw/xfree86/drivers/nv/Makefile        Fri Jan 21 06:19:04 2005 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/nv/Makefile        Fri Jan 21 08:33:11 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2004/03/06 03:31:06 rtr Exp $
+#      $NetBSD: Makefile,v 1.7 2005/01/21 08:33:11 rtr Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
 
@@ -42,3 +42,7 @@
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
 .include "../../Makefile.drivermod"
+
+SUBDIR=        riva128
+
+.include <bsd.subdir.mk>
diff -r e98b852c1ae7 -r e3a3210794ce x11/Xserver/hw/xfree86/drivers/nv/riva128/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/drivers/nv/riva128/Makefile        Fri Jan 21 08:33:11 2005 +0000
@@ -0,0 +1,43 @@
+#       $NetBSD: Makefile,v 1.1 2005/01/21 08:33:11 rtr Exp $
+
+XMODULEDIR=    ${X11USRLIBDIR}/modules/drivers
+
+.include "../../../../../Makefile.serverlib"
+
+MODULE=        riva128
+MAN=   #defined
+
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv
+SRCS=  riva_driver.c riva_dac.c riva_setup.c riva_cursor.c riva_xaa.c \
+       riva_dga.c riva_shadow.c riva_hw.c
+
+CPPFLAGS+=     -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/drivers/nv \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/fbdevhw \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf4bpp \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf1bpp \
+       -I${X11SRCDIR.xc}/programs/Xserver/mfb \
+       -I${X11SRCDIR.xc}/programs/Xserver/mi \
+       -I${X11SRCDIR.xc}/programs/Xserver/fb \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xaa \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ramdac \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/i2c \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/rac \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/int10 \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vgahw \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/ddc \
+       -I${X11SRCDIR.xc}/programs/Xserver/Xext \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf24_32bpp \
+       -I${X11SRCDIR.xc}/include/fonts \
+       -I${X11SRCDIR.xc}/programs/Xserver/include \
+       -I${DESTDIR}${X11INCDIR}/X11 \
+       -I${DESTDIR}${X11INCDIR}/X11/extensions \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/shadowfb \
+       -I${X11SRCDIR.xc}/programs/Xserver/render \
+       -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/vbe \
+       -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+LIBDIR=        ${XMODULEDIR}
+.include "../../../Makefile.drivermod"

Prev by Date: [src/trunk]: src/dist/ipf/man Remove duplicate description for -d. From Chris...
Next by Date: [src/trunk]: src/sys/arch/powerpc/ibm4xx/dev In emac_txeob_intr():
Previous by Thread: [src/trunk]: src/dist/ipf/man Remove duplicate description for -d. From Chris...
Next by Thread: [src/trunk]: src/sys/arch/powerpc/ibm4xx/dev In emac_txeob_intr():
Indexes:

Home | Main Index | Thread Index | Old Index