rpms/mesa
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/mesa.git synced 2024-11-28 11:06:25 +00:00
Code Issues 12 Projects Releases Packages Wiki Activity Actions
mesa/mesa-7.0-build-config.patch

232 lines
8.3 KiB
Diff
Raw Normal View History

- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
diff -up mesa-20070725/configs/linux.build-config mesa-20070725/configs/linux
--- mesa-20070725/configs/linux.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux 2007-07-25 10:33:03.000000000 -0400
@@ -8,7 +8,9 @@ CONFIG_NAME = linux
- mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. - mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too.
2007-03-02 21:46:35 +00:00
CC = gcc
CXX = g++
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
-OPT_FLAGS = -O3 -g
+MKDEP = true
+
+OPT_FLAGS ?= -O3 -g
PIC_FLAGS = -fPIC
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
diff -up mesa-20070725/configs/linux-indirect.build-config mesa-20070725/configs/linux-indirect
--- mesa-20070725/configs/linux-indirect.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-indirect 2007-07-25 10:34:40.000000000 -0400
@@ -15,7 +15,7 @@ CXX = g++
#MKDEP_OPTIONS = -MF depend
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
+OPT_FLAGS ?= -O -g
PIC_FLAGS = -fPIC
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
@@ -44,7 +44,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
# Directories
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
-SRC_DIRS = glx/x11 glu glut/glx glw
+SRC_DIRS = glx/x11 glu
DRIVER_DIRS =
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
diff -up mesa-20070725/configs/linux-dri.build-config mesa-20070725/configs/linux-dri
--- mesa-20070725/configs/linux-dri.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-dri 2007-07-25 10:34:31.000000000 -0400
@@ -12,8 +12,9 @@ CXX = g++
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
#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.
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
@@ -25,8 +26,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU
- mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. - mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too.
2007-03-02 21:46:35 +00:00
-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
-X11_INCLUDES = -I/usr/X11R6/include
-
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
@@ -36,7 +35,7 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAG
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
ASM_SOURCES =
# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
+EXTRA_LIB_PATH =
- mesa-6.5.1-build-config.patch: Add i965 to x86-64 config.
2006-08-25 20:00:28 +00:00
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
LIBDRM_LIB = `pkg-config --libs libdrm`
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
@@ -54,10 +53,10 @@ USING_EGL=0
Update build-config patch again to *really* avoid building GLw.
2006-09-19 22:25:15 +00:00
# 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
else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
+SRC_DIRS = glx/x11 mesa glu
Update build-config patch again to *really* avoid building GLw.
2006-09-19 22:25:15 +00:00
PROGRAM_DIRS =
endif
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
@@ -67,4 +66,4 @@ WINDOW_SYSTEM=dri
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
# gamma are missing because they have not been converted to use the new
# interface.
- Update to 6.5.2.
2006-12-03 23:11:22 +00:00
DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
- savage sis tdfx trident unichrome ffb
+ savage tdfx trident unichrome ffb # sis
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
diff -up mesa-20070725/configs/linux-dri-x86.build-config mesa-20070725/configs/linux-dri-x86
--- mesa-20070725/configs/linux-dri-x86.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-dri-x86 2007-07-25 10:33:03.000000000 -0400
@@ -6,7 +6,7 @@ include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-x86
- mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. - mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too.
2007-03-02 21:46:35 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
# Unnecessary on x86, generally.
-PIC_FLAGS =
+# PIC_FLAGS =
- mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. - mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too.
2007-03-02 21:46:35 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
# Add -m32 to CFLAGS:
ARCH_FLAGS = -m32
diff -up mesa-20070725/configs/default.build-config mesa-20070725/configs/default
--- mesa-20070725/configs/default.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/default 2007-07-25 10:34:20.000000000 -0400
@@ -58,8 +58,8 @@ GLW_SOURCES = GLwDrawA.c
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
# 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:
@@ -72,14 +72,14 @@ 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
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
Update build-config patch again to *really* avoid building GLw.
2006-09-19 22:25:15 +00:00
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
# 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-20070725/configs/linux-dri-ppc.build-config mesa-20070725/configs/linux-dri-ppc
--- mesa-20070725/configs/linux-dri-ppc.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-dri-ppc 2007-07-25 10:33:03.000000000 -0400
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
Update build-config patch again to *really* avoid building GLw.
2006-09-19 22:25:15 +00:00
CONFIG_NAME = linux-dri-ppc
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
Update build-config patch again to *really* avoid building GLw.
2006-09-19 22:25:15 +00:00
-OPT_FLAGS = -Os -mcpu=603
+OPT_FLAGS ?= -Os -mcpu=603
PIC_FLAGS = -fPIC
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
Update build-config patch again to *really* avoid building GLw.
2006-09-19 22:25:15 +00:00
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
diff -up mesa-20070725/configs/linux-osmesa16.build-config mesa-20070725/configs/linux-osmesa16
--- mesa-20070725/configs/linux-osmesa16.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-osmesa16 2007-07-25 10:33:03.000000000 -0400
@@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa16
- mesa-6.5.2-picify-dri-drivers.patch: Attempt to make the DRI drivers PIC. - mesa-6.5.1-build-config.patch: Apply RPM_OPT_FLAGS to OSMesa too.
2007-03-02 21:46:35 +00:00
# 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)
# Library names
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
@@ -17,12 +19,12 @@ OSMESA_LIB_NAME = libOSMesa16.so
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
# Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = mesa
DRIVER_DIRS = osmesa
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
PROGRAM_DIRS =
auto-import mesa-6.5-22.20060818cvs.fc6 on branch devel from mesa-6.5-22.20060818cvs.fc6.src.rpm
2006-08-18 19:52:19 +00:00
# Dependencies
- mesa-6.5.1-build-config.patch: Add -lselinux to osmesa builds. (#207767)
2006-09-25 22:29:14 +00:00
-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
- Rebase to upstream 7.0.1 release - ajax provided patches: for updated selinux awareness, build config - gl visibility and picify were fixed upstream - OS mesa library version are 6.5.3 not 7.0.1 - spec fix
2007-08-14 05:33:46 +00:00
diff -up mesa-20070725/configs/linux-osmesa32.build-config mesa-20070725/configs/linux-osmesa32
--- mesa-20070725/configs/linux-osmesa32.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-osmesa32 2007-07-25 10:33:03.000000000 -0400
@@ -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)
# Library names
@@ -17,12 +19,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-20070725/configs/linux-osmesa.build-config mesa-20070725/configs/linux-osmesa
--- mesa-20070725/configs/linux-osmesa.build-config 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/configs/linux-osmesa 2007-07-25 10:33:03.000000000 -0400
@@ -9,17 +9,18 @@ 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)
# 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
Reference in a new issue Copy permalink