Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/server/xorg-server round do of reach over ...
details: https://anonhg.NetBSD.org/src/rev/66ed1e972811
branches: trunk
changeset: 817203:66ed1e972811
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Aug 12 01:15:49 2016 +0000
description:
round do of reach over updates for xorg-server 1.18. again, untested,
but this should be much closer to complete for the necessary changes.
diffstat:
external/mit/xorg/server/xorg-server/Makefile | 8 +-
external/mit/xorg/server/xorg-server/Makefile.Xserver | 5 +-
external/mit/xorg/server/xorg-server/dri3/Makefile | 18 ++++
external/mit/xorg/server/xorg-server/fb/Makefile.fb | 37 ++++++-
external/mit/xorg/server/xorg-server/glx/Makefile.glx | 3 +-
external/mit/xorg/server/xorg-server/hw/vfb/Makefile | 10 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile | 13 ++-
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile | 13 --
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb/Makefile | 7 -
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile | 14 ---
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile | 14 ---
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile | 18 ----
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile | 45 ----------
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/fb/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/freetype/Makefile | 12 --
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/mfb/Makefile | 15 ---
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/record/Makefile | 15 ---
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/type1/Makefile | 12 --
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/wfb/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap/Makefile | 15 ---
external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile | 7 +-
external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile | 11 +-
external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile | 5 +-
external/mit/xorg/server/xorg-server/hw/xnest/Makefile | 4 +-
external/mit/xorg/server/xorg-server/include/Makefile | 25 +++--
external/mit/xorg/server/xorg-server/mi/Makefile | 4 +-
external/mit/xorg/server/xorg-server/os/Makefile | 7 +-
external/mit/xorg/server/xorg-server/present/Makefile | 22 ++++
external/mit/xorg/server/xorg-server/pseudoramiX/Makefile | 16 +++
external/mit/xorg/server/xorg-server/randr/Makefile | 23 +++-
36 files changed, 182 insertions(+), 246 deletions(-)
diffs (truncated from 845 to 300 lines):
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile Fri Aug 12 01:15:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/12/30 22:07:21 mrg Exp $
+# $NetBSD: Makefile,v 1.23 2016/08/12 01:15:49 mrg Exp $
.include <bsd.own.mk>
@@ -13,10 +13,16 @@
SUBDIR= doc include .WAIT
SUBDIR+= glx
SUBDIR+= dix fb mi Xext miext os randr render
+SUBDIR+= present dri3 pseudoramiX
SUBDIR+= Xi xkb xkbstubs dbe record xfixes
SUBDIR+= damageext composite config .WAIT
SUBDIR+= hw
+# XXX
+.if ${HAVE_DRI3:Uno} != "no"
+SUBDIR+= dri3
+.endif
+
.PATH: ${X11SRCDIR.xorg-server}
PKGCONFIG= xorg-server
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Aug 12 01:15:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.15 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile.Xserver,v 1.16 2016/08/12 01:15:49 mrg Exp $
.for _SL in \
mi \
@@ -8,6 +8,8 @@
Xext \
Xext/Xextbuiltin \
dbe \
+ present \
+ pseudoramiX \
record \
render \
randr \
@@ -22,6 +24,7 @@
dix/xpstubs \
os \
dix \
+ dri3 \
config \
glx \
hw/xnest \
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/dri3/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/server/xorg-server/dri3/Makefile Fri Aug 12 01:15:49 2016 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2016/08/12 01:15:49 mrg Exp $
+
+.include "../Makefile.serverlib"
+.include "../Makefile.servermod"
+
+LIB= dri3
+
+.PATH: ${X11SRCDIR.xorg-server}/dri3
+SRCS= dri3.c \
+ dri3_request.c \
+ dri3_screen.c
+
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/../include
+CPPFLAGS+= ${X11FLAGS.DIX}
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/fb/Makefile.fb
--- a/external/mit/xorg/server/xorg-server/fb/Makefile.fb Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/fb/Makefile.fb Fri Aug 12 01:15:49 2016 +0000
@@ -1,13 +1,34 @@
-# $NetBSD: Makefile.fb,v 1.9 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile.fb,v 1.10 2016/08/12 01:15:49 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS.fb= fb24_32.c fballpriv.c fbarc.c fbbits.c fbblt.c \
- fbbltone.c fbcopy.c \
- fbfill.c fbfillrect.c fbfillsp.c fbgc.c fbgetsp.c \
- fbglyph.c fbimage.c fbline.c fboverlay.c \
- fbpict.c fbpixmap.c fbpoint.c fbpush.c fbscreen.c \
- fbseg.c fbsetsp.c fbsolid.c \
- fbtrap.c fbutil.c fbwindow.c
+SRCS.fb= fb24_32.c \
+ fballpriv.c \
+ fbarc.c \
+ fbbits.c \
+ fbblt.c \
+ fbbltone.c \
+ fbcmap_mi.c \
+ fbcopy.c \
+ fbfill.c \
+ fbfillrect.c \
+ fbfillsp.c \
+ fbgc.c \
+ fbgetsp.c \
+ fbglyph.c \
+ fbimage.c \
+ fbline.c \
+ fboverlay.c \
+ fbpict.c \
+ fbpixmap.c \
+ fbpoint.c \
+ fbpush.c \
+ fbscreen.c \
+ fbseg.c \
+ fbsetsp.c \
+ fbsolid.c \
+ fbtrap.c \
+ fbutil.c \
+ fbwindow.c
CPPFLAGS+= ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx Fri Aug 12 01:15:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.11 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.12 2016/08/12 01:15:49 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -48,6 +48,7 @@
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri \
-I${X11SRCDIR.xorg-server}/hw/xfree86/dri2 \
+ -I${X11SRCDIR.xorg-server}/present \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/src/glx \
-I${X11SRCDIR.MesaLib}/src/mesa \
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Fri Aug 12 01:15:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/06/29 19:36:56 christos Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/12 01:15:49 mrg Exp $
.include <bsd.own.mk>
@@ -13,8 +13,9 @@
.PATH: ${X11SRCDIR.xorg-server}/mi
SRCS= InitInput.c InitOutput.c dpmsstubs.c miinitext.c stubs.c
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.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 \
@@ -28,8 +29,6 @@
-I${DESTDIR}${X11INCDIR}/xorg \
-I${X11SRCDIR.xorg-server}/render \
-DHAVE_DIX_CONFIG_H \
- -DNO_HW_ONLY_EXTS \
- -DNO_MODULE_EXTS \
-UGLXEXT
CPPFLAGS+= ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
@@ -44,7 +43,6 @@
CPPFLAGS.InitInput.c= ${X11FLAGS.EXTENSION} \
-UGLXEXT
CPPFLAGS.miinitext.c= ${X11FLAGS.EXTENSION} \
- -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
-UXFree86LOADER \
-UGLXEXT
CPPFLAGS.dpmsstubs.c= ${X11FLAGS.EXTENSION} \
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Aug 12 01:15:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/12 01:15:49 mrg Exp $
.include <bsd.own.mk>
@@ -46,7 +46,7 @@
LDADD+= ${LDADD.xfixes}
LDADD+= ${LDADD.Xext/Xextbuiltin}
LDADD+= ${LDADD.render}
-LDADD+= ${LDADD.randr}
+eDADD+= ${LDADD.randr}
LDADD+= ${LDADD.damageext}
LDADD+= ${LDADD.miext/damage}
LDADD+= ${LDADD.miext/shadow}
@@ -57,6 +57,10 @@
LDADD+= ${LDADD.glx}
LDADD+= ${LDADD.hw/xfree86/dri}
LDADD+= ${LDADD.hw/xfree86/dri2}
+# XXX
+.if ${HAVE_DRI3:Uno} != "no"
+LDADD+= ${LDADD.dri3}
+.endif
LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
@@ -118,6 +122,11 @@
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+# XXX
+.if ${HAVE_DRI3:Uno} != "no"
+DPADD+= ${DPADD.dri3}
+.endif
+
.if ${MKCRYPTO:Uno} != "no"
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/GLcore/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2008/09/26 06:57:03 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
-
-.include "../../../../Makefile.serverlib"
-.include "../../../../Makefile.servermod"
-
-LIB= GLcore
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
-SRCS= ${SRCS.GLcore} GLcoremodule.c
-
-.include "../../../../GL/GLcore/Makefile.GLcore"
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Fri Aug 12 01:15:49 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:42 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/12 01:15:49 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -22,10 +22,8 @@
-DXFree86LOADER
SUBDIR = \
- dbe \
fb \
glx \
- record \
shadow \
wfb \
xorgxkb
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/afb/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
-
-LIB= afb
-
-SRCS= afbmodule.c
-
-.include "../Makefile.dixmod"
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/08/24 13:23:33 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
-PIXELSIZE= 8
-
-.include "../../../../Makefile.serverlib"
-.include "../../../../Makefile.servermod"
-
-LIB= cfb
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
-SRCS= ${SRCS.cfb} cfbmodule.c
-
-.include "../../../../cfb/Makefile.cfb"
diff -r 58c3cabbbbe8 -r 66ed1e972811 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile Thu Aug 11 22:10:01 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/08/24 13:24:12 rtr Exp $
-
-XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
-PIXELSIZE= 32
-
-.include "../../../../Makefile.serverlib"
-.include "../../../../Makefile.servermod"
-
-LIB= cfb32
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
-SRCS= ${SRCS.cfb} cfb32module.c
-
-.include "../../../../cfb/Makefile.cfb"
Home |
Main Index |
Thread Index |
Old Index