[src/trunk]: src/external/mit/xorg/server many build updates and fixes for xo...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg/server many build updates and fixes for xo...
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:32:44 +0000
details:   https://anonhg.NetBSD.org/src/rev/e4bf8b49eb7d
branches:  trunk
changeset: 758990:e4bf8b49eb7d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Nov 23 08:22:29 2010 +0000

description:
many build updates and fixes for xorg-server 1.9.2.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver                   |   3 +-
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xext                 |   4 +-
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule           |   3 +-
 external/mit/xorg/server/xorg-server/Xi/Makefile                        |  18 ++++++-
 external/mit/xorg/server/xorg-server/dix/Makefile                       |   7 ++-
 external/mit/xorg/server/xorg-server/exa/Makefile.exa                   |  16 +++++-
 external/mit/xorg/server/xorg-server/glx/Makefile.glx                   |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/Makefile                |   6 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile         |  13 +++--
 external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile            |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile    |   8 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile |   8 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile            |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile            |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile           |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/i2c/Makefile            |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile           |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile         |  13 ++---
 external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile         |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile      |   6 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile   |   9 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile |   9 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile  |   9 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile            |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile     |   8 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile      |  22 +++++++--
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile         |  23 ++++-----
 external/mit/xorg/server/xorg-server/include/Makefile                   |  15 +++--
 external/mit/xorg/server/xorg-server/mi/Makefile                        |   6 +-
 external/mit/xorg/server/xorg-server/os/Makefile                        |   7 +-
 external/mit/xorg/server/xorg-server/xkb/Makefile                       |   9 ++-
 32 files changed, 158 insertions(+), 112 deletions(-)

diffs (truncated from 882 to 300 lines):

diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xf86-driver,v 1.18 2010/05/23 01:59:13 mrg Exp $
+#      $NetBSD: Makefile.xf86-driver,v 1.19 2010/11/23 08:22:29 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   ${PACKAGE_MAJOR}
@@ -33,7 +33,6 @@
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${X11SRCDIR.xorg-server}/../include \
                ${X11FLAGS.EXTENSION} \
-               ${X11FLAGS.DIX} ${X11INCS.DIX} \
                ${X11FLAGS.SERVER} \
                -DHAVE_XORG_SERVER_1_1_0 \
                -DSERVER_1_5 \
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xext,v 1.9 2010/05/22 05:45:01 mrg Exp $
+#      $NetBSD: Makefile.Xext,v 1.10 2010/11/23 08:22:29 mrg Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/Xext
 
@@ -7,9 +7,9 @@
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/pixman-1
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/xorg
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/Xi
 CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
 
-#COPTS.mbuf.c+=                        -Wno-error
 COPTS.panoramiX.c+=            -Wno-error
 COPTS.panoramiXprocs.c+=       -Wno-error
 COPTS.saver.c+=                        -Wno-error
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule     Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule     Tue Nov 23 08:22:29 2010 +0000
@@ -1,7 +1,6 @@
-#      $NetBSD: Makefile.Xextmodule,v 1.8 2010/05/22 05:45:01 mrg Exp $
+#      $NetBSD: Makefile.Xextmodule,v 1.9 2010/11/23 08:22:29 mrg Exp $
 
 SRCS.Xextmodule=       xvmain.c xvdisp.c xvmc.c
 SRCS.Xextmodule+=      xres.c
 SRCS.Xextmodule+=      saver.c
-#SRCS.Xextmodule+=     mbuf.c
 SRCS.Xextmodule+=      dpms.c
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/Xi/Makefile
--- a/external/mit/xorg/server/xorg-server/Xi/Makefile  Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Xi/Makefile  Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2009/06/11 05:43:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2010/11/23 08:22:29 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -14,7 +14,21 @@
                grabdevb.c grabdevk.c gtmotion.c listdev.c opendev.c \
                queryst.c selectev.c sendexev.c setbmap.c setdval.c \
                setfocus.c setmmap.c setmode.c ungrdev.c ungrdevb.c \
