frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it 

compiling in kdrive.
This commit is contained in:
Eric Anholt 2006-02-11 03:03:45 +00:00
parent c3d1403672
commit 4fafba61d5
13 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2006-02-10 Eric Anholt <anholt@FreeBSD.org>
* 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 <anholt@FreeBSD.org> 2006-02-10 Eric Anholt <anholt@FreeBSD.org>
* GL/glx/glxcmds.c: * GL/glx/glxcmds.c:

3
GL/glx/Makefile.am
View File

@ -9,7 +9,8 @@ AM_CFLAGS = \
-I@MESA_SOURCE@/src/mesa/main \ -I@MESA_SOURCE@/src/mesa/main \
@SERVER_DEFINES@ \ @SERVER_DEFINES@ \
@MODULE_DEFINES@ \ @MODULE_DEFINES@ \
@LOADER_DEFINES@ @LOADER_DEFINES@ \
-DNO_LIBCWRAPPER
# none yet # none yet
#sdk_HEADERS = #sdk_HEADERS =

2
GL/mesa/X/Makefile.am
View File

@ -19,7 +19,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
# -DXFree86Server is required because the X11 driver in Mesa thinks that # -DXFree86Server is required because the X11 driver in Mesa thinks that
# symbol means "being built in the server" # symbol means "being built in the server"
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ \
-DXFree86Server -DXFree86Server -DNO_LIBCWRAPPER
libX_la_SOURCES = xf86glx.c \ libX_la_SOURCES = xf86glx.c \
xf86glx_util.c \ xf86glx_util.c \

3
GL/mesa/array_cache/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libac.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/glapi/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libglapi.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/main/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libmain.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/math/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libmath.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/shader/Makefile.am
View File

@ -2,7 +2,8 @@ SUBDIRS = grammar slang
noinst_LTLIBRARIES = libshader.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/swrast/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libswrast.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/swrast_setup/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libss.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
GL/mesa/tnl/Makefile.am
View File

@ -1,6 +1,7 @@
noinst_LTLIBRARIES = libtnl.la 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 \ INCLUDES = -I@MESA_SOURCE@/include \
-I../X \ -I../X \

3
hw/kdrive/src/kdrive.c
View File

@ -1514,3 +1514,6 @@ DPMSSupported (void)
#endif #endif
void ddxInitGlobals(void) { /* THANK YOU XPRINT */ } void ddxInitGlobals(void) { /* THANK YOU XPRINT */ }
void xf86WrapperInit(void);
void xf86WrapperInit(void) { /* THANK YOU XFREE86 */ }

3
include/kdrive-config.h.in
View File

@ -10,6 +10,9 @@
/* Building kdrive server. */ /* Building kdrive server. */
#undef KDRIVESERVER #undef KDRIVESERVER
/* Build GLX extension */
#undef GLXEXT
#if 0 #if 0
/* Need XFree86 libc-replacement typedefs. */ /* Need XFree86 libc-replacement typedefs. */