subject:"CVS commit\: src\/external\/mit\/xorg\/server\/xorg\-server\/hw"

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl

2021-07-14 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Wed Jul 14 06:34:33 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl:
Makefile

Log Message:
find libgbm in libgbm.old.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1 src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile:1.1	Tue Apr 16 21:21:51 2019
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/glamor_egl/Makefile	Wed Jul 14 06:34:33 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2021/07/14 06:34:33 mrg Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -30,8 +30,10 @@ CPPFLAGS+=	\
 CPPFLAGS+=	\
 	-DGLAMOR_HAS_GBM
 
+.include "../../../../../lib/mesa-which.mk"
+
 LIBDPLIBS=	\
-	gbm	${.CURDIR}/../../../../../lib/libgbm
+	gbm	${.CURDIR}/../../../../../lib/libgbm${OLD_SUFFIX}
 
 .include 
 LIBDIR=	${XMODULEDIR}

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2021-03-22 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Mon Mar 22 14:11:02 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Remove -DHAVE_STRCASECMP from CPPFLAGS that is defined in dix-config.h.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10	Sun Feb  7 16:56:00 2021
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Mon Mar 22 14:11:02 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2021/02/07 16:56:00 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.11 2021/03/22 14:11:02 tsutsui Exp $
 
 .include 
 
@@ -33,7 +33,6 @@ CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE
 		-UXF86DRI -UXF86BIGFONT
 
 CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
-CPPFLAGS+=	-DHAVE_STRCASECMP
 
 CPPFLAGS.x68kConfig.c=	 -DX11_LIBDIR=\"${X11ETCDIR}\"

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2021-02-07 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sun Feb  7 16:56:00 UTC 2021

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Build mouseEmu3btn.c for added Emulate3Buttons support.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9	Wed Aug  5 15:48:09 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Sun Feb  7 16:56:00 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.10 2021/02/07 16:56:00 tsutsui Exp $
 
 .include 
 
@@ -18,6 +18,7 @@ WARNS?=	2
 .PATH:	${X11SRCDIR.xorg-server}/hw/netbsd/x68k
 SRCS=	x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \
 	x68kFb.c x68kGraph.c x68kText.c
+SRCS+=	mouseEmu3btn.c
 
 .PATH:	${X11SRCDIR.xorg-server}/Xi
 SRCS+=	stubs.c

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2020-10-09 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Fri Oct  9 17:01:29 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
build ppc_video.c etc. on hppa


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.48
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.47	Mon Dec 31 11:14:05 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Fri Oct  9 17:01:29 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.47 2018/12/31 11:14:05 mrg Exp $
+#	$NetBSD: Makefile,v 1.48 2020/10/09 17:01:29 macallan Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -35,7 +35,8 @@ CPPFLAGS.${_FN}+=	-DPCVT_SUPPORT -DWSCON
 .endfor
 .endif
 
-.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || ${MACHINE} == "ibmnws"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep" || ${MACHINE} == "bebox" || ${MACHINE} == "ofppc" || \
+	${MACHINE} == "ibmnws" || ${MACHINE} == "hppa"
 SRCS.bsd+=	ppc_video.c pm_noop.c lnx_agp.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC

CVS commit: src/external/mit/xorg/server/xorg-server/hw

2020-08-05 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Wed Aug  5 15:48:09 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile

Log Message:
No need to build fbcmap_mi.c in each DDX server.

Per upstream commit:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7
> Build fbcmap_mi.c once, rather than once for each DDX, and make it part of 
> libfb
> or libwfb convenience library.

Tested on sun3 and x68k.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
cvs rdiff -u -r1.18 -r1.19 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8	Wed Jul 22 21:25:03 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Wed Aug  5 15:48:09 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $
 
 .include 
 
@@ -25,9 +25,6 @@ SRCS+=	stubs.c
 .PATH:	${X11SRCDIR.xorg-server}/mi
 SRCS+=	miinitext.c
 
-.PATH:	${X11SRCDIR.xorg-server}/fb
-SRCS+=	fbcmap_mi.c
-
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
 		${X11INCS.DIX}
 

Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.5
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4	Tue Aug  4 14:31:58 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Wed Aug  5 15:48:09 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $
+#	$NetBSD: Makefile.Xsun,v 1.5 2020/08/05 15:48:09 tsutsui Exp $
 
 .include 
 
@@ -70,9 +70,6 @@ SRCS+=	sunFbs.c sunIo.c sunKbd.c sunKeyM
 .PATH:  ${X11SRCDIR.xorg-server}/Xi
 SRCS+=  stubs.c
 
-.PATH:	${X11SRCDIR.xorg-server}/fb
-SRCS+=	fbcmap_mi.c
-
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/sun \
 		${X11INCS.DIX}
 

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.19
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.18	Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Wed Aug  5 15:48:09 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2018/12/31 11:14:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $
 
 .include 
 
@@ -13,10 +13,6 @@ PROG=		Xvfb
 .PATH:		${X11SRCDIR.xorg-server}/mi
 SRCS=		InitInput.c InitOutput.c miinitext.c stubs.c
 
-# XXX should not be needed now
-#.PATH:		${X11SRCDIR.xorg-server}/fb
-#SRCS+=		fbcmap_mi.c
-
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${X11SRCDIR.xorg-server}/fb \
 		-I${X11SRCDIR.xorg-server}/mfb \

Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.23
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.22	Mon Jul 20 13:59:57 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile	Wed Aug  5 15:48:09 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $
 
 .include 
 
@@ -16,8 +16,7 @@ PROG=	Xnest
 SRCS=		Args.c Color.c Cursor.c Display.c Events.c Font.c \
 		GC.c GCOps.c Handlers.c Init.c Keyboard.c \
 		Pixmap.c Pointer.c Screen.c Visual.c Window.c \
-		stubs.c miinitext.c \
-		fbcmap_mi.c
+		stubs.c miinitext.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xnest \
 		-I${DESTDIR}${X11INCDIR}/X11 \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun

2020-08-04 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Tue Aug  4 14:31:58 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun

Log Message:
Specify default /var/log/Xsun.%s.log path definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.4
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3	Fri Jul 24 02:25:58 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Tue Aug  4 14:31:58 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $
+#	$NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $
 
 .include 
 
@@ -13,6 +13,7 @@ WARNS?=	2
 .PATH:	${X11SRCDIR.xorg-server}/hw/sun
 
 BUILDSYMLINKS=
+CPPFLAGS+=	-DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
 CPPFLAGS+=	-DINCLUDE_CG2_HEADER
 #CPPFLAGS+=	-DLOWMEMFTPT

CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun

2020-07-23 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Fri Jul 24 02:25:58 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun

Log Message:
Explicitly disable dbe, record, and present DIX extentions.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2	Thu Jul 23 09:59:36 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Fri Jul 24 02:25:58 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
+#	$NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $
 
 .include 
 
@@ -73,11 +73,10 @@ SRCS+=  stubs.c
 SRCS+=	fbcmap_mi.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/sun \
-		-I${DESTDIR}${X11INCDIR}/xorg \
 		${X11INCS.DIX}
 
 CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
-
+CPPFLAGS+=	-UDBE -UXRECORD -UPRESENT
 CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
 		-UXF86DRI -UXF86BIGFONT
 
@@ -90,9 +89,7 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xkbstubs} \
 	${LDADD.randr} \
 	${LDADD.Xext} \
-	${LDADD.dbe} \
 	${LDADD.composite} \
-	${LDADD.record} \
 	${LDADD.render} \
 	${LDADD.os} \
 	${LDADD.xfixes} \
@@ -100,7 +97,6 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.miext/damage} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
-	${LDADD.present} \
 	-lXfont2 \
 	-lpixman-1 \
 	-lX11 \
@@ -113,9 +109,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xkb} \
 	${DPADD.randr} \
 	${DPADD.Xext} \
-	${DPADD.dbe} \
 	${DPADD.composite} \
-	${DPADD.record} \
 	${DPADD.render} \
 	${DPADD.os} \
 	${DPADD.xfixes} \
@@ -123,10 +117,8 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.miext/damage} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
-	${DPADD.present} \
 	${LIBXFONT2} \
 	${LIBPIXMAN-1} \
-	${LIBXEXT} \
 	${LIBX11} \
 	${LIBZ} \
 	${LIBM}

CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun

2020-07-23 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Jul 23 09:59:36 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun

Log Message:
fix build:
- add .../xorg subdir to the path
- add dbe and present extensions, both wanted via linkage

.. but maybe these shouldn't be built?  they're not in sets.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1	Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Thu Jul 23 09:59:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+#	$NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
 
 .include 
 
@@ -73,6 +73,7 @@ SRCS+=  stubs.c
 SRCS+=	fbcmap_mi.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/sun \
+		-I${DESTDIR}${X11INCDIR}/xorg \
 		${X11INCS.DIX}
 
 CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
@@ -89,6 +90,7 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xkbstubs} \
 	${LDADD.randr} \
 	${LDADD.Xext} \
+	${LDADD.dbe} \
 	${LDADD.composite} \
 	${LDADD.record} \
 	${LDADD.render} \
@@ -98,9 +100,9 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.miext/damage} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
+	${LDADD.present} \
 	-lXfont2 \
 	-lpixman-1 \
-	-lXext \
 	-lX11 \
 	-lz \
 	-lm
@@ -111,6 +113,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xkb} \
 	${DPADD.randr} \
 	${DPADD.Xext} \
+	${DPADD.dbe} \
 	${DPADD.composite} \
 	${DPADD.record} \
 	${DPADD.render} \
@@ -120,6 +123,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.miext/damage} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
+	${DPADD.present} \
 	${LIBXFONT2} \
 	${LIBPIXMAN-1} \
 	${LIBXEXT} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2020-07-22 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Wed Jul 22 21:25:03 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Reorganize CPPFLAGS.

- use ${X11INCS.DIX} in 
- explicitly undef HAVE_XORG_CONFIG_H to avoid reference to
  hw/xfree86/common in mi/miinitext.c
- remove -DHAVE_DIX_CONFIG_H which is already defined in
  ${X11FLAGS.DIX} and pulled via Makefile.servermod

XXX: -DHAVE_STRCASECMP should also be moved to ${X11FLAGS.DIX},
 or should be pulled via include/dix-config.h?


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7	Sat Jul 18 16:07:15 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Wed Jul 22 21:25:03 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
 
 .include 
 
@@ -28,20 +28,13 @@ SRCS+=	miinitext.c
 .PATH:	${X11SRCDIR.xorg-server}/fb
 SRCS+=	fbcmap_mi.c
 
-CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
-		-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
-		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-		-I${X11SRCDIR.xorg-server}/fb \
-		-I${X11SRCDIR.xorg-server}/mi \
-		-I${X11SRCDIR.xorg-server}/render \
-		-I${X11SRCDIR.xorg-server}/present \
-		-I${X11SRCDIR.xorg-server}/miext/damage \
-		-I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+		${X11INCS.DIX}
 
 CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
 		-UXF86DRI -UXF86BIGFONT
 
-CPPFLAGS+=	-DHAVE_DIX_CONFIG_H
+CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
 CPPFLAGS+=	-DHAVE_STRCASECMP
 
 CPPFLAGS.x68kConfig.c=	 -DX11_LIBDIR=\"${X11ETCDIR}\"

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul 18 16:07:15 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Xorg 1.20 servers require libXfont2 instead of libXfont.

Per the following upstream commit:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7
 > dix: Switch to the libXfont2 API (v2)

Now Xorg 1.20 based X68k server builds and confirmed working on XM6i.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6	Sat Jul 18 15:26:30 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Sat Jul 18 16:07:15 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
 
 .include 
 
@@ -63,7 +63,7 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.miext/damage} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
-	-lXfont \
+	-lXfont2 \
 	-lpixman-1 \
 	-lXext \
 	-lX11 \
@@ -84,7 +84,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.miext/damage} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
-	${LIBXFONT} \
+	${LIBXFONT2} \
 	${LIBPIXMAN-1} \
 	${LIBXEXT} \
 	${LIBX11} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Jul 18 15:26:30 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Sync with xorg-server.old: No need to link miext/libshadow.a.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5	Thu Jan  3 23:26:58 2019
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Sat Jul 18 15:26:30 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
 
 .include 
 
@@ -61,7 +61,6 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xfixes} \
 	${LDADD.damageext} \
 	${LDADD.miext/damage} \
-	${LDADD.miext/shadow} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
 	-lXfont \
@@ -83,7 +82,6 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xfixes} \
 	${DPADD.damageext} \
 	${DPADD.miext/damage} \
-	${DPADD.miext/shadow} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
 	${LIBXFONT} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2019-01-03 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Jan  3 23:26:58 UTC 2019

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
XXX: add hw/xfree86/common to the include path.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.4	Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Thu Jan  3 23:26:58 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2018/12/31 11:14:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $
 
 .include 
 
@@ -30,6 +30,7 @@ SRCS+=	fbcmap_mi.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/fb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/render \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10

2018-12-31 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Mon Dec 31 21:38:53 UTC 2018

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile

Log Message:
find all headers.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9	Wed Jul 29 19:03:15 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile	Mon Dec 31 21:38:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/12/31 21:38:53 mrg Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -33,7 +33,8 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 		-I${DESTDIR}${X11INCDIR}/X11 \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${DESTDIR}${X11INCDIR}/pixman-1
+		-I${DESTDIR}${X11INCDIR}/pixman-1 \
+		-I${X11SRCDIR.xorg-server}/../include
 
 COPTS.xf86x86emu.c=	-Wno-error	# XXX?

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2016-11-21 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Mon Nov 21 08:09:54 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
no need to define HAVE_PCI_DEVICE_IS_BOOT_VGA with xorg-server 1.18.
libpciaccess, which provides pci_device_is_boot_vga, is always present.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.28 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.29
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.28	Sat Oct  8 20:08:57 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Mon Nov 21 08:09:54 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2016/10/08 20:08:57 mrg Exp $
+#	$NetBSD: Makefile,v 1.29 2016/11/21 08:09:54 snj Exp $
 
 .include 
 
