b7db2fa2de
- mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch - fixes for
maniadrive
- mesa-7.0.2-t_vp_build-use-less-temps.patch - fixes for maniadrive
224 lines
8.0 KiB
Diff
224 lines
8.0 KiB
Diff
diff -up Mesa-7.0.2/configs/linux.da Mesa-7.0.2/configs/linux
|
|
--- Mesa-7.0.2/configs/linux.da 2007-11-02 05:09:01.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux 2008-01-02 02:24:07.000000000 +1000
|
|
@@ -8,7 +8,9 @@ CONFIG_NAME = linux
|
|
CC = gcc
|
|
CXX = g++
|
|
|
|
-OPT_FLAGS = -O3 -g
|
|
+MKDEP = true
|
|
+
|
|
+OPT_FLAGS ?= -O3 -g
|
|
PIC_FLAGS = -fPIC
|
|
|
|
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
|
diff -up Mesa-7.0.2/configs/linux-indirect.da Mesa-7.0.2/configs/linux-indirect
|
|
--- Mesa-7.0.2/configs/linux-indirect.da 2007-11-02 05:09:01.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux-indirect 2008-01-02 02:24:07.000000000 +1000
|
|
@@ -15,7 +15,7 @@ CXX = g++
|
|
#MKDEP_OPTIONS = -MF depend
|
|
|
|
WARN_FLAGS = -Wall
|
|
-OPT_FLAGS = -O -g
|
|
+OPT_FLAGS ?= -O -g
|
|
PIC_FLAGS = -fPIC
|
|
|
|
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
|
|
@@ -47,7 +47,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11
|
|
|
|
|
|
# Directories
|
|
-SRC_DIRS = glx/x11 glu glut/glx glw
|
|
+SRC_DIRS = glx/x11 glu
|
|
DRIVER_DIRS =
|
|
PROGRAM_DIRS =
|
|
WINDOW_SYSTEM=dri
|
|
diff -up Mesa-7.0.2/configs/linux-dri.da Mesa-7.0.2/configs/linux-dri
|
|
--- Mesa-7.0.2/configs/linux-dri.da 2007-11-02 05:09:01.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux-dri 2008-01-02 02:24:07.000000000 +1000
|
|
@@ -12,8 +12,9 @@ CXX = g++
|
|
#MKDEP = /usr/X11R6/bin/makedepend
|
|
#MKDEP = gcc -M
|
|
#MKDEP_OPTIONS = -MF depend
|
|
+MKDEP = true
|
|
|
|
-OPT_FLAGS = -O -g
|
|
+OPT_FLAGS ?= -O -g
|
|
PIC_FLAGS = -fPIC
|
|
|
|
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
|
|
@@ -25,8 +26,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU
|
|
-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
|
|
-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
|
|
|
|
-X11_INCLUDES = -I/usr/X11R6/include
|
|
-
|
|
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
|
|
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
|
|
|
|
@@ -41,7 +40,7 @@ CXXFLAGS += -fno-strict-aliasing
|
|
ASM_SOURCES =
|
|
|
|
# Library/program dependencies
|
|
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
|
|
+EXTRA_LIB_PATH =
|
|
|
|
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
|
|
LIBDRM_LIB = `pkg-config --libs libdrm`
|
|
@@ -59,10 +58,10 @@ USING_EGL=0
|
|
|
|
# Directories
|
|
ifeq ($(USING_EGL), 1)
|
|
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
|
|
+SRC_DIRS = egl glx/x11 mesa glu glut/glx
|
|
PROGRAM_DIRS = egl xdemos
|
|
else
|
|
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
|
|
+SRC_DIRS = glx/x11 mesa glu
|
|
PROGRAM_DIRS = xdemos
|
|
endif
|
|
|
|
@@ -72,4 +71,4 @@ WINDOW_SYSTEM=dri
|
|
# gamma are missing because they have not been converted to use the new
|
|
# interface.
|
|
DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
|
- savage sis tdfx trident unichrome ffb
|
|
+ savage tdfx trident unichrome ffb # sis
|
|
diff -up Mesa-7.0.2/configs/default.da Mesa-7.0.2/configs/default
|
|
--- Mesa-7.0.2/configs/default.da 2007-11-02 01:30:52.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/default 2008-01-02 02:25:54.000000000 +1000
|
|
@@ -59,8 +59,8 @@ GLW_SOURCES = GLwDrawA.c
|
|
|
|
|
|
# Directories to build
|
|
-LIB_DIR = lib
|
|
-SRC_DIRS = mesa glu glut/glx glw
|
|
+LIB_DIR ?= lib
|
|
+SRC_DIRS = mesa glu
|
|
GLU_DIRS = sgi
|
|
DRIVER_DIRS = x11 osmesa
|
|
# Which subdirs under $(TOP)/progs/ to enter:
|
|
@@ -73,7 +73,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l
|
|
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
|
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
|
|
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
|
|
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
|
|
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm $(EXTRA_LIB_PATH) -lXt -lX11
|
|
|
|
# Program dependencies - specific GL/glut libraries added in Makefiles
|
|
APP_LIB_DEPS = -lm
|
|
@@ -82,7 +82,7 @@ APP_LIB_DEPS = -lm
|
|
|
|
# Installation directories (for make install)
|
|
INSTALL_DIR = /usr/local
|
|
-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
|
|
+DRI_DRIVER_INSTALL_DIR = $(DRI_DRIVER_DIR)
|
|
|
|
# Where libGL will look for DRI hardware drivers
|
|
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
|
diff -up Mesa-7.0.2/configs/linux-dri-ppc.da Mesa-7.0.2/configs/linux-dri-ppc
|
|
--- Mesa-7.0.2/configs/linux-dri-ppc.da 2007-06-22 08:10:53.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux-dri-ppc 2008-01-02 02:24:07.000000000 +1000
|
|
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
|
|
|
|
CONFIG_NAME = linux-dri-ppc
|
|
|
|
-OPT_FLAGS = -Os -mcpu=603
|
|
+OPT_FLAGS ?= -Os -mcpu=603
|
|
PIC_FLAGS = -fPIC
|
|
|
|
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
|
diff -up Mesa-7.0.2/configs/linux-osmesa16.da Mesa-7.0.2/configs/linux-osmesa16
|
|
--- Mesa-7.0.2/configs/linux-osmesa16.da 2007-11-02 05:09:01.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux-osmesa16 2008-01-02 02:24:07.000000000 +1000
|
|
@@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa16
|
|
# Compiler and flags
|
|
CC = gcc
|
|
CXX = g++
|
|
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
|
|
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
+OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math
|
|
+CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
|
|
+CXXFLAGS = $(OPT_FLAGS) $(DEFINES)
|
|
|
|
# Work around aliasing bugs - developers should comment this out
|
|
CFLAGS += -fno-strict-aliasing
|
|
@@ -20,12 +22,12 @@ OSMESA_LIB_NAME = libOSMesa16.so
|
|
|
|
|
|
# Directories
|
|
-SRC_DIRS = mesa glu
|
|
+SRC_DIRS = mesa
|
|
DRIVER_DIRS = osmesa
|
|
PROGRAM_DIRS =
|
|
|
|
|
|
# Dependencies
|
|
-OSMESA_LIB_DEPS = -lm -lpthread
|
|
+OSMESA_LIB_DEPS = -lm -lpthread -lselinux
|
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
|
|
APP_LIB_DEPS = -lOSMesa16
|
|
diff -up Mesa-7.0.2/configs/linux-osmesa32.da Mesa-7.0.2/configs/linux-osmesa32
|
|
--- Mesa-7.0.2/configs/linux-osmesa32.da 2007-11-02 05:09:01.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux-osmesa32 2008-01-02 02:24:07.000000000 +1000
|
|
@@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa32
|
|
# Compiler and flags
|
|
CC = gcc
|
|
CXX = g++
|
|
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
|
|
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
+OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math
|
|
+CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
|
|
+CXXFLAGS = $(OPT_FLAGS) $(DEFINES)
|
|
|
|
# Work around aliasing bugs - developers should comment this out
|
|
CFLAGS += -fno-strict-aliasing
|
|
@@ -20,12 +22,12 @@ OSMESA_LIB_NAME = libOSMesa32.so
|
|
|
|
|
|
# Directories
|
|
-SRC_DIRS = mesa glu
|
|
+SRC_DIRS = mesa
|
|
DRIVER_DIRS = osmesa
|
|
PROGRAM_DIRS =
|
|
|
|
|
|
# Dependencies
|
|
-OSMESA_LIB_DEPS = -lm -lpthread
|
|
+OSMESA_LIB_DEPS = -lm -lpthread -lselinux
|
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
|
|
APP_LIB_DEPS = -lOSMesa32
|
|
diff -up Mesa-7.0.2/configs/linux-osmesa.da Mesa-7.0.2/configs/linux-osmesa
|
|
--- Mesa-7.0.2/configs/linux-osmesa.da 2007-11-02 05:09:01.000000000 +1000
|
|
+++ Mesa-7.0.2/configs/linux-osmesa 2008-01-02 02:27:46.000000000 +1000
|
|
@@ -9,20 +9,22 @@ CONFIG_NAME = linux-osmesa
|
|
# Compiler and flags
|
|
CC = gcc
|
|
CXX = g++
|
|
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
|
|
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
|
|
+OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math
|
|
+CFLAGS = $(OPT_FLAGS) $(DEFINES)
|
|
+CXXFLAGS = $(OPT_FLAGS) $(DEFINES)
|
|
|
|
# Work around aliasing bugs - developers should comment this out
|
|
CFLAGS += -fno-strict-aliasing
|
|
CXXFLAGS += -fno-strict-aliasing
|
|
|
|
# Directories
|
|
-SRC_DIRS = mesa glu
|
|
+SRC_DIRS = mesa
|
|
DRIVER_DIRS = osmesa
|
|
-PROGRAM_DIRS = osdemos
|
|
+PROGRAM_DIRS =
|
|
|
|
|
|
# Dependencies
|
|
-OSMESA_LIB_DEPS = -lm -lpthread
|
|
+OSMESA_LIB_DEPS = -lm -lpthread -lselinux
|
|
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
|
|
APP_LIB_DEPS = -lOSMesa -lGLU
|