-               ungrdevk.c xiproperty.c
+               ungrdevk.c \
+               xiallowev.c \
+               xichangecursor.c \
+               xichangehierarchy.c \
+               xigetclientpointer.c \
+               xigrabdev.c \
+               xipassivegrab.c \
+               xiproperty.c \
+               xiquerydevice.c \
+               xiquerypointer.c \
+               xiqueryversion.c \
+               xiselectev.c \
+               xisetclientpointer.c \
+               xisetdevfocus.c \
+               xiwarppointer.c
 
 CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg \
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/dix/Makefile
--- a/external/mit/xorg/server/xorg-server/dix/Makefile Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2009/08/23 09:05:44 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2010/11/23 08:22:30 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -12,7 +12,8 @@
                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 \
-               deprecated.c enterleave.c ptrveloc.c registry.c selection.c
+               deprecated.c enterleave.c ptrveloc.c registry.c selection.c \
+               eventconvert.c inpututils.c region.c
 
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/pixman-1
@@ -24,6 +25,7 @@
                        -DRGB_DB=\"${X11LIBDIR}/rgb\"
 
 # 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\""
@@ -40,6 +42,7 @@
 COPTS.events.c=                -Wno-error
 COPTS.resource.c=      -Wno-error
 COPTS.window.c=                -Wno-error
+COPTS.inpututils.c=    -Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/exa/Makefile.exa
--- a/external/mit/xorg/server/xorg-server/exa/Makefile.exa     Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/exa/Makefile.exa     Tue Nov 23 08:22:29 2010 +0000
@@ -1,9 +1,19 @@
-#      $NetBSD: Makefile.exa,v 1.3 2009/06/11 05:43:16 mrg Exp $
+#      $NetBSD: Makefile.exa,v 1.4 2010/11/23 08:22:30 mrg Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/exa
 
-SRCS.exa=      exa.c exa_accel.c exa_migration.c exa_offscreen.c \
-               exa_render.c exa_unaccel.c exa_glyphs.c
+SRCS.exa=\
+       exa.c \
+       exa_classic.c \
+       exa_migration_classic.c \
+       exa_driver.c \
+       exa_mixed.c \
+       exa_migration_mixed.c \
+       exa_accel.c \
+       exa_glyphs.c \
+       exa_offscreen.c \
+       exa_render.c \
+       exa_unaccel.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include \
                -I${X11SRCDIR.xorg-server}/Xext \
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/glx/Makefile.glx
--- a/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/glx/Makefile.glx     Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.glx,v 1.6 2010/07/19 05:34:27 mrg Exp $
+#      $NetBSD: Makefile.glx,v 1.7 2010/11/23 08:22:30 mrg Exp $
 
 .PATH: ${X11SRCDIR.xorg-server}/glx
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -54,7 +54,8 @@
        -I${DESTDIR}${X11INCDIR}/X11 \
        -I${DESTDIR}${X11INCDIR}/libdrm \
        -I${DESTDIR}${X11INCDIR}/xorg \
-       -I${DESTDIR}${X11INCDIR}/pixman-1
+       -I${DESTDIR}${X11INCDIR}/pixman-1 \
+       -I${X11SRCDIR.xorg-server}/../include
 
 CPPFLAGS+= \
        -DGLXEXT \
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile  Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile  Tue Nov 23 08:22:29 2010 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.29 2009/08/27 04:34:52 mrg Exp $
+#      $NetBSD: Makefile,v 1.30 2010/11/23 08:22:30 mrg Exp $
 
-SUBDIR=                common init ddc dixmods doc dri dri2 dummy i2c loader \
+SUBDIR=                common init ddc dixmods doc dri dri2 i2c loader \
                xf86modes exa \
                xorgos ramdac shadowfb vbe vgahw \
                x86emu xaa xf86config xf8_16bpp
@@ -19,7 +19,7 @@
 BINMODE=       4711
 
 .PATH:         ${X11SRCDIR.xorg-server}/hw/xfree86
-SRCS=          xorg.c
+SRCS=          xorg.c libxorg.c
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xc}/include/fonts \
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2010/05/22 05:45:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.14 2010/11/23 08:22:31 mrg Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -17,10 +17,11 @@
        xf86Events.c xf86Globals.c xf86AutoConfig.c \
        xf86Option.c \
        xf86VidMode.c xf86fbman.c xf86cmap.c \
