mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-11-28 11:06:25 +00:00
- mesa-6.5.1-build-config.patch: Add i965 to x86-64 config.
This commit is contained in:
Adam Jackson
parent
ca121dd8d8
commit
cbd395ee3f
2 changed files with 43 additions and 31 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
--- mesa-cvs/configs/linux-dri-ppc.build-config 2005-08-19 16:20:03.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-dri-ppc.build-config 2005-08-19 18:03:05.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux-dri-ppc 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-dri-ppc 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -5,7 +5,7 @@
|
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
|
||||||
|
|
||||||
CONFIG_NAME = linux-dri-ppc
|
CONFIG_NAME = linux-dri-ppc
|
||||||
|
|
||||||
|
|
@ -9,9 +9,9 @@
|
||||||
PIC_FLAGS = -fPIC
|
PIC_FLAGS = -fPIC
|
||||||
|
|
||||||
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
|
||||||
--- mesa-cvs/configs/linux-dri-x86.build-config 2005-09-12 11:19:19.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-dri-x86.build-config 2005-09-12 11:03:11.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux-dri-x86 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-dri-x86 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -6,7 +6,7 @@
|
@@ -6,7 +6,7 @@ include $(TOP)/configs/linux-dri
|
||||||
CONFIG_NAME = linux-dri-x86
|
CONFIG_NAME = linux-dri-x86
|
||||||
|
|
||||||
# Unnecessary on x86, generally.
|
# Unnecessary on x86, generally.
|
||||||
|
|
@ -20,9 +20,18 @@
|
||||||
|
|
||||||
# Add -m32 to CFLAGS:
|
# Add -m32 to CFLAGS:
|
||||||
ARCH_FLAGS = -m32
|
ARCH_FLAGS = -m32
|
||||||
--- mesa-cvs/configs/linux-osmesa16.build-config 2006-07-12 22:50:27.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-dri-x86-64.build-config 2006-08-25 15:53:41.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux-osmesa16 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-dri-x86-64 2006-08-25 15:53:51.000000000 -0400
|
||||||
@@ -17,7 +17,7 @@
|
@@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
|
||||||
|
# the new interface. i810 are missing because there is no x86-64
|
||||||
|
# system where they could *ever* be used.
|
||||||
|
#
|
||||||
|
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||||
|
+DRI_DIRS = i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
|
||||||
|
|
||||||
|
--- Mesa-6.5.1/configs/linux-osmesa16.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
|
+++ Mesa-6.5.1/configs/linux-osmesa16 2006-08-25 15:53:24.000000000 -0400
|
||||||
|
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
# Directories
|
||||||
|
|
@ -31,9 +40,9 @@
|
||||||
DRIVER_DIRS = osmesa
|
DRIVER_DIRS = osmesa
|
||||||
PROGRAM_DIRS =
|
PROGRAM_DIRS =
|
||||||
|
|
||||||
--- mesa-cvs/configs/linux.build-config 2005-10-28 09:11:00.000000000 -0400
|
--- Mesa-6.5.1/configs/linux.build-config 2006-08-17 10:39:11.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -8,7 +8,9 @@
|
@@ -8,7 +8,9 @@ CONFIG_NAME = linux
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CXX = g++
|
CXX = g++
|
||||||
|
|
||||||
|
|
@ -44,9 +53,9 @@
|
||||||
PIC_FLAGS = -fPIC
|
PIC_FLAGS = -fPIC
|
||||||
|
|
||||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
|
||||||
--- mesa-cvs/configs/linux-dri.build-config 2006-08-09 15:14:05.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-dri.build-config 2006-08-17 10:09:02.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux-dri 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-dri 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -12,8 +12,9 @@
|
@@ -12,8 +12,9 @@ CXX = g++
|
||||||
#MKDEP = /usr/X11R6/bin/makedepend
|
#MKDEP = /usr/X11R6/bin/makedepend
|
||||||
#MKDEP = gcc -M
|
#MKDEP = gcc -M
|
||||||
#MKDEP_OPTIONS = -MF depend
|
#MKDEP_OPTIONS = -MF depend
|
||||||
|
|
@ -57,33 +66,33 @@
|
||||||
PIC_FLAGS = -fPIC
|
PIC_FLAGS = -fPIC
|
||||||
|
|
||||||
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
|
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
|
||||||
@@ -24,8 +25,6 @@
|
@@ -24,8 +25,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU
|
||||||
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
|
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
|
||||||
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
|
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
|
||||||
|
|
||||||
-X11_INCLUDES = -I/usr/X11R6/include
|
-X11_INCLUDES = -I/usr/X11R6/include
|
||||||
-
|
-
|
||||||
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
|
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
|
||||||
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
|
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
|
||||||
|
|
||||||
@@ -35,7 +34,7 @@
|
@@ -35,7 +34,7 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAG
|
||||||
ASM_SOURCES =
|
ASM_SOURCES =
|
||||||
|
|
||||||
# Library/program dependencies
|
# Library/program dependencies
|
||||||
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
|
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
|
||||||
+EXTRA_LIB_PATH =
|
+EXTRA_LIB_PATH =
|
||||||
|
|
||||||
|
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
|
||||||
LIBDRM_LIB = `pkg-config --libs libdrm`
|
LIBDRM_LIB = `pkg-config --libs libdrm`
|
||||||
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
|
@@ -65,4 +64,4 @@ WINDOW_SYSTEM=dri
|
||||||
@@ -64,4 +63,4 @@
|
|
||||||
# gamma are missing because they have not been converted to use the new
|
# gamma are missing because they have not been converted to use the new
|
||||||
# interface.
|
# interface.
|
||||||
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
|
||||||
- savage sis tdfx trident unichrome ffb
|
- savage sis tdfx trident unichrome ffb
|
||||||
+ savage tdfx trident unichrome ffb # sis
|
+ savage tdfx trident unichrome ffb # sis
|
||||||
--- mesa-cvs/configs/linux-osmesa32.build-config 2006-07-12 22:50:27.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-osmesa32.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux-osmesa32 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-osmesa32 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -17,7 +17,7 @@
|
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa32.so
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
# Directories
|
||||||
|
|
@ -92,9 +101,9 @@
|
||||||
DRIVER_DIRS = osmesa
|
DRIVER_DIRS = osmesa
|
||||||
PROGRAM_DIRS =
|
PROGRAM_DIRS =
|
||||||
|
|
||||||
--- mesa-cvs/configs/default.build-config 2006-07-20 00:34:36.000000000 -0400
|
--- Mesa-6.5.1/configs/default.build-config 2006-07-20 12:08:04.000000000 -0400
|
||||||
+++ mesa-cvs/configs/default 2006-08-14 13:46:03.000000000 -0400
|
+++ Mesa-6.5.1/configs/default 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -55,11 +55,11 @@
|
@@ -55,11 +55,11 @@ ASM_SOURCES =
|
||||||
|
|
||||||
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
|
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
|
||||||
# order to build the Motif widget too)
|
# order to build the Motif widget too)
|
||||||
|
|
@ -108,7 +117,7 @@
|
||||||
SRC_DIRS = mesa glu glut/glx glw
|
SRC_DIRS = mesa glu glut/glx glw
|
||||||
GLU_DIRS = sgi
|
GLU_DIRS = sgi
|
||||||
DRIVER_DIRS = x11 osmesa
|
DRIVER_DIRS = x11 osmesa
|
||||||
@@ -73,14 +73,14 @@
|
@@ -73,14 +73,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l
|
||||||
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
|
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
|
||||||
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
|
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
|
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
|
||||||
|
|
@ -125,9 +134,9 @@
|
||||||
|
|
||||||
# Where libGL will look for DRI hardware drivers
|
# Where libGL will look for DRI hardware drivers
|
||||||
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
|
||||||
--- mesa-cvs/configs/linux-osmesa.build-config 2006-07-12 22:50:27.000000000 -0400
|
--- Mesa-6.5.1/configs/linux-osmesa.build-config 2006-07-12 22:43:20.000000000 -0400
|
||||||
+++ mesa-cvs/configs/linux-osmesa 2006-08-14 13:44:40.000000000 -0400
|
+++ Mesa-6.5.1/configs/linux-osmesa 2006-08-25 15:53:24.000000000 -0400
|
||||||
@@ -14,9 +14,9 @@
|
@@ -14,9 +14,9 @@ CXXFLAGS = -O3 -ansi -pedantic -fPIC -ff
|
||||||
|
|
||||||
|
|
||||||
# Directories
|
# Directories
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Version: 6.5.1
|
Version: 6.5.1
|
||||||
Release: 0.rc1%{?dist}
|
Release: 0.rc1.1%{?dist}
|
||||||
License: MIT/X11
|
License: MIT/X11
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
|
|
@ -500,6 +500,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%{_bindir}/glxinfo
|
%{_bindir}/glxinfo
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 25 2006 Adam Jackson <ajackson@redhat.com> - 6.5.1-0.rc1.1.fc6
|
||||||
|
- mesa-6.5.1-build-config.patch: Add i965 to x86-64 config.
|
||||||
|
|
||||||
* Wed Aug 23 2006 Kristian Høgsberg <krh@redhat.com> - 6.5.1-0.rc1.fc6
|
* Wed Aug 23 2006 Kristian Høgsberg <krh@redhat.com> - 6.5.1-0.rc1.fc6
|
||||||
- Bump to 6.5.1 RC1.
|
- Bump to 6.5.1 RC1.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue