View | Details | Raw Unified | Return to bug 12036
Collapse All | Expand All

(-)Mesa-7.0.2.orig/Makefile (+1 lines)
Lines 104-109 Link Here
104
linux-dri \
104
linux-dri \
105
linux-dri-debug \
105
linux-dri-debug \
106
linux-dri-x86 \
106
linux-dri-x86 \
107
linux-dri-x86-32 \
107
linux-dri-x86-64 \
108
linux-dri-x86-64 \
108
linux-dri-ppc \
109
linux-dri-ppc \
109
linux-dri-xcb \
110
linux-dri-xcb \
(-)Mesa-7.0.2.orig/configs/default (-4 / +4 lines)
Lines 25-32 Link Here
25
25
26
# Misc tools and flags
26
# Misc tools and flags
27
MKLIB_OPTIONS = 
27
MKLIB_OPTIONS = 
28
MKDEP = makedepend
28
MKDEP = true
29
MKDEP_OPTIONS = -fdepend
29
MKDEP_OPTIONS =
30
MAKE = make
30
MAKE = make
31
INSTALL = $(TOP)/bin/minstall
31
INSTALL = $(TOP)/bin/minstall
32
32
Lines 81-88 Link Here
81
81
82
82
83
# Installation directories (for make install)
83
# Installation directories (for make install)
84
INSTALL_DIR = /usr/local
84
INSTALL_DIR = /usr
85
DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
85
DRI_DRIVER_INSTALL_DIR = /usr/$(LIB_DIR)/X11/modules/dri
86
86
87
# Where libGL will look for DRI hardware drivers
87
# Where libGL will look for DRI hardware drivers
88
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
88
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
(-)Mesa-7.0.2.orig/configs/linux (-2 / +2 lines)
Lines 8-14 Link Here
8
CC = gcc
8
CC = gcc
9
CXX = g++
9
CXX = g++
10
10
11
OPT_FLAGS  = -O3 -g
11
OPT_FLAGS  = -pipe -O3
12
PIC_FLAGS  = -fPIC
12
PIC_FLAGS  = -fPIC
13
13
14
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
14
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
Lines 20-26 Link Here
20
	-D_BSD_SOURCE -D_GNU_SOURCE \
20
	-D_BSD_SOURCE -D_GNU_SOURCE \
21
	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
21
	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
22
22
23
X11_INCLUDES = -I/usr/X11R6/include
23
X11_INCLUDES =
24
24
25
CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
25
CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
26
	$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math 
26
	$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math 
(-)Mesa-7.0.2.orig/configs/linux-dri (-5 / +5 lines)
Lines 13-19 Link Here
13
#MKDEP = gcc -M
13
#MKDEP = gcc -M
14
#MKDEP_OPTIONS = -MF depend
14
#MKDEP_OPTIONS = -MF depend
15
15
16
OPT_FLAGS  = -O -g
16
OPT_FLAGS  = -pipe -O3
17
PIC_FLAGS  = -fPIC
17
PIC_FLAGS  = -fPIC
18
18
19
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
19
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
Lines 25-31 Link Here
25
	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
25
	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
26
	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
26
	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
27
27
28
X11_INCLUDES = -I/usr/X11R6/include
28
X11_INCLUDES =
29
29
30
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
30
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
31
	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
31
	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
Lines 41-47 Link Here
41
ASM_SOURCES = 
41
ASM_SOURCES = 
42
42
43
# Library/program dependencies
43
# Library/program dependencies
44
EXTRA_LIB_PATH=-L/usr/X11R6/lib
44
EXTRA_LIB_PATH=
45
45
46
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
46
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
47
LIBDRM_LIB = `pkg-config --libs libdrm`
47
LIBDRM_LIB = `pkg-config --libs libdrm`
Lines 71-75 Link Here
71
71
72
# gamma are missing because they have not been converted to use the new
72
# gamma are missing because they have not been converted to use the new
73
# interface.
73
# interface.
74
DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
74
DRI_DIRS = mach64 mga nouveau r128 r200 r300 radeon savage tdfx
75
	savage sis tdfx trident unichrome ffb
75
(-)Mesa-7.0.2.orig/configs/linux-dri-x86 (-8 / +1 lines)
Lines 1-14 Link Here
1
# -*-makefile-*-
1
# -*-makefile-*-
2
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
2
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
3
4
include $(TOP)/configs/linux-dri
3
include $(TOP)/configs/linux-dri
5
4
6
CONFIG_NAME = linux-dri-x86
5
CONFIG_NAME = linux-dri-x86
7
6
8
# Add -m32 to CFLAGS:
7
DRI_DIRS += i915 i965 sis unichrome
9
ARCH_FLAGS = -m32
10
11
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
12
ASM_SOURCES = $(X86_SOURCES)
13
ASM_API = $(X86_API)
14
(-)Mesa-7.0.2.orig/configs/linux-dri-x86-32 (+15 lines)
Line 0 Link Here
1
# -*-makefile-*-
2
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
3
4
include $(TOP)/configs/linux-dri-x86
5
6
CONFIG_NAME = linux-dri-x86-32
7
8
# Add -m32 to CFLAGS:
9
ARCH_FLAGS = -m32 -DGLX_USE_TLS
10
11
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
12
ASM_SOURCES = $(X86_SOURCES)
13
ASM_API = $(X86_API)
14
15
DRI_DIRS += i810
(-)Mesa-7.0.2.orig/configs/linux-dri-x86-64 (-12 / +2 lines)
Lines 1-24 Link Here
1
# -*-makefile-*-
1
# -*-makefile-*-
2
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
2
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
3
3
4
include $(TOP)/configs/linux-dri
4
include $(TOP)/configs/linux-dri-x86
5
5
6
CONFIG_NAME = linux-dri-x86-64
6
CONFIG_NAME = linux-dri-x86-64
7
7
8
ARCH_FLAGS = -m64
8
ARCH_FLAGS = -m64 -DGLX_USE_TLS
9
9
10
ASM_FLAGS = -DUSE_X86_64_ASM
10
ASM_FLAGS = -DUSE_X86_64_ASM
11
ASM_SOURCES = $(X86-64_SOURCES)
11
ASM_SOURCES = $(X86-64_SOURCES)
12
ASM_API = $(X86-64_API)
12
ASM_API = $(X86-64_API)
13
13
14
LIB_DIR = lib64
14
LIB_DIR = lib64
15
16
# Library/program dependencies
17
EXTRA_LIB_PATH=-L/usr/X11R6/lib64
18
19
# ffb, gamma, and sis are missing because they have not be converted to use
20
# the new interface.  i810 are missing because there is no x86-64
21
# system where they could *ever* be used.
22
#
23
DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
24
(-)Mesa-7.0.2.orig/src/mesa/drivers/dri/Makefile.template (-1 / +1 lines)
Lines 75-81 Link Here
75
75
76
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
76
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
77
	$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
77
	$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@ \
78
		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
78
		$(OBJECTS) $(MESA_MODULES) -L$(TOP)/$(LIB_DIR) -lGL $(WINOBJ) $(DRI_LIB_DEPS)
79
79
80
80
81
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
81
$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)

Return to bug 12036