From 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 1 Mar 2016 20:55:27 +0000
Subject: Drop X11 extensions not shipped with recent X.Org server versions
 anymore:

  include/extensions: Xag.h, Xagsrv.h, Xagstr.h
  Xserver/Xext: appgroup.c, appgroup.h
  lib/Xext: XAppgroup.c

  include/extensions: Xcup.h, Xcupstr.h,
  Xserver/Xext: cup.c
  lib/Xext: cup.c

  include/extensions: Xdbe.h
  Xserver/Xext: Xdbe.c

  Xserver/Xext:  dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h

  include/extensions: Xevie.h, Xeviestr.h
  include/extensions: XEVI.h, XEVIstr.h
  Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c
  lib/Xext: XEVI.c

  include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h
  Xserver/Xext: fontcache.c

  include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h
  lib/Xext: XLbx.c

  include/extensions: multibuf.h, multibufst.h
  lib/Xext: XMultibuf.c
  Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c

  include/extensions: xf86vmode.h, xf86vmstr.h
  Xserver/Xext: vidmodeproc.h, xf86vmode.c

  lib/Xext: MITMisc.c
  Xserver/Xext: mitmisc.c

  Xserver/Xext: xf86misc.c, xf86miscproc.h

  Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c
  include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h
  Fixes: ArcticaProject/nx-libs#116
  X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01

  Plus: Drop various Imake'ish defines where not needed anymore.
---
 nx-X11/programs/Xserver/Imakefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'nx-X11/programs/Xserver/Imakefile')

diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index a2a3f7ced..ca9a6b88d 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -105,10 +105,6 @@ INSTPGMFLAGS =
 #if BuildRECORD || BuildRECORDlib
       RECORDDIR = record
 #endif
-#if BuildXTrap
-       XTRAPEXT = XTrap/LibraryTargetName(xtrap)
-       XTRAPDIR = XTrap
-#endif
 #ifdef SiteExtensionLibs
        SITEEXTS = SiteExtensionLibs
 #endif
@@ -153,7 +149,7 @@ INSTPGMFLAGS =
 #if DoLoadableServer
      EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
 		  $(OTHEREXTS) $(RANDRLIB) $(RENDERLIB)
-   LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT)
+   LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT)
         MISCEXT = Xext/LibraryTargetName(ext)
       OTHEREXTS = Xext/LibraryTargetName(exts) $(XKBEXT) $(XINPUTEXT) \
                   $(SITEEXTS)
@@ -161,11 +157,11 @@ INSTPGMFLAGS =
      EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \
 		  $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB)
       OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
-                  $(DBEEXT) $(RECORDEXT) $(SITEEXTS) $(XTRAPEXT)
+                  $(DBEEXT) $(RECORDEXT) $(SITEEXTS)
 #endif
         EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \
                   $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
-                  $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) $(XPCONFIGDIR) \
+                  $(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \
 		  $(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR)
              OS = os/LibraryTargetName(os) $(DEPXAUTHLIB)
         BSDEMUL = $(DEPXBSDLIB)
-- 
cgit v1.2.3