[src/trunk]: src/external/mit/xorg various updates:

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg various updates:
From: mrg <mrg%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 06:40:25 +0000
details:   https://anonhg.NetBSD.org/src/rev/08b7e0afd34e
branches:  trunk
changeset: 817240:08b7e0afd34e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Aug 14 03:43:03 2016 +0000

description:
various updates:
- port pkgsrc libxshmfence patches
- Xextbuiltin/module is no longer a thing, make it normal
- always need xorg-config.h/xorg-server.h for server components now
- add present, damage, render, Xi, dri, pixman,  extension where needed
- fix various CPPFLAGS issues
- deal with moved sdksyms.sh

diffstat:

 external/mit/xorg/lib/libxshmfence/Makefile                        |  11 +-
 external/mit/xorg/server/xorg-server/Makefile.Xserver              |   3 +-
 external/mit/xorg/server/xorg-server/Makefile.serverlib            |   5 +-
 external/mit/xorg/server/xorg-server/Xext/Makefile                 |  53 +++++-
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xext            |  32 ----
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin     |  10 -
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule      |   6 -
 external/mit/xorg/server/xorg-server/Xext/Xextbuiltin/Makefile     |  11 -
 external/mit/xorg/server/xorg-server/Xext/Xextmodule/Makefile      |  13 -
 external/mit/xorg/server/xorg-server/composite/Makefile            |   3 +-
 external/mit/xorg/server/xorg-server/dbe/Makefile                  |   4 +-
 external/mit/xorg/server/xorg-server/dix/Makefile                  |   4 +-
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile               |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile      |  21 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile    |   5 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile       |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile   |   3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile       |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile      |   3 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile    |  17 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile   |  38 ----
 external/mit/xorg/server/xorg-server/hw/xfree86/rac/Makefile       |  19 --
 external/mit/xorg/server/xorg-server/hw/xfree86/scanpci/Makefile   |  34 ----
 external/mit/xorg/server/xorg-server/hw/xfree86/xaa/Makefile       |  75 ---------
 external/mit/xorg/server/xorg-server/hw/xfree86/xf1bpp/Makefile    |  77 ----------
 external/mit/xorg/server/xorg-server/hw/xfree86/xf4bpp/Makefile    |  68 --------
 external/mit/xorg/server/xorg-server/hw/xfree86/xf8_16bpp/Makefile |  25 ---
 external/mit/xorg/server/xorg-server/hw/xfree86/xf8_32bpp/Makefile |  42 -----
 external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile    |   5 +-
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile             |   5 +-
 external/mit/xorg/server/xorg-server/os/Makefile                   |  11 +-
 external/mit/xorg/server/xorg-server/xfixes/Makefile               |   3 +-
 32 files changed, 122 insertions(+), 496 deletions(-)

diffs (truncated from 1053 to 300 lines):

diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/lib/libxshmfence/Makefile
--- a/external/mit/xorg/lib/libxshmfence/Makefile       Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/lib/libxshmfence/Makefile       Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2016/08/14 00:02:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/08/14 03:43:03 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,21 +6,18 @@
 
 XSHMFENCEDIR=  ${X11SRCDIR.${LIB}}
 .PATH:         ${XSHMFENCEDIR}/src
-SRCS=          xshmfence_pthread.c xshmfence_alloc.c
+SRCS=          xshmfence_alloc.c xshmfence_semaphore.c
 
 INCS=  xshmfence.h
 INCSDIR=${X11INCDIR}/X11
 
-#CPPFLAGS+=    -I${DESTDIR}${X11INCDIR}/X11
-CPPFLAGS+=     -DHAVE_PTHREAD
 CPPFLAGS+=     -DSHMDIR=\"/var/shm\"
+CPPFLAGS+=     -DHAVE_SEMAPHORE
 # XXX
-CPPFLAGS+=     -D_PTHREAD_PSHARED
+CPPFLAGS+=     -DLIBXSHM_PAGESIZE=4096
 
 NOMAN= # defined
 
-#LIBDPLIBS=    X11     ${.CURDIR}/../libX11/dynamic
-
 PKGDIST=       ${LIB}
 
 .include <bsd.x11.mk>
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.16 2016/08/12 01:15:49 mrg Exp $
+#      $NetBSD: Makefile.Xserver,v 1.17 2016/08/14 03:43:03 mrg Exp $
 
 .for _SL in \
        mi \
@@ -6,7 +6,6 @@
        fb \
        xfixes \
        Xext \
