This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 5cd80d272ba366686a3b28c5915cb5bf3ada8985 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed May 27 08:10:38 2015 +0200 imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX build methods (built-in DRI drivers, etc.). --- nx-X11/config/cf/X11.tmpl | 7 - nx-X11/config/cf/host.def | 5 - nx-X11/config/cf/linux.cf | 64 ------ nx-X11/config/cf/lnxLib.tmpl | 7 +- nx-X11/config/cf/xfree86.cf | 242 ++------------------ nx-X11/config/cf/xorg.cf | 242 ++------------------ nx-X11/config/cf/xorgsite.def | 5 - nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 2 +- nx-X11/programs/Xserver/GL/mesa/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc | 4 - .../Xserver/GL/mesa/array_cache/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/shader/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/grammar/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/slang/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/swrast/Imakefile.inc | 4 - .../Xserver/GL/mesa/swrast_setup/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc | 4 - 19 files changed, 29 insertions(+), 589 deletions(-) diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 91a9aa6..8b3cf33 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -289,13 +289,6 @@ XORGRELSTRING = XorgManVersionString #endif #ifndef BuildGlxExt #define BuildGlxExt NO -#else -#if BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion) -#undef BuildXF86DRI -#undef BuildXF86DRIDriverSupport -#define BuildXF86DRI NO -#define BuildXF86DRIDriverSupport NO -#endif #endif #ifndef BuildOSMesaLib #define BuildOSMesaLib BuildGlxExt diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 02eabbb..6b9faf7 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -165,11 +165,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ wacom void magictouch aiptek */ -/* To enable building of development DRI drivers (insecure, or not - * useful on the chosen architecture, uncomment this define. -#define BuildDevelDRIDrivers YES - */ - /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index aa28c5c..c8b3e12 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -107,12 +107,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) /* the relative symlink created by this rule causes problems for us */ # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */ # define SharedLibXdmGreet NO -# define LinkGLToUsrInclude NO -# define LinkGLToUsrLib NO # define FSUseSyslog YES -# define BuildLibGlxWithoutPIC NO - # define DriverManSuffix 4x # define DriverManDir $(MANSOURCEPATH)4 @@ -325,58 +321,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif #endif -/* The DRM module requires kernel services that appeared in late 2.1.x - kernels and are known to be present in 2.2.x kernels. */ -#ifndef BuildXF86DRI -# if defined(AlphaArchitecture) -# define BuildXF86DRI YES -# elif defined(Arm32Architecture) -# define BuildXF86DRI NO -# elif defined(HPArchitecture) -# define BuildXF86DRI YES -# elif defined(i386Architecture) -# if (defined(__linux__) && (OSMajorVersion > 2 || (OSMajorVersion == 2 && \ - OSMinorVersion >= 2))) || \ - defined(__FreeBSD_kernel__) -# define BuildXF86DRI YES -# else -# define BuildXF86DRI NO -# endif -# elif defined(ia64Architecture) -# define BuildXF86DRI YES -# elif defined(Mc68020Architecture) -# define BuildXF86DRI NO -# elif defined(MipsArchitecture) -# define BuildXF86DRI NO -# elif defined(PpcArchitecture) -# define BuildXF86DRI YES -# elif defined(Ppc64Architecture) -# define BuildXF86DRI NO -# elif defined(s390Architecture) || defined(s390xArchitecture) -# define BuildXF86DRI NO -# elif defined(SparcArchitecture) -# define BuildXF86DRI YES -# elif defined(SuperHArchitecture) -# define BuildXF86DRI NO -# elif defined(AMD64Architecture) -# define BuildXF86DRI YES -# else -# define BuildXF86DRI NO -# endif -#endif - -/* - * Build shared libGL and the DRI modules without -fPIC on some architectures. - * This improves performance. - */ -#ifndef BuildLibGlxWithoutPIC -# if BuildXF86DRI -# if defined(i386Architecture) -# define BuildLibGlxWithoutPIC YES -# endif -# endif -#endif - #ifndef HasAgpGart # if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture) /* The AGPGART header file is included in os-support/linux, which @@ -1006,14 +950,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic #endif -#ifndef LinkGLToUsrLib -# define LinkGLToUsrLib YES -#endif -# ifndef LinkGLToUsrInclude -# define LinkGLToUsrInclude YES -#endif - - #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index ee37270..7096ee1 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -12,12 +12,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIB) $(XLIB) -#if GlxUseBuiltInDRIDriver -#define ExtraSharedGLReqs /**/ -#else -#define ExtraSharedGLReqs -ldl -#endif -#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs +#define SharedGLReqs $(LDPRELIB) $(XLIB) -ldl #define SharedXineramaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 11c6a95..3678351 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -346,24 +346,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif -/* - * DRI drivers under development, or drivers included on this platform - * only for build testing. - */ -# ifndef DevelDRIDrivers -# if XFree86Devel -# define DevelDRIDrivers ffb -# else -# define DevelDRIDrivers /**/ -# endif -# endif - -# ifndef DriDrivers -# define DriDrivers gamma i810 i830 mga r128 radeon r200 \ - sis tdfx DevelDRIDrivers -# endif -#endif - #if defined(AMD64Architecture) # ifndef XF86Server # define XF86Server YES @@ -446,13 +428,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ vga dummy fbdev vesa # endif -/* DRI tdfx driver needs Glide, which is not available for AMD64 */ -# define TdfxDriDriver /**/ - -# define DevelDRIDrivers /**/ - -# define DriDrivers gamma i810 mga r128 radeon r200 \ - TdfxDriDriver DevelDRIDrivers #endif /*AMD64Arcitecture*/ /* SPARC and UltraSPARC drivers */ @@ -555,10 +530,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ XF86OSCardDrivers XF86ExtraCardDrivers \ DevelDrivers # endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - #endif /* Sparc64 Drivers */ @@ -653,10 +624,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers /**/ -# endif #endif /* MIPS drivers */ @@ -833,9 +800,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ savage nv cirrus DevelDrivers siliconmotion \ vga XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ -# endif #endif /* @@ -929,9 +893,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif #endif /* @@ -1021,14 +982,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver tdfx -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif #endif /* SuperH drivers */ @@ -1191,14 +1144,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma r128 -# endif #endif /* @@ -1272,190 +1217,29 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildGlxExt YES #endif -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#if BuildXF86DRI - -/* - * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. - * If more than one are defined, the compilation will fail with multiply - * defined references of GLX and OpenGL functions. - */ - -/* - * The first is a built-in driver that does software rendering client-side - * and renders to the X server via Xlib. - */ - -# ifndef GlxBuiltInXMesa -# define GlxBuiltInXMesa NO -# endif - -/* - * The rest are hardware-specific DRI drivers. - */ -# ifndef GlxBuiltInGamma -# define GlxBuiltInGamma NO -# endif -# ifndef GlxBuiltInTdfx -# define GlxBuiltInTdfx NO -# endif -# ifndef GlxBuiltInMga -# define GlxBuiltInMga NO -# endif -# ifndef GlxBuiltInI810 -# define GlxBuiltInI810 NO -# endif -# ifndef GlxBuiltInI830 -# define GlxBuiltInI830 NO -# endif -# ifndef GlxBuiltInR128 -# define GlxBuiltInR128 NO -# endif -# ifndef GlxBuiltInRadeon -# define GlxBuiltInRadeon NO -# endif -# ifndef GlxBuiltInR200 -# define GlxBuiltInR200 NO -# endif -# ifndef GlxBuiltInFfb -# define GlxBuiltInFfb NO -# endif -# ifndef GlxBuiltInSIS -# define GlxBuiltInSIS NO -# endif - -# if GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxUseBuiltInDRIDriver YES -# define DRIDynLoadDefines /**/ -# else -# define GlxUseBuiltInDRIDriver NO -# define DRIDynLoadDefines -DGLX_USE_DLOPEN -# endif - -# if GlxUseBuiltInDRIDriver -# undef DriDrivers -# if GlxBuiltInGamma -# define DriDrivers gamma -# endif -# if GlxBuiltInTdfx -# define DriDrivers tdfx -# endif -# if GlxBuiltInMga -# define DriDrivers mga -# endif -# if GlxBuiltInI810 -# define DriDrivers i810 -# endif -# if GlxBuiltInI830 -# define DriDrivers i830 -# endif -# if GlxBuiltInR128 -# define DriDrivers r128 -# endif -# if GlxBuiltInRadeon -# define DriDrivers radeon -# endif -# if GlxBuiltInR200 -# define DriDrivers r200 -# endif -# if GlxBuiltInSIS -# define DriDrivers sis -# endif -# if GlxBuiltInFfb -# define DriDrivers ffb -# endif -# endif - -#endif - -/* - * This enables building DRI support into video drivers, which can be done - * even on platforms that don't have functional DRI support. - * - * Defining BuildXF86DRIDriverSupport to YES will not work until we have a - * separate set of defines set up for building driver-only support for the - * DRI. - */ -#ifndef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO -#endif - #if BuildGlxExt -# if BuildXF86DRI -# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines -# else -# define DRIDefines /**/ -# endif -# if defined(GlxUseSGISI) && GlxUseSGISI -# define GlxCoreLibDefines -DGLX_USE_SGI_SI -# else -# define GlxCoreLibDefines -DGLX_USE_MESA -# endif +# define GlxCoreLibDefines -DGLX_USE_MESA -# if defined(SparcArchitecture) \ +# if defined(SparcArchitecture) \ || defined (Sparc64Architecture) \ || defined(ia64Architecture) \ || defined(s390xArchitecture) \ || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# elif defined(AlphaArchitecture) /* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 -mieee +# elif defined(DarwinArchitecture) /* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines -# endif - -#else - -/* If we are not building GLX, then make sure the DRI is not built */ -# undef BuildXF86DRI -# define BuildXF86DRI NO -# undef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO - -#endif +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ -#endif +# ifndef GlxExtraDefines +# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines +# endif # ifndef UseX86Emu # define UseX86Emu YES diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 8210cb0..c92162e 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -270,13 +270,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #define HasAgpGart NO #endif -/* Some DRI drivers are disabled because they are either insecure or unusable on - * this architecture. This switch allows you to enable building these drivers. - */ -#ifndef BuildDevelDRIDrivers -#define BuildDevelDRIDrivers NO -#endif - /* The glide driver only works for the loadable server at the moment */ #ifndef HasGlide2 #define HasGlide2 NO @@ -399,20 +392,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString vesa vga \ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif - -# ifndef DevelDRIDrivers -# define DevelDRIDrivers ffb mach64 unichrome -# endif - -# ifndef DriDrivers -# ifndef ia64Architecture -# define i386DRIDrivers i810 i915 sis -# else - /* SiS is 64-bit unclean as of this writing. */ -# define i386DRIDrivers /**/ -# endif -# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx -# endif #endif /* i386Architecture || ia64Architecture */ #if defined(AMD64Architecture) @@ -445,11 +424,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString vga dummy vesa i810 vmware \ XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers # endif - -/* SiS is 64-bit unclean as of this writing. */ -# ifndef DriDrivers -# define DriDrivers i915 mga r128 radeon r200 tdfx -# endif #endif /*AMD64Arcitecture*/ /* SPARC and UltraSPARC drivers */ @@ -500,10 +474,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers # endif # endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - #endif /* Sparc64 Drivers */ @@ -584,13 +554,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString vga dummy XF86OSCardDrivers \ XF86ExtraCardDrivers # endif -/* - * Glide is available for Alpha, therefore build tdfx DRM module. - * SiS is 64-bit unclean as of this writing. - */ -# ifndef DriDrivers -# define DriDrivers tdfx mga r128 radeon r200 -# endif #endif /* AlphaArchitecture */ /* @@ -621,10 +584,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers vga dummy \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -/* The tdfx driver needs Glide, which is not available for PPC. */ -# ifndef DriDrivers -# define DriDrivers mga r128 radeon r200 -# endif #endif /* PpcArchitecture || Mc68020Architecture */ /* @@ -651,9 +610,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers vga dummy \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers mga r128 radeon r200 -# endif #endif /* SuperH drivers */ @@ -751,10 +707,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers r128 -# endif #endif /* Ppc64Architecture */ /* @@ -828,197 +780,30 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildGlxExt YES #endif -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#if BuildXF86DRI - -#ifndef DriDrivers -#define DriDrivers /**/ -#endif - -#ifndef DevelDRIDrivers -#define DevelDRIDrivers /**/ -#endif - -/* - * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. - * If more than one are defined, the compilation will fail with multiply - * defined references of GLX and OpenGL functions. - */ - -/* - * The first is a built-in driver that does software rendering client-side - * and renders to the X server via Xlib. - */ - -# ifndef GlxBuiltInXMesa -# define GlxBuiltInXMesa NO -# endif - -/* - * The rest are hardware-specific DRI drivers. - */ -# ifndef GlxBuiltInGamma -# define GlxBuiltInGamma NO -# endif -# ifndef GlxBuiltInTdfx -# define GlxBuiltInTdfx NO -# endif -# ifndef GlxBuiltInMga -# define GlxBuiltInMga NO -# endif -# ifndef GlxBuiltInI810 -# define GlxBuiltInI810 NO -# endif -# ifndef GlxBuiltInI915 -# define GlxBuiltInI915 NO -# endif -# ifndef GlxBuiltInR128 -# define GlxBuiltInR128 NO -# endif -# ifndef GlxBuiltInRadeon -# define GlxBuiltInRadeon NO -# endif -# ifndef GlxBuiltInR200 -# define GlxBuiltInR200 NO -# endif -# ifndef GlxBuiltInFfb -# define GlxBuiltInFfb NO -# endif -# ifndef GlxBuiltInSIS -# define GlxBuiltInSIS NO -# endif - -# if GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI915 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI915 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxUseBuiltInDRIDriver YES -# define DRIDynLoadDefines /**/ -# else -# define GlxUseBuiltInDRIDriver NO -# define DRIDynLoadDefines -DGLX_USE_DLOPEN -# endif - -# if GlxUseBuiltInDRIDriver -# undef DriDrivers -# if GlxBuiltInGamma -# define DriDrivers gamma -# endif -# if GlxBuiltInTdfx -# define DriDrivers tdfx -# endif -# if GlxBuiltInMga -# define DriDrivers mga -# endif -# if GlxBuiltInI810 -# define DriDrivers i810 -# endif -# if GlxBuiltInI915 -# define DriDrivers i915 -# endif -# if GlxBuiltInR128 -# define DriDrivers r128 -# endif -# if GlxBuiltInRadeon -# define DriDrivers radeon -# endif -# if GlxBuiltInR200 -# define DriDrivers r200 -# endif -# if GlxBuiltInSIS -# define DriDrivers sis -# endif -# if GlxBuiltInFfb -# define DriDrivers ffb -# endif -# endif - -#endif - -/* - * This enables building DRI support into video drivers, which can be done - * even on platforms that don't have functional DRI support. - * - * Defining BuildXF86DRIDriverSupport to YES will not work until we have a - * separate set of defines set up for building driver-only support for the - * DRI. - */ -#ifndef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO -#endif - #if BuildGlxExt -# if BuildXF86DRI -# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines -# else -# define DRIDefines /**/ -# endif -# if defined(GlxUseSGISI) && GlxUseSGISI -# define GlxCoreLibDefines -DGLX_USE_SGI_SI -# else -# define GlxCoreLibDefines -DGLX_USE_MESA -# endif +# define GlxCoreLibDefines -DGLX_USE_MESA -# if defined(SparcArchitecture) \ +# if defined(SparcArchitecture) \ || defined (Sparc64Architecture) \ || defined(ia64Architecture) \ || defined(s390xArchitecture) \ || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# elif defined(AlphaArchitecture) /* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 -mieee +# elif defined(DarwinArchitecture) /* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines -# endif - -#else - -/* If we are not building GLX, then make sure the DRI is not built */ -# undef BuildXF86DRI -# define BuildXF86DRI NO -# undef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif -#endif +# ifndef GlxExtraDefines +# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines +# endif -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ #endif # ifndef UseX86Emu @@ -1561,6 +1346,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define LargePositionIndependentCFlags -fPIC #endif + #ifndef XF8_32Wid # define XF8_32Wid NO #endif diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index a4d22b4..c05e53e 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -84,11 +84,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ wacom void magictouch aiptek */ -/* To enable building of development DRI drivers (insecure, or not - * useful on the chosen architecture, uncomment this define. -#define BuildDevelDRIDrivers YES - */ - /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 8e3b77e..e3e91cd 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -46,7 +46,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18 ../shader/slang/DONE INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/include \ -I$(MESASRCDIR)/src/mesa \ -I$(SERVERSRC)/include diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc index 03a7971..99e9c71 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/ -#endif - MESABUILDDIR = MesaBuildDir COREMESASRCS = $(COREMESABASESRCS) \ diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc index d62800e..8e589c6 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ -#ifndef MesaXBuildDir -#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/ -#endif - MESAXBUILDDIR = MesaXBuildDir #ifndef MesaInXServer diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc index 9a50447..3964bdc 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaACBuildDir -#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/ -#endif - MESAACBUILDDIR = MesaACBuildDir MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc index 80b3aef..8927152 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc @@ -3,10 +3,6 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ /* gcc on ppc64 defines this, causes macro recursion with pixel below */ #undef pixel -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/main/ -#endif - MESABUILDDIR = MesaBuildDir #ifdef NeedAllMesaSrc diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc index cd1dcc4..7356a46 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaMathBuildDir -#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/ -#endif - MESAMATHBUILDDIR = MesaMathBuildDir MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc index 7d0032e..383bdc0 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86:$ -#ifndef MesaShaderBuildDir -#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/ -#endif - MESASHADERBUILDDIR = MesaShaderBuildDir MESA_SHADER_SRCS = $(MESASHADERBUILDDIR)arbprogparse.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc index b2e885f..e119620 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86$ -#ifndef MesaGrammarBuildDir -#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/ -#endif - MESAGRAMMARBUILDDIR=MesaGrammarBuildDir MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc index d824ca7..4358b89 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86$ -#ifndef MesaSlangBuildDir -#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/ -#endif - MESASLANGBUILDDIR=MesaSlangBuildDir MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc index 683b8f0..c57416d 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaSwrastBuildDir -#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/swrast/ -#endif - MESASWRASTBUILDDIR = MesaSwrastBuildDir MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc index 8d32aed..4fb1076 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaSwrastSetupBuildDir -#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/ -#endif - MESASWRSETUPDIR = MesaSwrastSetupBuildDir MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc index a294a6f..3a124c1 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaTnlBuildDir -#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/ -#endif - MESATNLBUILDDIR = MesaTnlBuildDir MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git