diff options
Diffstat (limited to 'graphics/dri/files/patch-freebsd-dri')
| -rw-r--r-- | graphics/dri/files/patch-freebsd-dri | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/graphics/dri/files/patch-freebsd-dri b/graphics/dri/files/patch-freebsd-dri index c63cdf85ecf6..bd9cdbcb03b9 100644 --- a/graphics/dri/files/patch-freebsd-dri +++ b/graphics/dri/files/patch-freebsd-dri @@ -1,6 +1,6 @@ ---- configs/freebsd-dri.orig Tue Nov 23 22:59:05 2004 -+++ configs/freebsd-dri Fri Dec 24 00:29:13 2004 -@@ -6,19 +6,22 @@ +--- configs/freebsd-dri.orig Tue Oct 25 01:11:57 2005 ++++ configs/freebsd-dri Fri Dec 30 00:58:57 2005 +@@ -6,32 +6,32 @@ CONFIG_NAME = freebsd-dri # Compiler and flags @@ -12,21 +12,36 @@ -OPT_FLAGS = -O +OPT_FLAGS = $(FBSDCFLAGS) --CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions --CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC -+CFLAGS = $(FBSDCFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g \ -+ -std=c9x -Wundef -fPIC -I$(LOCALBASE)/include \ -+ -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions -+CXXFLAGS = $(FBSDCXXFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic \ -+ -fPIC +-EXPAT_INCLUDES = -I/usr/local/include +-X11_INCLUDES = -I/usr/X11R6/include ++EXPAT_INCLUDES = -I${LOCALBASE}/include ++X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions + DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ + -DGLX_DIRECT_RENDERING -DHAVE_ALIAS +-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \ +- -ffast-math $(X11_INCLUDES) ++CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef \ ++ -fPIC -ffast-math $(X11_INCLUDES) + CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC ASM_SOURCES = # Library/program dependencies --DRI_LIB_DEPS = -lm -lpthread -lexpat --GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread -+DRI_LIB_DEPS = -L$(LOCALBASE)/lib -lm -lexpat ${PTHREAD_LIBS} -+GL_LIB_DEPS = -L$(X11BASE) -lX11 -lXext -lm ${PTHREAD_LIBS} + LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm +-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) +-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB) ++DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB) ++GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB) - GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm - GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 +-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm +-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 ++GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm ++GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11 + + + # Directories +-SRC_DIRS = glx/x11 mesa glu glut/glx glw ++SRC_DIRS = mesa + DRIVER_DIRS = dri + PROGRAM_DIRS = + WINDOW_SYSTEM=dri |