@@ -85,8 +85,7 @@ CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FL
 		-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
 		-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org;' \
 		-DXVENDORNAME='"The X.Org Foundation"' \
-		-DHAVE_XORG_CONFIG_H \
-		-DHAVE_PCI_DEVICE_IS_BOOT_VGA
+		-DHAVE_XORG_CONFIG_H
 
 .if ${MACHINE_ARCH} == "i386"
 CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2016-09-02 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Fri Sep  2 11:38:01 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
More clang -Wno-error=


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.27
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26	Tue Aug 30 04:04:07 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Fri Sep  2 11:38:01 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2016/08/30 04:04:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.27 2016/09/02 11:38:01 jakllsch Exp $
 
 .include 
 
@@ -129,5 +129,7 @@ COPTS.xf86sbusBus.c=		-Wno-error=incompa
 COPTS.xf86Configure.c=		${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
 .endif
 
+COPTS.xf86pciBus.c=		${${ACTIVE_CC} == "clang":? -Wno-error=tautological-constant-out-of-range-compare :}
+
 .include 
 .include

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2016-08-30 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Aug 30 08:19:43 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
look for present and damage includes.
define HAVE_STRCASECMP and HAVE_DIX_CONFIG_H.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.2	Fri Nov  6 21:32:22 2015
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Tue Aug 30 08:19:43 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2015/11/06 21:32:22 szptvlfn Exp $
+#	$NetBSD: Makefile,v 1.3 2016/08/30 08:19:43 mrg Exp $
 
 .include 
 
@@ -36,11 +36,16 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/in
 		-I${X11SRCDIR.xorg-server}/fb \
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/render \
+		-I${X11SRCDIR.xorg-server}/present \
+		-I${X11SRCDIR.xorg-server}/miext/damage \
 		-I${DESTDIR}${X11INCDIR}/X11
 
 CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
 		-UXF86DRI -UXF86BIGFONT
 
+CPPFLAGS+=	-DHAVE_DIX_CONFIG_H
+CPPFLAGS+=	-DHAVE_STRCASECMP
+
 CPPFLAGS.x68kConfig.c=	 -DX11_LIBDIR=\"${X11ETCDIR}\"
 
 .include "../../../Makefile.Xserver"

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2016-08-29 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Aug 30 04:04:07 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
apply some more -Wno-error=discarded-qualifiers


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.26
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.25	Fri Aug 19 19:10:54 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Tue Aug 30 04:04:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.25 2016/08/19 19:10:54 mrg Exp $
+#	$NetBSD: Makefile,v 1.26 2016/08/30 04:04:07 mrg Exp $
 
 .include 
 
@@ -125,6 +125,9 @@ CPPFLAGS.xf86AutoConfig.c=	-DPROJECTROOT
 -DIDRIVERS='"${IDRIVERS}"'
 
 COPTS.xf86sbusBus.c=		-Wno-error=incompatible-pointer-types
+.if ${HAVE_GCC:U0} > 48
+COPTS.xf86Configure.c=		${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+.endif
 
 .include 
 .include

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2016-08-18 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Aug 18 18:40:23 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
apply some more -Wno-error for the const char *name vs mode issue


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.23 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.24
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.23	Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Thu Aug 18 18:40:23 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2016/08/14 03:43:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.24 2016/08/18 18:40:23 mrg Exp $
 
 .include 
 
@@ -126,6 +126,7 @@ CPPFLAGS.xf86AutoConfig.c=	-DPROJECTROOT
 
 COPTS.xf86AutoConfig.c=		-Wno-error
 COPTS.xf86Config.c=		-Wno-error
+COPTS.xf86Configure.c=		-Wno-error
 COPTS.xf86Cursor.c=		-Wno-error
 COPTS.xf86RandR.c=		-Wno-error
 COPTS.xf86Helper.c=		-Wno-error

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2016-08-16 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 19:09:48 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
remove obsolete code, and adjust for new amd64 iopl usage.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.45
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.44	Sun Aug 14 03:43:05 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Tue Aug 16 19:09:48 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.44 2016/08/14 03:43:05 mrg Exp $
+#	$NetBSD: Makefile,v 1.45 2016/08/16 19:09:48 mrg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -25,8 +25,11 @@ SRCS.bsd+=	i386_video.c lnx_agp.c
 .for _FN in ${SRCS.bsd}
 .if ${MACHINE_ARCH} == "i386"
 CPPFLAGS.${_FN}+=	-DPCCONS_SUPPORT -DHAS_APERTURE_DRV
+CPPFLAGS.${_FN}+=	-DUSE_I386_IOPL
+.else
+CPPFLAGS.${_FN}+=	-DUSE_AMD64_IOPL
 .endif
-CPPFLAGS.${_FN}+=	-DUSE_I386_IOPL -DPCVT_SUPPORT -DWSCONS_SUPPORT \
+CPPFLAGS.${_FN}+=	-DPCVT_SUPPORT -DWSCONS_SUPPORT \
 			-DUSESTDRES -DHAVE_SYSV_IPC \
 			-DHAS_MTRR_BUILTIN
 .endfor
@@ -125,14 +128,6 @@ SRCS.bus+=	Pci.c
 #CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
 .endif
 
-# XXX .S not built from automake either
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SRCS.misc+=	CBUSmemcpy.c CIODelay.c CSlowBcopy.c
-#CPPFLAGS.BUSmemcpy.S=	-DUSE_GAS
-#CPPFLAGS.IODelay.S=	-DUSE_GAS
-#CPPFLAGS.SlowBcopy.S=	-DUSE_GAS
-.endif
-
 .if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
 	${MACHINE} == "sgimips" || ${MACHINE_ARCH} == "sparc64" || \
 	${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
@@ -148,11 +143,6 @@ SRCS.bus+=	nobus.c
 .PATH:		${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc
 SRCS.misc+= SlowBcopy.c
 
-# XXX namespace collision so avoid it, only has to be done for non-i386.
-#BUILDSYMLINKS=	BUSmemcpy.c CBUSmemcpy.c \
-#		IODelay.c CIODelay.c \
-#		SlowBcopy.c CSlowBcopy.c
-
 SRCS=	${SRCS.bsd} ${SRCS.bus} ${SRCS.misc}
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb

2016-08-16 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Aug 16 18:20:38 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb: Makefile

Log Message:
find and include xorg-config.h.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile:1.4	Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile	Tue Aug 16 18:20:38 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/16 18:20:38 mrg Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -19,7 +19,9 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${X11SRCDIR.xorg-server}/render \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions
+		-I${DESTDIR}${X11INCDIR}/X11/extensions \
+		-DHAVE_XORG_CONFIG_H \
+		-I${X11SRCDIR.xorg-server}/../include
 
 .include 
 LIBDIR=	${XMODULEDIR}

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg

2016-08-12 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Fri Aug 12 20:45:05 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile

Log Message:
fix a edit-o in the previous, pointed out by richard@.  thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.10	Fri Aug 12 01:15:49 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Fri Aug 12 20:45:05 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2016/08/12 01:15:49 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2016/08/12 20:45:05 mrg Exp $
 
 .include 
 
@@ -46,7 +46,7 @@ LDADD+=	${LDADD.mi}
 LDADD+=	${LDADD.xfixes}
 LDADD+=	${LDADD.Xext/Xextbuiltin}
 LDADD+=	${LDADD.render}
-eDADD+=	${LDADD.randr}
+LDADD+=	${LDADD.randr}
 LDADD+=	${LDADD.damageext}
 LDADD+=	${LDADD.miext/damage}
 LDADD+=	${LDADD.miext/shadow}

CVS commit: src/external/mit/xorg/server/xorg-server/hw

2016-06-29 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jun 29 19:36:56 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile

Log Message:
Fix MKCRYPTO=no build.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11	Tue Aug  2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile	Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2016/06/29 19:36:56 christos Exp $
 
 .include 
 
@@ -81,8 +81,7 @@ LDADD+=	${LDADD.dix} \
 	-lpixman-1 \
 	-lXdmcp \
 	-lz \
-	-lm \
-	-lcrypto
+	-lm
 
 DPADD+=	${DPADD.dix} \
 	${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+=	${DPADD.dix} \
 	${LIBPIXMAN1} \
 	${LIBXDMCP} \
 	${LIBZ} \
-	${LIBM} \
-	${LIBCRYPTO}
+	${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=	-li386

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7	Thu Jul 23 04:03:25 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2015/07/23 08:03:25 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2016/06/29 19:36:56 christos Exp $
 
 .include 
 
@@ -62,7 +62,6 @@ LDADD+=	${LDADD.hw/xfree86/dixmods/fb}
 LDADD+=	${LDADD.hw/xfree86/dixmods/xorgxkb}
 LDADD+=	-lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
 LDADD+=	-lpciaccess -ldrm
-LDADD+=	-lcrypto
 LDADD+=	-Wl,--no-whole-archive
 
 .if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.hw/xfree86/i2c} \
 	${LIBCWRAPPER} \
 	${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
-	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
-	${LIBCRYPTO}
+	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 SYMLINKS=	${X11BINDIR}/Xorg ${X11BINDIR}/X
 

Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14	Tue Aug  2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile	Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2016/06/29 19:36:56 christos Exp $
 
 .include 
 
@@ -71,7 +71,7 @@ LDADD+=	${LDADD.dix} \
 	${LDADD.glx} \
 	-lXfont -lXext -lfontenc \
 	-lpixman-1 -lX11 -lXau \
-	-lXdmcp -lfreetype -lm -lcrypto
+	-lXdmcp -lfreetype -lm
 
 DPADD+=	${LDADD.dix} \
 	${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+=	${LDADD.dix} \
 	${DPADD.glx} \
 	${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
 	${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
-	${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+	${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
 
 .if ${MACHINE_ARCH} == "i386"
 LDADD+=	-li386

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2016-02-28 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Feb 28 15:15:42 UTC 2016

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
Don't claim too much about empty loops, the SYSCALL macro is kind of
obnoxious like that...


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.40 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.41
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.40	Wed Nov  4 17:06:23 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Sun Feb 28 15:15:42 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.40 2015/11/04 17:06:23 phx Exp $
+#	$NetBSD: Makefile,v 1.41 2016/02/28 15:15:42 joerg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -168,5 +168,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 CPPFLAGS+=	${X11FLAGS.DRI}
 .endif
 
+CWARNFLAGS.clang+=	-Wno-error=empty-body
+
 .include 
 .include

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10

2015-07-29 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Wed Jul 29 19:03:15 UTC 2015

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile

Log Message:
Don't use NO_SYS_HEADERS because sys/types.h is not included when you
do that before the typedefs in /usr/xsrc/external/mit/xorg-server/dist/hw/\
xfree86/x86emu/x86emu/types.h, and then some source files include
sys/types.h leading to uint redefinitions.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.8	Thu Aug 11 19:15:41 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile	Wed Jul 29 15:03:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -12,7 +12,7 @@ SRCS=		x86emu.c generic.c xf86x86emu.c x
 		helper_exec.c xf86int10module.c
 
 CPPFLAGS+=	-D__DRIVER__ -DFORCE_POST -D_CEXPORT= -DNO_LONG_LONG \
-		-D_X86EMU -DNO_SYS_HEADERS
+		-D_X86EMU
 
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
 CPPFLAGS+=	-D_PC

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2

2014-08-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Aug 10 14:50:21 UTC 2014

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile

Log Message:
add missing COMPOSITE define


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.6	Tue Nov 23 08:22:32 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile	Sun Aug 10 14:50:21 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/23 08:22:32 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/10 14:50:21 jmcneill Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
 
@@ -33,6 +33,7 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw
 		-I${X11SRCDIR.xorg-server}/../include
 
 CPPFLAGS+=	-DXF86DRI \
+		-DCOMPOSITE \
 		${X11FLAGS.DIX}
 
 LIBDPLIBS=	drm ${.CURDIR}/../../../../../lib/libdrm

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg

2014-04-02 Thread Taylor R Campbell

Module Name:src
Committed By:   riastradh
Date:   Thu Apr  3 02:40:45 UTC 2014

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile

Log Message:
Link Xorg with -lpthread on x86.

This will be needed by the new xf86-video-intel, which uses pthreads
in SNA (SandyBridge New Acceleration).  It shouldn't hurt, but is not
needed, on any other architecture.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.5	Wed Oct  3 21:50:14 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Thu Apr  3 02:40:45 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2012/10/03 21:50:14 gsutre Exp $
+#	$NetBSD: Makefile,v 1.6 2014/04/03 02:40:45 riastradh Exp $
 
 .include bsd.own.mk
 
@@ -77,6 +77,12 @@ LDADD+=	-lalpha
 DPADD+=	${LIBALPHA}
 .endif
 
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+# Needed by current xf86-video-intel for SNA.
+LDADD+=	-lpthread
+DPADD+=	${LIBPTHREAD}
+.endif
+
 LDADD+=	-lm
 
 DPADD+=	${DPADD.dix} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2014-03-01 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar  1 19:39:04 UTC 2014

Added Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Add a reachover Makefile to build X11R7'fied MD X68k server.

See my post on port-x68k@ for details:
http://mail-index.netbsd.org/port-x68k/2014/02/27/msg43.html


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.1
--- /dev/null	Sat Mar  1 19:39:04 2014
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Sat Mar  1 19:39:03 2014
@@ -0,0 +1,94 @@
+#	$NetBSD: Makefile,v 1.1 2014/03/01 19:39:03 tsutsui Exp $
+
+.include bsd.own.mk
+
+PROG=		X68k
+BINMODE=	4711
+
+SYMLINKS=	${X11BINDIR}/X68k ${X11BINDIR}/X
+
+FILES=		X68kConfig
+FILESDIR=	${X11ETCDIR}
+
+.include ../../../Makefile.serverlib
+.include ../../../Makefile.servermod
+
+WARNS?=	2
+
+.PATH:	${X11SRCDIR.xorg-server}/hw/netbsd/x68k
+SRCS=	x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \
+	x68kFb.c x68kGraph.c x68kText.c
+
+.PATH:	${X11SRCDIR.xorg-server}/Xext
+SRCS+=	dpmsstubs.c
+
+.PATH:	${X11SRCDIR.xorg-server}/Xi
+SRCS+=	stubs.c
+
+.PATH:	${X11SRCDIR.xorg-server}/mi
+SRCS+=	miinitext.c
+
+.PATH:	${X11SRCDIR.xorg-server}/fb
+SRCS+=	fbcmap_mi.c
+
+CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
+		-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+		-I${X11SRCDIR.xorg-server}/fb \
+		-I${X11SRCDIR.xorg-server}/mi \
+		-I${X11SRCDIR.xorg-server}/render \
+		-I${DESTDIR}${X11INCDIR}/X11 \
+
+CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+		-UXF86DRI -UXF86BIGFONT
+
+CPPFLAGS.x68kConfig.c=	 -DX11_LIBDIR=\${X11ETCDIR}\
+
+.include ../../../Makefile.Xserver
+
+LDADD+= ${LDADD.dix} \
+	${LDADD.fb} \
+	${LDADD.mi} \
+	${LDADD.xkb} \
+	${LDADD.xkbstubs} \
+	${LDADD.randr} \
+	${LDADD.Xext} \
+	${LDADD.composite} \
+	${LDADD.render} \
+	${LDADD.os} \
+	${LDADD.xfixes} \
+	${LDADD.damageext} \
+	${LDADD.miext/damage} \
+	${LDADD.miext/shadow} \
+	${LDADD.miext/sync} \
+	${LDADD.Xi} \
+	-lXfont \
+	-lpixman-1 \
+	-lXext \
+	-lX11 \
+	-lz \
+	-lm
+
+DPADD+= ${LDADD.dix} \
+	${DPADD.fb} \
+	${DPADD.mi} \
+	${DPADD.xkb} \
+	${DPADD.randr} \
+	${DPADD.Xext} \
+	${DPADD.composite} \
+	${DPADD.render} \
+	${DPADD.os} \
+	${DPADD.xfixes} \
+	${DPADD.damageext} \
+	${DPADD.miext/damage} \
+	${DPADD.miext/shadow} \
+	${DPADD.miext/sync} \
+	${DPADD.Xi} \
+	${LIBXFONT} \
+	${LIBPIXMAN-1} \
+	${LIBXEXT} \
+	${LIBX11} \
+	${LIBZ} \
+	${LIBM}
+
+.include bsd.x11.mk
+.include bsd.prog.mk

CVS commit: src/external/mit/xorg/server/xorg-server/hw

2014-03-01 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Sat Mar  1 19:45:29 UTC 2014

Modified Files:
src/external/mit/xorg/server/xorg-server/hw: Makefile

Log Message:
Enable SUBDIR+=netbsd/x68k if ${XSERVER_X68K} != no.

Now we've got it after this glue Makefile was initially added back in 2008.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/hw/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/Makefile:1.4	Sat Feb 14 10:46:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/Makefile	Sat Mar  1 19:45:29 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/02/14 10:46:06 abs Exp $
+#	$NetBSD: Makefile,v 1.5 2014/03/01 19:45:29 tsutsui Exp $
 
 .include ../Makefile.common
 
@@ -7,11 +7,11 @@ SUBDIR= xnest vfb
 SUBDIR+= xfree86
 .endif
 
-.if 0
 .if ${XSERVER_X68K} != no
 SUBDIR+=netbsd/x68k
 .endif
 
+.if 0
 .if ${XSERVER_XALPHANETBSD} != no
 SUBDIR+=netbsd/alpha
 .endif

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2014-01-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Jan 10 15:50:34 UTC 2014

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
don't include bsd.sys.mk


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.19 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.20
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.19	Fri Jan 10 10:00:16 2014
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Fri Jan 10 10:50:34 2014
@@ -1,7 +1,6 @@
-#	$NetBSD: Makefile,v 1.19 2014/01/10 15:00:16 martin Exp $
+#	$NetBSD: Makefile,v 1.20 2014/01/10 15:50:34 christos Exp $
 
 .include bsd.own.mk # prerequisite for bsd.sys.mk
-.include bsd.sys.mk # for HOST_SH
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2013-11-26 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Wed Nov 27 02:04:48 UTC 2013

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
Add (hopefully temporary) kludge to define PCI_MAGIC_IO_RANGE on shark and
make accelerated X work again.
This used to be defined in machine/param.h but lately the param.h from
arch/arm is installed in machine/ instead of the one from arch/shark, so the
Xserver didn't see PCI_MAGIC_IO_RANGE and couldn't figure out how to map its
IO space.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.36
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35	Thu Feb 28 13:28:36 2013
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Wed Nov 27 02:04:48 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.35 2013/02/28 13:28:36 macallan Exp $
+#	$NetBSD: Makefile,v 1.36 2013/11/27 02:04:48 macallan Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -77,6 +77,10 @@ CPPFLAGS.${_FN}=-DWSCONS_SUPPORT
 .endfor
 .endif
 
+.if ${MACHINE} == shark
+CPPFLAGS.ppc_video.c += -DPCI_MAGIC_IO_RANGE=0xf000
+.endif
+
 .if ${MACHINE} == dreamcast || \
 ${MACHINE} == hpcsh
 SRCS.bsd+=	ppc_video.c pm_noop.c agp_noop.c

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2013-02-28 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 28 13:28:36 UTC 2013

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
set PCVT_SUPPORT on MIPS


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.34 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.35
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.34	Thu Feb 14 16:16:25 2013
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Thu Feb 28 13:28:36 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2013/02/14 16:16:25 macallan Exp $
+#	$NetBSD: Makefile,v 1.35 2013/02/28 13:28:36 macallan Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -61,7 +61,7 @@ CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DPCVT
 ${MACHINE} == evbmips
 SRCS.bsd+=	ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DPCVT_SUPPORT  -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2013-02-14 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Feb 14 16:16:25 UTC 2013

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
set -DPCVT_SUPPORT on most hardware


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.33 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.34
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.33	Mon May 14 08:42:04 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Thu Feb 14 16:16:25 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2012/05/14 08:42:04 abs Exp $
+#	$NetBSD: Makefile,v 1.34 2013/02/14 16:16:25 macallan Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -35,11 +35,8 @@ CPPFLAGS.${_FN}+=	-DUSE_I386_IOPL -DPCVT
 .if ${MACHINE} == macppc || ${MACHINE} == prep || ${MACHINE} == bebox || ${MACHINE} == ofppc
 SRCS.bsd+=	ppc_video.c pm_noop.c lnx_agp.c
 .for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
-.if ${MACHINE} == ofppc
-CPPFLAGS.${_FN}+=	-DPCVT_SUPPORT
-.endif
 .endif
 
 .if ${MACHINE_ARCH} == alpha
@@ -53,7 +50,7 @@ CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSES
 SRCS.bsd+=	ppc_video.c pm_noop.c agp_noop.c
 SRCS.bus+=	netbsdSbus.c
 .for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif
 
@@ -76,10 +73,7 @@ CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSES
 ${MACHINE} == zaurus
 SRCS.bsd+=  ppc_video.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
-.if ${MACHINE} == cats
-CPPFLAGS.${_FN}+=	-DPCVT_SUPPORT
-.endif
+CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DPCVT_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader

2012-03-26 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Mar 27 00:36:07 UTC 2012

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile

Log Message:
Use :Q for quoting. Execute shell script using the host shell.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.11	Sat Mar 17 12:42:31 2012
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile	Tue Mar 27 00:36:06 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2012/03/17 12:42:31 nakayama Exp $
+#	$NetBSD: Makefile,v 1.12 2012/03/27 00:36:06 joerg Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -48,10 +48,10 @@ CPPFLAGS.sdksyms.c=	${X11FLAGS.EXTENSION
 #COPTS.sdksyms.c=		-Wno-error
 COPTS.loadmod.c=		-Wno-error
 
-.include bsd.x11.mk
-.include bsd.lib.mk
-
 sdksyms.c: sdksyms.sh
-	CPP='$(CPP)' AWK='$(TOOL_AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+	CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
 sdksyms.d: sdksyms.c
 CLEANFILES+=	sdksyms.c
+
+.include bsd.x11.mk
+.include bsd.lib.mk

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg

2011-10-22 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Oct 22 14:40:41 UTC 2011

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile

Log Message:
DPADD hw/xfree86/common


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.3	Tue Aug  2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Sat Oct 22 14:40:41 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 2011/10/22 14:40:41 jmcneill Exp $
 
 .include bsd.own.mk
 
@@ -102,6 +102,7 @@ DPADD+=	${DPADD.dix} \
 	${DPADD.hw/xfree86/dixmods/fb} \
 	${DPADD.hw/xfree86/fb} \
 	${DPADD.hw/xfree86/init} \
+	${DPADD.hw/xfree86/common} \
 	${DPADD.hw/xfree86/loader} \
 	${DPADD.hw/xfree86/xf86config} \
 	${DPADD.hw/xfree86/dixmods} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2011-04-13 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Wed Apr 13 16:18:14 UTC 2011

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
pass ${MACHINE} as -D__whatever so we can have arch-specific defaults


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.17	Mon Feb 21 04:42:16 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Wed Apr 13 16:18:14 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2011/02/21 04:42:16 mrg Exp $
+#	$NetBSD: Makefile,v 1.18 2011/04/13 16:18:14 macallan Exp $
 
 .include bsd.sys.mk # for HOST_SH
 
@@ -75,7 +75,8 @@
 		-I${X11SRCDIR.xorg-server}/render \
 		-I${X11SRCDIR.xorg-server}/randr \
 		-I. \
-		-I${X11SRCDIR.xorg-server}/../include
+		-I${X11SRCDIR.xorg-server}/../include \
+		-D__${MACHINE}
 
 CPPFLAGS+=	${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
 		${X11FLAGS.DIX} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86

2011-03-28 Thread Iain Hibbert

Module Name:src
Committed By:   plunky
Date:   Mon Mar 28 10:08:06 UTC 2011

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile

Log Message:
move building of Xorg server into a SUBDIR since it is created from
the other subdir contents, ok by mrg@

(this makes make all and make dependall do the same thing)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.31 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.32
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.31	Sun Mar  6 22:15:30 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile	Mon Mar 28 10:08:06 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2011/03/06 22:15:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.32 2011/03/28 10:08:06 plunky Exp $
 
 SUBDIR=		common init ddc dixmods doc dri dri2 i2c loader \
 		xf86modes exa \
@@ -11,131 +11,6 @@
 
 SUBDIR+=	.WAIT utils
 
-.include bsd.own.mk
+SUBDIR+=	.WAIT Xorg
 
-.include ../../Makefile.Xserver
-
-PROG=		Xorg
-BINMODE=	4711
-
-.PATH:		${X11SRCDIR.xorg-server}/hw/xfree86
-SRCS=		xorg.c libxorg.c
-
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${X11SRCDIR.xc}/include/fonts \
-		-I${X11SRCDIR.xorg-server}/fb \
-		-I${X11SRCDIR.xorg-server}/mi \
-		-I${X11SRCDIR.xorg-server}/include \
-		-I${X11SRCDIR.xorg-server}/os \
-		-I${X11SRCDIR.xorg-server}/Xext \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
-		-I${DESTDIR}${X11INCDIR}/pixman-1 \
-		-I${DESTDIR}${X11INCDIR}/xorg \
-		-I${X11SRCDIR.xorg-server}/render \
-		-DHAVE_DIX_CONFIG_H
-
-CPPFLAGS+=	${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
-		${X11FLAGS.EXTENSION}
-
-LDFLAGS+=	-rdynamic
-
-LDADD+=	-Wl,--whole-archive
-LDADD+=	${LDADD.dix}
-LDADD+=	${LDADD.hw/xfree86/init}
-LDADD+=	${LDADD.config}
-LDADD+=	${LDADD.hw/xfree86/loader}
-LDADD+=	${LDADD.hw/xfree86/common}
-LDADD+=	${LDADD.hw/xfree86/xorgos}
-#LDADD+=	${LDADD.osandcommon}
-LDADD+=	${LDADD.hw/xfree86/xf86config}
-LDADD+=	${LDADD.hw/xfree86/dixmods}
-LDADD+=	${LDADD.hw/xfree86/xf86modes}
-LDADD+=	${LDADD.hw/xfree86/ramdac}
-LDADD+=	${LDADD.hw/xfree86/ddc}
-LDADD+=	${LDADD.hw/xfree86/i2c}
-LDADD+=	${LDADD.composite}
-LDADD+=	${LDADD.mi}
-LDADD+=	${LDADD.xfixes}
-LDADD+=	${LDADD.Xext/Xextbuiltin}
-LDADD+=	${LDADD.render}
-LDADD+=	${LDADD.randr}
-LDADD+=	${LDADD.damageext}
-LDADD+=	${LDADD.miext/damage}
-LDADD+=	${LDADD.miext/shadow}
-LDADD+=	${LDADD.miext/cw}
-LDADD+=	${LDADD.Xi}
-LDADD+=	${LDADD.xkb}
-LDADD+=	${LDADD.os}
-LDADD+=	${LDADD.glx}
-LDADD+=	${LDADD.hw/xfree86/dri}
-LDADD+=	${LDADD.hw/xfree86/dixmods/fb}
-LDADD+=	${LDADD.hw/xfree86/dixmods/xorgxkb}
-LDADD+=	-lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
-LDADD+=	-lpciaccess -ldrm
-LDADD+=	-lcrypto
-LDADD+=	-Wl,--no-whole-archive
-
-.if ${MACHINE_ARCH} == i386
-LDADD+=	-li386
-DPADD+=	${LIBI386}
-.elif ${MACHINE_ARCH} == x86_64
-LDADD+=	-lx86_64
-DPADD+=	${LIBX86_64}
-.elif ${MACHINE_ARCH} == alpha
-LDADD+=	-lalpha
-DPADD+=	${LIBALPHA}
-.endif
-
-LDADD+=	-lm
-
-DPADD+=	${DPADD.dix} \
-	${DPADD.fb} \
-	${DPADD.mi} \
-	${DPADD.xfixes} \
-	${DPADD.Xext} \
-	${DPADD.config} \
-	${DPADD.dbe} \
-	${DPADD.record} \
-	${DPADD.render} \
-	${DPADD.randr} \
-	${DPADD.damageext} \
-	${DPADD.miext/damage} \
-	${DPADD.miext/shadow} \
-	${DPADD.miext/cw} \
-	${DPADD.Xi} \
-	${DPADD.xkb} \
-	${DPADD.composite} \
-	${DPADD.os} \
-	${DPADD.glx} \
-	${DPADD.hw/xfree86/dri} \
-	${DPADD.hw/xfree86/dixmods/fb} \
-	${DPADD.hw/xfree86/fb} \
-	${DPADD.hw/xfree86/init} \
-	${DPADD.hw/xfree86/loader} \
-	${DPADD.hw/xfree86/xf86config} \
-	${DPADD.hw/xfree86/dixmods} \
-	${DPADD.hw/xfree86/xf86modes} \
-	${DPADD.hw/xfree86/ramdac} \
-	${DPADD.hw/xfree86/ddc} \
-	${DPADD.hw/xfree86/i2c} \
-	${LIBCWRAPPER} \
-	${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
-	${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
-	${LIBCRYPTO}
-
-SYMLINKS=	${X11BINDIR}/Xorg ${X11BINDIR}/X
-
-# XXX
-#Xorg.1: Xorg.man.pre
-#	cp ${.ALLSRC} ${.TARGET}
-MKMAN=	no
-
-FILES=		xorg-server.m4
-FILESDIR=	${X11ROOTDIR}/share/aclocal
-
-.PATH:		${X11SRCDIR.xorg-server}
-
-.include bsd.x11.mk
-.include bsd.prog.mk
 .include bsd.subdir.mk
-.include bsd.files.mk

Added files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.1
--- /dev/null	Mon Mar 28 10:08:06 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile	Mon Mar 28 10:08:06 2011
@@ -0,0

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86

2011-02-20 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Mon Feb 21 04:42:17 UTC 2011

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
define PCVT_SUPPORT ofppc anywhere other ppc platforms do.
part of the way to getting xorg working on ofppc.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.7 -r1.8 \

src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16	Sat Jan 22 15:21:37 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Mon Feb 21 04:42:16 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2011/01/22 15:21:37 cegger Exp $
+#	$NetBSD: Makefile,v 1.17 2011/02/21 04:42:16 mrg Exp $
 
 .include bsd.sys.mk # for HOST_SH
 
@@ -90,7 +90,7 @@
 CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT
 .endif
 
-.if ${MACHINE} == cats
+.if ${MACHINE} == cats || ${MACHINE} == ofppc
 CPPFLAGS+=	-DPCVT_SUPPORT
 .endif
 

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.7	Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile	Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
+#	$NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
 
 .include bsd.sys.mk # for HOST_SH
 
@@ -51,7 +51,7 @@
 CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT
 .endif
 
-.if ${MACHINE} == cats
+.if ${MACHINE} == cats || ${MACHINE} == ofppc
 CPPFLAGS+=	-DPCVT_SUPPORT
 .endif
 

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14	Sun Aug  1 06:24:31 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile	Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2010/08/01 06:24:31 kiyohara Exp $
+#	$NetBSD: Makefile,v 1.15 2011/02/21 04:42:17 mrg Exp $
 
 SUBDIR=	cvt gtf
 #SUBDIR=	cvt gtf xorgconfig
@@ -10,7 +10,8 @@
 .if ${MACHINE} == cats || ${MACHINE} == macppc || \
 ${MACHINE} == netwinder || ${MACHINE_ARCH} == sparc || \
 ${MACHINE_ARCH} == sparc64 || ${MACHINE_ARCH} == alpha || \
-${MACHINE} == prep || ${MACHINE} == bebox
+${MACHINE} == prep || ${MACHINE} == bebox || \
+${MACHINE} == ofppc
 #SUBDIR+=pcitweak scanpci
 .endif
 

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.7	Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile	Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
+#	$NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
 
 .include bsd.own.mk
 
@@ -22,7 +22,7 @@
 		-DFILEMANSUFFIX=\5\ \
 		-DXVERSIONSTRING=\1.4.2\
 
-.if ${MACHINE_ARCH} == i386 || ${MACHINE} == cats
+.if ${MACHINE_ARCH} == i386 || ${MACHINE} == cats || ${MACHINE} == ofppc
 CPPFLAGS+=	-DPCVT_SUPPORT
 .endif
 

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.27 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.28
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.27

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/common

2011-01-22 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Sat Jan 22 15:21:37 UTC 2011

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile

Log Message:
Define HAVE_PCI_DEVICE_IS_BOOT_VGA.
Makes Xorg use of pci_device_is_boot_vga.

First discussed with macallan@ then public on tech-kern@ and tech-x11@


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.15	Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile	Sat Jan 22 15:21:37 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2010/11/29 09:34:41 skrll Exp $
+#	$NetBSD: Makefile,v 1.16 2011/01/22 15:21:37 cegger Exp $
 
 .include bsd.sys.mk # for HOST_SH
 
@@ -83,7 +83,8 @@
 		-D__XSERVERNAME__='Xorg' -D__XCONFIGFILE__='xorg.conf' \
 		-D__VENDORDWEBSUPPORT__='http://wiki.X.Org;' \
 		-DXVENDORNAME='The X.Org Foundation' \
-		-DHAVE_XORG_CONFIG_H
+		-DHAVE_XORG_CONFIG_H \
+		-DHAVE_PCI_DEVICE_IS_BOOT_VGA
 
 .if ${MACHINE_ARCH} == i386
 CPPFLAGS+=	-DPCCONS_SUPPORT -DPCVT_SUPPORT

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10

2011-01-05 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Jan  6 03:29:12 UTC 2011

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile

Log Message:
define NO_LEGACY_VGA on macppc and sparc64
May be necessary on other ports as well that have PCI but never use VGA text
mode.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.6	Thu Nov 25 16:02:02 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile	Thu Jan  6 03:29:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/25 16:02:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/01/06 03:29:12 macallan Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -18,6 +18,11 @@
 CPPFLAGS+=	-D_PC
 .endif
 
+# do not muck around in IO space trying to enable / disable non-PCI VGAs
+.if ${MACHINE} == macppc || ${MACHINE} == sparc64
+CPPFLAGS+=	-DNO_LEGACY_VGA
+.endif
+
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader

2010-12-05 Thread Adam Ciarcinski

Module Name:src
Committed By:   adam
Date:   Sun Dec  5 15:57:40 UTC 2010

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile

Log Message:
Fix building on case-insensitive file-system.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8	Tue Nov 23 10:19:55 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile	Sun Dec  5 15:57:40 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2010/11/23 10:19:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2010/12/05 15:57:40 adam Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -29,7 +29,6 @@
 		-I${X11SRCDIR.xorg-server}/mi \
 		-I${X11SRCDIR.xorg-server}/xfixes \
 		-I${DESTDIR}${X11INCDIR}/X11 \
-		-I${DESTDIR}${X11INCDIR}/X11/extensions \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${DESTDIR}${X11INCDIR}/xorg

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10

2010-11-25 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Nov 25 16:02:02 UTC 2010

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile

Log Message:
avoid i386 compile errors due to CARD32 lossage.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.5	Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile	Thu Nov 25 16:02:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/25 16:02:02 mrg Exp $
 
 XMODULEDIR=	${X11USRLIBDIR}/modules
 
@@ -30,6 +30,8 @@
 		-I${DESTDIR}${X11INCDIR}/xorg \
 		-I${DESTDIR}${X11INCDIR}/pixman-1
 
+COPTS.xf86x86emu.c=	-Wno-error	# XXX?
+
 .include bsd.x11.mk
 LIBDIR=	${XMODULEDIR}
 .include bsd.lib.mk

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader

2010-11-23 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Nov 23 10:19:55 UTC 2010

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile

Log Message:
add an include for sbus.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.7	Tue Nov 23 08:22:33 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile	Tue Nov 23 10:19:55 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2010/11/23 08:22:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.8 2010/11/23 10:19:55 mrg Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -23,6 +23,7 @@
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/modes \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/ramdac \
 		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
 		-I${X11SRCDIR.xorg-server}/os \
 		-I${X11SRCDIR.xorg-server}/Xext \
 		-I${X11SRCDIR.xorg-server}/mi \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2009-08-26 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Aug 27 04:34:13 UTC 2009

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
bsdResource.c is now called stdResource.c.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17	Tue Jul  7 07:58:46 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Thu Aug 27 04:34:13 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2009/07/07 07:58:46 mrg Exp $
+#	$NetBSD: Makefile,v 1.18 2009/08/27 04:34:13 mrg Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -33,14 +33,14 @@
 .endif
 
 .if ${MACHINE} == macppc
-SRCS.bsd+=	ppc_video.c bsdResource.c pm_noop.c lnx_agp.c
+SRCS.bsd+=	ppc_video.c stdResource.c pm_noop.c lnx_agp.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif
 
 .if ${MACHINE_ARCH} == alpha
-SRCS.bsd+=	alpha_video.c bsd_ev56.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+=	alpha_video.c bsd_ev56.c stdResource.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
 .endfor
@@ -55,7 +55,7 @@
 .endif
 
 .if ${MACHINE} == sgimips
-SRCS.bsd+=	ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+=	ppc_video.c stdResource.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
@@ -64,7 +64,7 @@
 .if ${MACHINE} == cats || \
 ${MACHINE} == shark || \
 ${MACHINE} == netwinder
-SRCS.bsd+=  ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+=  ppc_video.c stdResource.c pm_noop.c agp_noop.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2009-07-07 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Jul  7 07:58:46 UTC 2009

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
need to link stdResource.c now


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.16	Thu Jul  2 04:27:47 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Tue Jul  7 07:58:46 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2009/07/02 04:27:47 macallan Exp $
+#	$NetBSD: Makefile,v 1.17 2009/07/07 07:58:46 mrg Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -47,7 +47,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == sparc || ${MACHINE_ARCH} == sparc64
-SRCS.bsd+=	ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+=	ppc_video.c stdResource.c pm_noop.c agp_noop.c
 SRCS.bus+=	netbsdSbus.c
 .for _FN in ${SRCS.bsd}
 CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader

2009-07-01 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Jul  2 04:27:05 UTC 2009

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile

Log Message:
we don't have or need SparcMulDiv.S


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.5	Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile	Thu Jul  2 04:27:05 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2009/07/02 04:27:05 macallan Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -10,7 +10,7 @@
 	extsym.c misym.c xf86sym.c 
 
 .if ${MACHINE_ARCH} == sparc || ${MACHINE_ARCH} == sparc64
-SRCS+=	SparcMulDiv.S
+#SRCS+=	SparcMulDiv.S
 .endif
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos

2009-07-01 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Jul  2 04:27:47 UTC 2009

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile

Log Message:
netbsdPci.c is no more


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.15 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.16
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.15	Fri Jun 12 01:59:07 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile	Thu Jul  2 04:27:47 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2009/06/12 01:59:07 mrg Exp $
+#	$NetBSD: Makefile,v 1.16 2009/07/02 04:27:47 macallan Exp $
 
 .include ../../../Makefile.serverlib
 .include ../../../Makefile.servermod
@@ -80,12 +80,12 @@
 ${MACHINE} == sgimips || ${MACHINE} == shark || \
 ${MACHINE} == netwinder || ${MACHINE_ARCH} == sparc || \
 ${MACHINE_ARCH} == sparc64 || ${MACHINE_ARCH} == alpha
-SRCS.bus+=	netbsdPci.c
+#SRCS.bus+=	netbsdPci.c
 .endif
 
-.if ${MACHINE_ARCH} == sparc || ${MACHINE_ARCH} == sparc64 || \
-${MACHINE_ARCH} == powerpc
-CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
+.if ${MACHINE} == sparc || ${MACHINE} == sparc64 || \
+${MACHINE_ARCH} == powerpc || ${MACHINE} == netwinder
+#CPPFLAGS.netbsdPci.c+= -DPCI_VIA_TTYE0
 .endif
 
 .PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/os-support/misc

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86

2009-06-17 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Jun 18 02:46:10 UTC 2009

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile

Log Message:
only built int10 on x86.  from macallan.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.27 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.28
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.27	Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile	Thu Jun 18 02:46:10 2009
@@ -1,10 +1,14 @@
-#	$NetBSD: Makefile,v 1.27 2009/06/12 01:59:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.28 2009/06/18 02:46:10 mrg Exp $
 
-SUBDIR=		common init ddc dixmods doc dri dri2 dummy i2c int10 loader \
+SUBDIR=		common init ddc dixmods doc dri dri2 dummy i2c loader \
 		xf86modes exa \
 		xorgos ramdac shadowfb vbe vgahw \
 		x86emu xaa xf86config xf8_16bpp
 
+.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
+SUBDIR+=	int10 
+.endif
+
 SUBDIR+=	.WAIT utils
 
 .include bsd.own.mk

CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2

2009-06-11 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Thu Jun 11 17:59:25 UTC 2009

Added Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile

Log Message:
build new xorg-server dri2 component


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.1
--- /dev/null	Thu Jun 11 17:59:25 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile	Thu Jun 11 17:59:25 2009
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2009/06/11 17:59:25 mrg Exp $
+
+XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
+
+.include ../../../Makefile.serverlib
+.include ../../../Makefile.servermod
+
+LIB=	dri2
+
+.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
+SRCS=	dri2.c dri2ext.c
+
+CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
+		-I${X11SRCDIR.xorg-server}/include \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
+		-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
+		-I${X11SRCDIR.xorg-server}/glx \
+		-I${X11SRCDIR.xorg-server}/GL/include \
+		-I${X11SRCDIR.xorg-server}/modes \
+		-I${X11SRCDIR.xorg-server}/ddc \
+		-I${X11SRCDIR.xorg-server}/i2c \
+		-I${X11SRCDIR.xorg-server}/parser \
+		-I${X11SRCDIR.xorg-server}/ramdac \
+		-I${X11SRCDIR.MesaLib}/include \
+		-I${DESTDIR}${X11INCDIR}/X11 \
+		-I${DESTDIR}${X11INCDIR}/X11/dri \
+		-I${DESTDIR}${X11INCDIR}/X11/drm \
+		-I${DESTDIR}${X11INCDIR}/pixman-1 \
+		-I${DESTDIR}${X11INCDIR}/xorg
+
+CPPFLAGS+=	-DXF86DRI \
+		${X11FLAGS.DIX}
+
+CPPFLAGS.dri.c=	-Wno-error
+
+LIBDPLIBS=	drm ${.CURDIR}/../../../../../lib/libdrm
+
+.include bsd.x11.mk
+LIBDIR=	${XMODULEDIR}
+.include bsd.lib.mk

48 matches

Mail list logo