-       Xext/Xextbuiltin \
        dbe \
        present \
        pseudoramiX \
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Makefile.serverlib
--- a/external/mit/xorg/server/xorg-server/Makefile.serverlib   Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.serverlib   Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.serverlib,v 1.9 2016/01/25 18:00:26 christos Exp $
+#      $NetBSD: Makefile.serverlib,v 1.10 2016/08/14 03:43:03 mrg Exp $
 
 .include <bsd.own.mk>          # for NETBSDSRCDIR and mk.conf processing
 
@@ -21,6 +21,9 @@
 CPPFLAGS+=     ${X11FLAGS.SERVER}
 CPPFLAGS+=     -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
 
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/../include \
+               -DHAVE_XORG_CONFIG_H -D_HAVE_DIX_CONFIG_H
+
 .if (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
 CPPFLAGS+=     -D__GLX_ALIGN64
 .endif
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Xext/Makefile
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile        Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile        Sun Aug 14 03:43:03 2016 +0000
@@ -1,16 +1,53 @@
-#      $NetBSD: Makefile,v 1.5 2008/08/09 06:48:17 rtr Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/14 03:43:03 mrg Exp $
 
 LIBISPRIVATE=  yes
 LIB=           Xext
 
 .include "../Makefile.serverlib"
 
-.include "Makefile.Xextbuiltin"
-.include "Makefile.Xextmodule"
-
-SRCS=  ${SRCS.Xextbuiltin} ${SRCS.Xextmodule}
+SRCS=  bigreq.c geext.c shape.c sleepuntil.c \
+       sync.c xcmisc.c xtest.c
+SRCS+= shm.c
+SRCS+= xvmain.c xvdisp.c xvmc.c
+SRCS+= hashtable.c xres.c
+SRCS+= saver.c
+SRCS+= panoramiX.c panoramiXprocs.c panoramiXSwap.c
+SRCS+= xace.c
+SRCS+= security.c
+SRCS+= xf86bigfont.c
+SRCS+= dpms.c
+# XXX not really
+SRCS+= vidmode.c
 
-SUBDIR=        Xextbuiltin Xextmodule
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/Xext
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/pixman-1
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/xorg
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/Xi
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/xfixes
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/miext/sync
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/composite
+CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/damageext
+CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
 
-.include <bsd.subdir.mk>
-.include "Makefile.Xext"
+.if 0
+COPTS.panoramiX.c+=            -Wno-error
+COPTS.panoramiXprocs.c+=       -Wno-error
+COPTS.saver.c+=                        -Wno-error
+COPTS.security.c+=             -Wno-error
+COPTS.shape.c+=                        -Wno-error
+COPTS.shm.c+=                  -Wno-error
+COPTS.sync.c+=                 -Wno-error
+COPTS.xf86bigfont.c+=          -Wno-error
+COPTS.xres.c=                  -Wno-error
+COPTS.xvdisp.c+=               -Wno-error
+COPTS.xvmain.c+=               -Wno-error
+COPTS.xvmc.c+=                 -Wno-error
+COPTS.bigreq.c+=               -Wno-error      # XXX bigreqstr.h
+COPTS.xcmisc.c+=               -Wno-error      # XXX xcmiscstr.h
+.endif
+
+.PATH:         ${X11SRCDIR.xorg-server}/Xext
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Sun Aug 14 00:03:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#      $NetBSD: Makefile.Xext,v 1.12 2016/08/11 08:32:42 mrg Exp $
-
-.PATH:         ${X11SRCDIR.xorg-server}/Xext
-
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/include
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/Xext
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/pixman-1
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/xorg
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/Xi
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/xfixes
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/miext/sync
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/composite
-CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/damageext
-CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
-
-COPTS.panoramiX.c+=            -Wno-error
-COPTS.panoramiXprocs.c+=       -Wno-error
-COPTS.saver.c+=                        -Wno-error
-COPTS.security.c+=             -Wno-error
-COPTS.shape.c+=                        -Wno-error
-COPTS.shm.c+=                  -Wno-error
-COPTS.sync.c+=                 -Wno-error
-COPTS.xf86bigfont.c+=          -Wno-error
-COPTS.xres.c=                  -Wno-error
-COPTS.xvdisp.c+=               -Wno-error
-COPTS.xvmain.c+=               -Wno-error
-COPTS.xvmc.c+=                 -Wno-error
-COPTS.bigreq.c+=               -Wno-error      # XXX bigreqstr.h
-COPTS.xcmisc.c+=               -Wno-error      # XXX xcmiscstr.h
-
-.include <bsd.x11.mk>
-.include <bsd.lib.mk>
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextbuiltin    Sun Aug 14 00:03:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#      $NetBSD: Makefile.Xextbuiltin,v 1.7 2016/08/14 00:03:57 mrg Exp $
-
-SRCS.Xextbuiltin=      bigreq.c geext.c shape.c sleepuntil.c \
-                       sync.c xcmisc.c xtest.c
-SRCS.Xextbuiltin+=     shm.c
-SRCS.Xextbuiltin+=     panoramiX.c panoramiXprocs.c panoramiXSwap.c
-SRCS.Xextbuiltin+=     xace.c
-SRCS.Xextbuiltin+=     security.c
-SRCS.Xextbuiltin+=     xf86bigfont.c
-SRCS.Xextbuiltin+=     hashtable.c
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule     Sun Aug 14 00:03:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#      $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+=      dpms.c
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Xext/Xextbuiltin/Makefile
--- a/external/mit/xorg/server/xorg-server/Xext/Xextbuiltin/Makefile    Sun Aug 14 00:03:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#      $NetBSD: Makefile,v 1.4 2008/08/09 05:26:41 rtr Exp $
-
-LIBISPRIVATE=  yes
-LIB=           Xextbuiltin
-
-.include "../../Makefile.serverlib"
-.include "../Makefile.Xextbuiltin"
-
-SRCS=  ${SRCS.Xextbuiltin}
-
-.include "../Makefile.Xext"
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/Xext/Xextmodule/Makefile
--- a/external/mit/xorg/server/xorg-server/Xext/Xextmodule/Makefile     Sun Aug 14 00:03:57 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#      $NetBSD: Makefile,v 1.7 2013/09/12 15:36:14 joerg Exp $
-
-LIBISPRIVATE=  yes
-LIB=           Xextmodule
-
-COPTS+=        ${PICFLAGS}
-
-.include "../../Makefile.serverlib"
-.include "../Makefile.Xextmodule"
-
-SRCS=  ${SRCS.Xextmodule} shape.c ${SRCS.Xext}
-
-.include "../Makefile.Xext"
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/composite/Makefile
--- a/external/mit/xorg/server/xorg-server/composite/Makefile   Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/composite/Makefile   Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2015/11/06 21:32:22 szptvlfn Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/14 03:43:03 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -18,6 +18,7 @@
                -I${X11SRCDIR.xorg-server}/xfixes \
                -I${X11SRCDIR.xorg-server}/damageext \
                -I${X11SRCDIR.xorg-server}/miext/damage \
+               -I${X11SRCDIR.xorg-server}/present \
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${X11SRCDIR.xorg-server}/../include
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/dbe/Makefile
--- a/external/mit/xorg/server/xorg-server/dbe/Makefile Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/dbe/Makefile Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2016/08/14 03:43:04 mrg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -7,6 +7,6 @@
 LIB=   dbe
 SRCS=  ${SRCS.dbe}
 
-COPTS.dbe.c=           -Wno-error
+CPPFLAGS+=      -I${X11SRCDIR.xorg-server}/present
 
 .include "Makefile.dbe"
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/dix/Makefile
--- a/external/mit/xorg/server/xorg-server/dix/Makefile Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/dix/Makefile Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -22,8 +22,10 @@
 CPPFLAGS+=     ${X11FLAGS.PERVASIVE_EXTENSION}
 CPPFLAGS+=     ${X11FLAGS.DIX} ${X11INCS.DIX}
 
+.if 0
 CPPFLAGS.globals.c=    -DCOMPILEDDEFAULTFONTPATH=\"${X11DEFAULTFONTPATH:ts,}\" \
                        -DRGB_DB=\"${X11LIBDIR}/rgb\"
+.endif
 
 # XXX make user variables
 CPPFLAGS.dispatch.c=   -DVENDOR_NAME="\"The Xorg Foundation\""
diff -r 2f14e98e3bd5 -r 08b7e0afd34e external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Sun Aug 14 00:03:57 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Sun Aug 14 03:43:03 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2016/08/14 00:03:58 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2016/08/14 03:43:04 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -72,6 +72,7 @@
        ${LDADD.composite} \
        ${LDADD.os} \
        ${LDADD.glx} \
+       ${LDADD.present} \
        -lXfont \
        -lfreetype \
        -lXau \
@@ -103,6 +104,7 @@
        ${DPADD.composite} \
Prev by Date: [src/trunk]: src/sys/dev/pci Prevent a panic during system shutdown when vioi...
Next by Date: [src/trunk]: src/sys/ufs/ext2fs check correct inode extents flag - IN_E4EXTEN...
Previous by Thread: [src/trunk]: src/sys/dev/pci Prevent a panic during system shutdown when vioi...
Next by Thread: [src/trunk]: src/sys/ufs/ext2fs check correct inode extents flag - IN_E4EXTEN...
Indexes:
Home | Main Index | Thread Index | Old Index