aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/X11.tmpl
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-03-01 20:55:27 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-01 11:07:46 +0200
commit9bc6ff269aa8bf4c41696ebf4a686c93729ba151 (patch)
tree31359d2d0b38f0cdae2313217c02f059ec55dc4f /nx-X11/config/cf/X11.tmpl
parentc646808bcb0fe95e9794409231a9fa8b51990971 (diff)
downloadnx-libs-9bc6ff269aa8bf4c41696ebf4a686c93729ba151.tar.gz
nx-libs-9bc6ff269aa8bf4c41696ebf4a686c93729ba151.tar.bz2
nx-libs-9bc6ff269aa8bf4c41696ebf4a686c93729ba151.zip
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.
Diffstat (limited to 'nx-X11/config/cf/X11.tmpl')
-rw-r--r--nx-X11/config/cf/X11.tmpl152
1 files changed, 25 insertions, 127 deletions
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index f02f80786..89b069772 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -157,9 +157,6 @@ XORGRELSTRING = XorgManVersionString
#define BuildXauLib (BuildLibraries || BuildLibrariesForXServers)
#endif
#define UseInstalledXauLib (defined(UseInstalled) || !BuildXauLib)
-#ifndef BuildMITMiscExt
-#define BuildMITMiscExt YES
-#endif
#ifndef BuildTestExt
#define BuildTestExt YES
#endif
@@ -178,21 +175,12 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXInputExt
#define BuildXInputExt NO
#endif
-#ifndef BuildEVI
-#define BuildEVI YES
-#endif
#ifndef BuildDBE
#define BuildDBE YES
#endif
-#ifndef BuildDIS
-#define BuildDIS NO
-#endif
#ifndef BuildDPMS
#define BuildDPMS YES
#endif
-#ifndef BuildFontCache
-#define BuildFontCache NO
-#endif
#ifndef BuildXKB
#define BuildXKB YES
#endif
@@ -202,9 +190,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXKBfilelib
#define BuildXKBfilelib (BuildXKB && !BuildServersOnly)
#endif
-#ifndef BuildXTrap
-#define BuildXTrap YES
-#endif
/*
* WARNING: Setting UseXKBInClients to YES cause incompatibilities
@@ -214,9 +199,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef UseXKBInClients
#define UseXKBInClients NO /* use XKB in "normal" clients? */
#endif
-#ifndef BuildMultibuffer
-#define BuildMultibuffer NO
-#endif
#ifndef BuildRECORD
#define BuildRECORD YES
#endif
@@ -229,15 +211,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
#endif
-#ifndef BuildAppgroup
-#define BuildAppgroup YES
-#endif
-#if BuildAppgroup && !BuildXCSecurity
-#define BuildXCSecurity YES
-#endif
-#ifndef BuildCup
-#define BuildCup YES
-#endif
#ifndef HasPlugin
/* Browser plugins are shared libraries - only build them if the OS
* supports shared libs.
@@ -251,18 +224,9 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildScreenSaverExt
#define BuildScreenSaverExt NO
#endif
-#ifndef BuildXF86VidModeExt
-#define BuildXF86VidModeExt NO
-#endif
-#ifndef BuildXF86MiscExt
-#define BuildXF86MiscExt NO
-#endif
#ifndef BuildXF86BigfontExt
#define BuildXF86BigfontExt NO
#endif
-#ifndef BuildXF86DGA
-#define BuildXF86DGA NO
-#endif
#ifndef BuildXResExt
#define BuildXResExt NO
#endif
@@ -301,10 +265,6 @@ XORGRELSTRING = XorgManVersionString
#define BuildCompositeLibrary !BuildServersOnly && BuildXfixesLibrary
#endif
-#ifndef BuildXevie
-#define BuildXevie YES
-#endif
-
#ifndef BuildRootless
#define BuildRootless NO
#endif
@@ -459,13 +419,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef ExtensionDefines
-#ifndef MITMiscDefines
-#if BuildMITMiscExt
-#define MITMiscDefines -DMITMISC
-#else
-#define MITMiscDefines /**/
-#endif
-#endif
#ifndef XTestDefines
#if BuildTestExt
#define XTestDefines -DXTEST
@@ -473,13 +426,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define XTestDefines /**/
#endif
#endif
-#ifndef XTrapDefines
-#if BuildXTrap
-#define XTrapDefines -DXTRAP
-#else
-#define XTrapDefines /**/
-#endif
-#endif
#ifndef XSyncDefines
#if BuildSyncExt
#define XSyncDefines -DXSYNC
@@ -573,14 +519,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef EVIDefines
-#if BuildEVI
-#define EVIDefines -DEVI
-#else
-#define EVIDefines /**/
-#endif
-#endif
-
#ifndef DBEDefines
#if BuildDBE
#define DBEDefines -DDBE
@@ -593,14 +531,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define PervasiveDBEDefines /* -DNEED_DBE_BUF_BITS -DNEED_DBE_BUF_VALIDATE */
#endif
-#ifndef MultibufferDefines
-#if BuildMultibuffer
-#define MultibufferDefines -DMULTIBUFFER
-#else
-#define MultibufferDefines /**/
-#endif
-#endif
-
#ifndef ScreenSaverExtensionDefines
#if BuildScreenSaverExt
#define ScreenSaverExtensionDefines -DSCREENSAVER
@@ -608,20 +538,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#define ScreenSaverExtensionDefines /**/
#endif
#endif
-#ifndef VidModeExtensionDefines
-#if BuildXF86VidModeExt
-#define VidModeExtensionDefines -DXF86VIDMODE
-#else
-#define VidModeExtensionDefines /**/
-#endif
-#endif
-#ifndef XF86MiscExtensionDefines
-#if BuildXF86MiscExt
-#define XF86MiscExtensionDefines -DXF86MISC
-#else
-#define XF86MiscExtensionDefines /**/
-#endif
-#endif
#ifndef XF86BigfontExtensionDefines
#if BuildXF86BigfontExt
@@ -663,14 +579,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef AppgroupDefines
-#if BuildAppgroup
-#define AppgroupDefines -DXAPPGROUP
-#else
-#define AppgroupDefines /**/
-#endif
-#endif
-
#ifndef XCSecurityDefines
#if BuildXCSecurity
#define XCSecurityDefines -DXCSECURITY
@@ -679,14 +587,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef CupDefines
-#if BuildCup
-#define CupDefines -DTOGCUP
-#else
-#define CupDefines /**/
-#endif
-#endif
-
#ifndef DPMSDefines
#if BuildDPMS
#define DPMSDefines -DDPMSExtension
@@ -711,14 +611,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef FontCacheExtentionDefines
-#if BuildFontCache
-#define FontCacheExtensionDefines -DFONTCACHE
-#else
-#define FontCacheExtensionDefines /**/
-#endif
-#endif
-
#ifndef XfixesDefines
#if BuildXfixes
#define XfixesDefines -DXFIXES
@@ -743,14 +635,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef XevieDefines
-#if BuildXevie
-#define XevieDefines -DXEVIE
-#else
-#define XevieDefines /**/
-#endif
-#endif
-
#ifndef RootlessDefines
#if BuildRootless
#define RootlessDefines -DROOTLESS
@@ -764,12 +648,20 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef PervasiveExtensionDefines
#define PervasiveExtensionDefines \
- ShapeDefines XInputDefines XkbDefines AppgroupDefines \
- XCSecurityDefines CupDefines PervasiveDBEDefines \
- XF86BigfontExtensionDefines DPMSDefines \
+ PervasiveDBEDefines \
+ ShapeDefines \
+ XInputDefines \
+ XkbDefines \
+ XCSecurityDefines \
+ XF86BigfontExtensionDefines \
+ DPMSDefines \
+ SitePervasiveExtensionDefines \
+ RenderDefines \
+ RandRDefines \
XineramaDefines \
- SitePervasiveExtensionDefines RenderDefines RandRDefines \
- XfixesDefines XDamageDefines CompositeDefines XevieDefines \
+ XfixesDefines \
+ XDamageDefines \
+ CompositeDefines \
RootlessDefines
#endif
#ifndef SiteExtensionDefines
@@ -777,12 +669,18 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#ifndef BaseExtensionDefines
#define BaseExtensionDefines \
- MultibufferDefines MITMiscDefines XTestDefines XTrapDefines \
- XSyncDefines XCMiscDefines RECORDDefines \
- ShmDefines BigReqDefines VidModeExtensionDefines \
- XF86MiscExtensionDefines DBEDefines DPMSDefines EVIDefines \
- ScreenSaverExtensionDefines XvExtensionDefines XvMCExtensionDefines \
- GlxDefines FontCacheExtensionDefines SiteExtensionDefines \
+ DBEDefines \
+ XTestDefines \
+ XSyncDefines \
+ RECORDDefines \
+ ShmDefines \
+ BigReqDefines \
+ DPMSDefines \
+ ScreenSaverExtensionDefines \
+ XvExtensionDefines \
+ XvMCExtensionDefines \
+ GlxDefines \
+ SiteExtensionDefines \
XResExtensionDefines
#endif
#define ExtensionDefines BaseExtensionDefines ExtensionOSDefines