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 various updates to build with xorg-...
details: https://anonhg.NetBSD.org/src/rev/1ddecd011798
branches: trunk
changeset: 368478:1ddecd011798
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Jul 15 04:18:54 2022 +0000
description:
various updates to build with xorg-server 21.1.3.
- the s3, tga, and trident drivers use old functionality and are disabled
- dixmods/fb is removed, main fb has all these now (we retain our revert
of an upstream change here.)
- adjust source lists as necessary
- remove vbe module, now part of int10
- use -lxcvt
- misc clean up
- ramdac loses IBM, BT and TI support (this is one of the problems for
the disabled drivers, but also some structures in RamDac.h are gone
entirely, not copied anywhere.)
- old apm code is gone, all bsd uses pm_noop. now
this probably require a clean build in at least xorg-server and the
drivers, and perhaps the DESTDIR as well. will update src/UPDATING with
details when they are fully known.
diffstat:
external/mit/xorg/server/drivers/Makefile | 51 +++++----
external/mit/xorg/server/drivers/Makefile.xf86-driver | 4 +-
external/mit/xorg/server/xorg-server/Makefile.Xserver | 3 +-
external/mit/xorg/server/xorg-server/Makefile.serverlib | 4 +-
external/mit/xorg/server/xorg-server/Makefile.servermod | 4 +-
external/mit/xorg/server/xorg-server/config/Makefile | 4 +-
external/mit/xorg/server/xorg-server/dix/Makefile | 6 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile | 9 +-
external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile | 6 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile | 8 +-
external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile | 5 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile | 26 +---
external/mit/xorg/server/xorg-server/include/Makefile | 8 +-
external/mit/xorg/server/xorg-server/os/Makefile | 5 +-
external/mit/xorg/server/xorg-server/present/Makefile | 5 +-
external/mit/xorg/server/xorg-server/xfixes/Makefile | 4 +-
19 files changed, 83 insertions(+), 79 deletions(-)
diffs (truncated from 612 to 300 lines):
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2022/07/12 02:42:40 mrg Exp $
+# $NetBSD: Makefile,v 1.106 2022/07/15 04:18:54 mrg Exp $
.include <bsd.own.mk>
@@ -42,14 +42,11 @@
xf86-video-r128 \
xf86-video-radeon \
xf86-video-radeon-kms \
- xf86-video-s3 \
xf86-video-s3virge \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-sis \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
xf86-video-vboxvideo \
xf86-video-vmware \
@@ -60,6 +57,11 @@
# xf86-video-imstt
# xf86-video-rendition
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+# xf86-video-trident
+
# needs porting for xorg-server 1.18
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
@@ -120,14 +122,19 @@
xf86-video-wsfb
.endif # ${MACHINE} == "amiga"
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
.if ${MACHINE} == "bebox"
SUBDIR+= \
xf86-video-cirrus \
xf86-video-mga \
- xf86-video-s3 \
xf86-video-s3virge
.endif # ${MACHINE} == "bebox"
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
+# xf86-video-tga
+# xf86-video-trident
.if ${MACHINE} == "cats"
SUBDIR+= \
xf86-video-ast \
@@ -140,13 +147,10 @@
xf86-video-neomagic \
xf86-video-nv \
xf86-video-radeon \
- xf86-video-s3 \
xf86-video-s3virge \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
xf86-video-vesa \
xf86-video-wsfb
@@ -209,8 +213,9 @@
.endif # ${MACHINE} == "hppa"
.if ${MACHINE} == "ibmnws"
-SUBDIR+= \
- xf86-video-s3
+# needs porting for xorg-server 21.1.3
+#SUBDIR+= \
+# xf86-video-s3
.endif # ${MACHINE} == "ibmnws"
.if ${MACHINE} == "iyonix"
@@ -229,11 +234,12 @@
xf86-video-wsfb
.endif # ${MACHINE} == "mac68k"
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
.if ${MACHINE} == "macppc"
SUBDIR+= \
xf86-video-ati \
xf86-video-chips \
- xf86-video-glint \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -268,19 +274,21 @@
xf86-video-wsfb
.endif # ${MACHINE} == "ofppc"
+# needs porting for xorg-server 21.1.3
+# xf86-video-s3
.if ${MACHINE} == "prep"
SUBDIR+= \
xf86-video-cirrus \
+ xf86-video-mga
+.endif # ${MACHINE} == "prep"
+
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
+# xf86-video-s3
+.if ${MACHINE} == "sgimips"
+SUBDIR+= \
+ xf86-video-cirrus \
xf86-video-mga \
- xf86-video-s3
-.endif # ${MACHINE} == "prep"
-
-.if ${MACHINE} == "sgimips"
-SUBDIR+= \
- xf86-video-cirrus \
- xf86-video-glint \
- xf86-video-mga \
- xf86-video-s3 \
xf86-video-wsfb
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
@@ -296,11 +304,12 @@
xf86-video-wsfb
.endif # ${MACHINE} == "shark"
+# needs porting for xorg-server 21.1.3
+# xf86-video-glint
.if ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64"
SUBDIR+= \
xf86-video-ati \
- xf86-video-glint \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-r128 \
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.32 2021/12/15 16:27:10 christos Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.33 2022/07/15 04:18:54 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -47,6 +47,8 @@
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H
+.else
+CPPFLAGS+= -D_OPENBSD_SOURCE
.endif
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xserver,v 1.23 2021/11/01 10:05:19 nia Exp $
+# $NetBSD: Makefile.Xserver,v 1.24 2022/07/15 04:18:54 mrg Exp $
.for _SL in \
mi \
@@ -31,7 +31,6 @@
hw/xfree86/common \
hw/xfree86/ddc \
hw/xfree86/dixmods \
- hw/xfree86/dixmods/fb \
hw/xfree86/dixmods/shadow \
hw/xfree86/dixmods/wfb \
hw/xfree86/doc \
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/Makefile.serverlib
--- a/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.serverlib Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.serverlib,v 1.15 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile.serverlib,v 1.16 2022/07/15 04:18:54 mrg Exp $
NOFULLRELRO= yes
@@ -22,7 +22,7 @@
X_BYTE_ORDER=0
.endif
-CPPFLAGS+= ${X11FLAGS.SERVER}
+CPPFLAGS+= ${X11FLAGS.SERVER} -D_OPENBSD_SOURCE
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
.if ${HAVE_XORG_GLAMOR} != "no"
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/Makefile.servermod
--- a/external/mit/xorg/server/xorg-server/Makefile.servermod Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.servermod Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.8 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile.servermod,v 1.9 2022/07/15 04:18:54 mrg Exp $
NOFULLRELRO= yes
@@ -28,7 +28,7 @@
CPPFLAGS+= ${X11FLAGS.LOADABLE}
.endif
-CPPFLAGS+= ${X11FLAGS.DIX}
+CPPFLAGS+= ${X11FLAGS.DIX} -D_OPENBSD_SOURCE
# IOPortBase is particularly annoying to fix
COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -fcommon :}
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/config/Makefile
--- a/external/mit/xorg/server/xorg-server/config/Makefile Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/config/Makefile Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/12/05 22:59:32 nia Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/15 04:18:54 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -19,5 +19,7 @@
CPPFLAGS+= -DCONFIG_WSCONS
+CPPFLAGS+= -Wno-error=deprecated-declarations
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/dix/Makefile
--- a/external/mit/xorg/server/xorg-server/dix/Makefile Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/12/31 11:14:03 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2022/07/15 04:18:54 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -8,7 +8,7 @@
.PATH: ${X11SRCDIR.xorg-server}/dix
SRCS= atom.c colormap.c cursor.c devices.c dispatch.c dixfonts.c \
- dixutils.c events.c extension.c gc.c getevents.c \
+ dixutils.c events.c extension.c gc.c getevents.c gestures.c \
globals.c glyphcurs.c grabs.c initatoms.c main.c pixmap.c \
privates.c property.c resource.c swaprep.c swapreq.c \
tables.c window.c stubmain.c \
@@ -25,10 +25,8 @@
CPPFLAGS.globals.c= -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\"
# XXX make user variables
-CPPFLAGS.dispatch.c= -DVENDOR_NAME="\"The Xorg Foundation\""
CPPFLAGS.main.c= -DVENDOR_STRING="\"The Xorg Group\"" \
-DVENDOR_RELEASE=${XORG_VERSION_CURRENT} \
- -DVENDOR_NAME="\"The Xorg Foundation\""
FILES= protocol.txt
FILESDIR= ${X11ROOTDIR}/lib/xorg
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Fri Jul 15 04:18:54 2022 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2021/03/07 10:42:27 rin Exp $
+# $NetBSD: Makefile,v 1.41 2022/07/15 04:18:55 mrg Exp $
.include <bsd.own.mk>
SUBDIR= common ddc dixmods doc dri dri2 i2c loader \
xf86modes exa \
- xorgos ramdac shadowfb vbe vgahw \
+ xorgos ramdac shadowfb vgahw \
x86emu xf86config xkb \
drivers
diff -r 7b4603bcd212 -r 1ddecd011798 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Jul 15 00:16:04 2022 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Fri Jul 15 04:18:54 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/11/16 09:25:52 nia Exp $
+# $NetBSD: Makefile,v 1.22 2022/07/15 04:18:55 mrg Exp $
USE_FORT?= yes # network server *and* setuid
@@ -32,6 +32,7 @@
LDADD+= -Wl,--whole-archive
LDADD+= ${LDADD.dix}
+LDADD+= ${LDADD.fb}
LDADD+= ${LDADD.config}
LDADD+= ${LDADD.dbe}
.if ${HAVE_XORG_GLAMOR} != "no"
@@ -66,9 +67,8 @@
LDADD+= ${LDADD.hw/xfree86/dri}
LDADD+= ${LDADD.hw/xfree86/dri2}
LDADD+= ${LDADD.dri3}
-LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= -lpixman-1 -lXfont2 -lfreetype -lXau -lfontenc -lXdmcp
-LDADD+= -lpciaccess -ldrm
+LDADD+= -lpciaccess -ldrm -lxcvt
Home |
Main Index |
Thread Index |
Old Index