-       xf86Helper.c xf86PM.c xf86RAC.c xf86Xinput.c xisb.c \
+       xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
        xf86Mode.c xorgHelper.c \
        ${SRCS.xv} ${SRCS.bus} ${SRCS.randr} \
-       xf86DefModeSet.c
+       xf86DefModeSet.c \
+       xf86VGAarbiter.c
 
 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 SRCS.bus+=     xf86sbusBus.c
@@ -73,14 +74,16 @@
                -I${X11SRCDIR.xorg-server}/hw/xfree86/int10 \
                -I${X11SRCDIR.xorg-server}/render \
                -I${X11SRCDIR.xorg-server}/randr \
-               -I.
+               -I. \
+               -I${X11SRCDIR.xorg-server}/../include
 
 CPPFLAGS+=     ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
                ${X11FLAGS.DIX} \
                -DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
                -D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
                -D__VENDORDWEBSUPPORT__='"http://wiki.X.Org";' \
-               -DXVENDORNAME='"The X.Org Foundation"'
+               -DXVENDORNAME='"The X.Org Foundation"' \
+               -DHAVE_XORG_CONFIG_H
 
 .if ${MACHINE_ARCH} == "i386"
 CPPFLAGS+=     -DPCCONS_SUPPORT -DPCVT_SUPPORT
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile      Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile      Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2009/06/12 01:59:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2010/11/23 08:22:31 mrg Exp $
 
 LIBISPRIVATE=yes
 
@@ -7,7 +7,7 @@
 LIB=           ddc
 
 .PATH:         ${X11SRCDIR.xorg-server}/hw/xfree86/${LIB}
-SRCS=          xf86DDC.c edid.c interpret_edid.c print_edid.c ddcProperty.c
+SRCS=          ddc.c interpret_edid.c print_edid.c ddcProperty.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/xfree86/${LIB} \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod   Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile.dixmod   Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.dixmod,v 1.5 2009/06/11 05:43:16 mrg Exp $
+#      $NetBSD: Makefile.dixmod,v 1.6 2010/11/23 08:22:31 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,8 @@
                -I${X11SRCDIR.xorg-server}/glx \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${DESTDIR}${X11INCDIR}/xorg
+               -I${DESTDIR}${X11INCDIR}/xorg \
+               -I${X11SRCDIR.xorg-server}/../include
 
 CPPFLAGS+=     ${X11FLAGS.DIX}
 
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile      Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile      Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2009/08/22 02:40:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2010/11/23 08:22:31 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -10,10 +10,8 @@
 .PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
 SRCS=  ${SRCS.dbe} dbemodule.c
 
-# XXX should we be installing xorg-config.h?
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/xorg \
-               -I${X11SRCDIR.xorg-server}/../include
-CPPFLAGS+=     -DHAVE_XORG_CONFIG_H
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/xorg
+CPPFLAGS+=     -DHAVE_XORG_CONFIG_H ${X11INCS.DIX}
 
 COPTS.dbe.c+=          -Wno-error
 
diff -r 390bf3224efb -r e4bf8b49eb7d external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile   Tue Nov 23 07:12:01 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile   Tue Nov 23 08:22:29 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/11/23 08:22:32 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -20,13 +20,13 @@
                -I${X11SRCDIR.xorg-server}/hw/xfree86/dbe \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/hw/xfree86/loader \
                -I${X11SRCDIR.xorg-server}/hw/xfree86/miext/shadow \
+               -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
                -I${X11SRCDIR.xorg-server}/Xext \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
Prev by Date: [src/trunk]: src/lib/libcurses to initialize mbstate_t, use memset instead mb...
Next by Date: [src/trunk]: src/external/mit/xorg/share/cf don't install date.def anymore; i...
Previous by Thread: [src/trunk]: src/lib/libcurses to initialize mbstate_t, use memset instead mb...
Next by Thread: [src/trunk]: src/external/mit/xorg/share/cf don't install date.def anymore; i...
Indexes:
Home | Main Index | Thread Index | Old Index