From 4fafba61d5402d4e4d2c21ba1be3ed8969b99334 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 11 Feb 2006 03:03:45 +0000 Subject: [PATCH] Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it compiling in kdrive. --- ChangeLog | 17 +++++++++++++++++ GL/glx/Makefile.am | 3 ++- GL/mesa/X/Makefile.am | 2 +- GL/mesa/array_cache/Makefile.am | 3 ++- GL/mesa/glapi/Makefile.am | 3 ++- GL/mesa/main/Makefile.am | 3 ++- GL/mesa/math/Makefile.am | 3 ++- GL/mesa/shader/Makefile.am | 3 ++- GL/mesa/swrast/Makefile.am | 3 ++- GL/mesa/swrast_setup/Makefile.am | 3 ++- GL/mesa/tnl/Makefile.am | 3 ++- hw/kdrive/src/kdrive.c | 3 +++ include/kdrive-config.h.in | 3 +++ 13 files changed, 42 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a619ed28..b0d62f4f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-02-10 Eric Anholt + + * GL/glx/Makefile.am: + * GL/mesa/X/Makefile.am: + * GL/mesa/array_cache/Makefile.am: + * GL/mesa/glapi/Makefile.am: + * GL/mesa/main/Makefile.am: + * GL/mesa/math/Makefile.am: + * GL/mesa/shader/Makefile.am: + * GL/mesa/swrast/Makefile.am: + * GL/mesa/swrast_setup/Makefile.am: + * GL/mesa/tnl/Makefile.am: + * hw/kdrive/src/kdrive.c: (xf86WrapperInit): + * include/kdrive-config.h.in: + Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get + it compiling in kdrive. + 2006-02-10 Eric Anholt * GL/glx/glxcmds.c: diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index 2413e539e..db2708335 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -9,7 +9,8 @@ AM_CFLAGS = \ -I@MESA_SOURCE@/src/mesa/main \ @SERVER_DEFINES@ \ @MODULE_DEFINES@ \ - @LOADER_DEFINES@ + @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER # none yet #sdk_HEADERS = diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am index e51f9e8f3..c43262914 100644 --- a/GL/mesa/X/Makefile.am +++ b/GL/mesa/X/Makefile.am @@ -19,7 +19,7 @@ INCLUDES = -I@MESA_SOURCE@/include \ # -DXFree86Server is required because the X11 driver in Mesa thinks that # symbol means "being built in the server" AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ - -DXFree86Server + -DXFree86Server -DNO_LIBCWRAPPER libX_la_SOURCES = xf86glx.c \ xf86glx_util.c \ diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am index b341f01dc..2ae01345c 100644 --- a/GL/mesa/array_cache/Makefile.am +++ b/GL/mesa/array_cache/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libac.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am index d8b7a53e2..9f2ccdee1 100644 --- a/GL/mesa/glapi/Makefile.am +++ b/GL/mesa/glapi/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libglapi.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am index b212f78fa..7d98a0cf6 100644 --- a/GL/mesa/main/Makefile.am +++ b/GL/mesa/main/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libmain.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am index 34d53c600..86969ac34 100644 --- a/GL/mesa/math/Makefile.am +++ b/GL/mesa/math/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libmath.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am index d77ea5ef3..1a9cc19f1 100644 --- a/GL/mesa/shader/Makefile.am +++ b/GL/mesa/shader/Makefile.am @@ -2,7 +2,8 @@ SUBDIRS = grammar slang noinst_LTLIBRARIES = libshader.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am index 2660cb21d..83457ad46 100644 --- a/GL/mesa/swrast/Makefile.am +++ b/GL/mesa/swrast/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libswrast.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am index d7d39ff64..113a94526 100644 --- a/GL/mesa/swrast_setup/Makefile.am +++ b/GL/mesa/swrast_setup/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libss.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am index cb88607ac..fabf1d7f8 100644 --- a/GL/mesa/tnl/Makefile.am +++ b/GL/mesa/tnl/Makefile.am @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libtnl.la -AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ + -DNO_LIBCWRAPPER INCLUDES = -I@MESA_SOURCE@/include \ -I../X \ diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 0ddc1cfc3..db087f0a7 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1514,3 +1514,6 @@ DPMSSupported (void) #endif void ddxInitGlobals(void) { /* THANK YOU XPRINT */ } +void xf86WrapperInit(void); +void xf86WrapperInit(void) { /* THANK YOU XFREE86 */ } + diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in index d8e0498e0..b3c5e37fb 100644 --- a/include/kdrive-config.h.in +++ b/include/kdrive-config.h.in @@ -10,6 +10,9 @@ /* Building kdrive server. */ #undef KDRIVESERVER +/* Build GLX extension */ +#undef GLXEXT + #if 0 /* Need XFree86 libc-replacement typedefs. */