rpms/mesa/devel mesa-7.0-build-config.patch, NONE, 1.1 mesa-7.0-i-already-defined-glapi-you-twit.patch, NONE, 1.1 mesa-7.0-selinux-awareness.patch, NONE, 1.1 mesa-7.0-symlinks-before-depend.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 mesa.spec, 1.135, 1.136 sources, 1.15, 1.16 i965-interleaved-arrays-fix.patch, 1.1, NONE mesa-6.5.1-build-config.patch, 1.8, NONE mesa-6.5.1-selinux-awareness.patch, 1.4, NONE mesa-6.5.2-fix-glut-demos.patch, 1.1, NONE mesa-6.5.2-libgl-visibility.patch, 1.1, NONE mesa-6.5.2-picify-dri-drivers.patch, 1.1, NONE mesa-6.5.2-r300-parallel-build.patch, 1.1, NONE mesa-6.5.2-radeon-backports-231787.patch, 1.2, NONE mesa-6.5.2-via-respect-my-cliplist.patch, 1.1, NONE post-6.5.1-i965-fixes.patch, 1.1, NONE redhat-mesa-source-filelist-generator, 1.1, NONE
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Tue Aug 14 05:34:19 UTC 2007
Author: airlied
Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12148
Modified Files:
.cvsignore mesa.spec sources
Added Files:
mesa-7.0-build-config.patch
mesa-7.0-i-already-defined-glapi-you-twit.patch
mesa-7.0-selinux-awareness.patch
mesa-7.0-symlinks-before-depend.patch
Removed Files:
i965-interleaved-arrays-fix.patch
mesa-6.5.1-build-config.patch
mesa-6.5.1-selinux-awareness.patch
mesa-6.5.2-fix-glut-demos.patch
mesa-6.5.2-libgl-visibility.patch
mesa-6.5.2-picify-dri-drivers.patch
mesa-6.5.2-r300-parallel-build.patch
mesa-6.5.2-radeon-backports-231787.patch
mesa-6.5.2-via-respect-my-cliplist.patch
post-6.5.1-i965-fixes.patch
redhat-mesa-source-filelist-generator
Log Message:
* Mon Aug 13 2007 Dave Airlie <airlied at redhat.com> - 7.0.1-1
- 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
mesa-7.0-build-config.patch:
--- NEW FILE mesa-7.0-build-config.patch ---
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
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-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
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.
@@ -44,7 +44,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-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++
#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)
@@ -36,7 +35,7 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAG
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`
@@ -54,10 +53,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
else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = glx/x11 mesa glu
PROGRAM_DIRS =
endif
@@ -67,4 +66,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-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
# Unnecessary on x86, generally.
-PIC_FLAGS =
+# PIC_FLAGS =
# 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
# 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
# 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
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-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
# 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
@@ -17,12 +19,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-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
mesa-7.0-i-already-defined-glapi-you-twit.patch:
--- NEW FILE mesa-7.0-i-already-defined-glapi-you-twit.patch ---
diff -up mesa-20070725/include/GL/glu.h.jx mesa-20070725/include/GL/glu.h
--- mesa-20070725/include/GL/glu.h.jx 2007-07-25 09:36:03.000000000 -0400
+++ mesa-20070725/include/GL/glu.h 2007-07-25 10:27:49.000000000 -0400
@@ -44,19 +44,6 @@
#define GLAPIENTRYP GLAPIENTRY *
#endif
-#ifdef GLAPI
-#undef GLAPI
-#endif
-
-# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32)
-# define GLAPI __declspec(dllexport)
-# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-# define GLAPI __declspec(dllimport)
-# else /* for use with static link lib build of Win32 edition only */
-# define GLAPI extern
-# endif /* _STATIC_MESA support */
-
-
#ifndef GLAPI
#define GLAPI
#endif
mesa-7.0-selinux-awareness.patch:
--- NEW FILE mesa-7.0-selinux-awareness.patch ---
diff -up Mesa-7.0/src/mesa/tnl/t_vertex_sse.c.jx Mesa-7.0/src/mesa/tnl/t_vertex_sse.c
--- Mesa-7.0/src/mesa/tnl/t_vertex_sse.c.jx 2007-06-21 18:10:54.000000000 -0400
+++ Mesa-7.0/src/mesa/tnl/t_vertex_sse.c 2007-07-23 15:59:26.000000000 -0400
@@ -348,7 +348,8 @@ static GLboolean build_vertex_emit( stru
struct x86_reg vp1 = x86_make_reg(file_XMM, 2);
GLubyte *fixup, *label;
- x86_init_func(&p->func);
+ if (!x86_init_func(&p->func))
+ return GL_FALSE;
/* Push a few regs?
*/
@@ -646,7 +647,10 @@ void _tnl_generate_sse_emit( GLcontext *
p.identity = x86_make_reg(file_XMM, 6);
p.chan0 = x86_make_reg(file_XMM, 7);
- x86_init_func(&p.func);
+ if (!x86_init_func(&p.func)) {
+ vtx->codegen_emit = NULL;
+ return;
+ }
if (build_vertex_emit(&p)) {
_tnl_register_fastpath( vtx, GL_TRUE );
diff -up Mesa-7.0/src/mesa/x86/rtasm/x86sse.h.jx Mesa-7.0/src/mesa/x86/rtasm/x86sse.h
--- Mesa-7.0/src/mesa/x86/rtasm/x86sse.h.jx 2007-06-21 18:10:55.000000000 -0400
+++ Mesa-7.0/src/mesa/x86/rtasm/x86sse.h 2007-07-23 15:59:23.000000000 -0400
@@ -80,8 +80,8 @@ enum sse_cc {
*/
-void x86_init_func( struct x86_function *p );
-void x86_init_func_size( struct x86_function *p, GLuint code_size );
+int x86_init_func( struct x86_function *p );
+int x86_init_func_size( struct x86_function *p, GLuint code_size );
void x86_release_func( struct x86_function *p );
void (*x86_get_func( struct x86_function *p ))( void );
diff -up Mesa-7.0/src/mesa/x86/rtasm/x86sse.c.jx Mesa-7.0/src/mesa/x86/rtasm/x86sse.c
--- Mesa-7.0/src/mesa/x86/rtasm/x86sse.c.jx 2007-06-21 18:10:55.000000000 -0400
+++ Mesa-7.0/src/mesa/x86/rtasm/x86sse.c 2007-07-23 15:59:23.000000000 -0400
@@ -1063,15 +1063,17 @@ struct x86_reg x86_fn_arg( struct x86_fu
}
-void x86_init_func( struct x86_function *p )
+int x86_init_func( struct x86_function *p )
{
- x86_init_func_size(p, 1024);
+ return x86_init_func_size(p, 1024);
}
-void x86_init_func_size( struct x86_function *p, GLuint code_size )
+int x86_init_func_size( struct x86_function *p, GLuint code_size )
{
p->store = _mesa_exec_malloc(code_size);
p->csr = p->store;
+
+ return (p->store != NULL);
}
void x86_release_func( struct x86_function *p )
diff -up Mesa-7.0/src/mesa/main/execmem.c.jx Mesa-7.0/src/mesa/main/execmem.c
--- Mesa-7.0/src/mesa/main/execmem.c.jx 2007-06-21 18:10:54.000000000 -0400
+++ Mesa-7.0/src/mesa/main/execmem.c 2007-07-23 16:02:30.000000000 -0400
@@ -46,6 +46,7 @@
#include <unistd.h>
#include <sys/mman.h>
#include "mm.h"
+#include <selinux/selinux.h>
#define EXEC_HEAP_SIZE (10*1024*1024)
@@ -55,9 +56,16 @@ static struct mem_block *exec_heap = NUL
static unsigned char *exec_mem = NULL;
-static void
+static int
init_heap(void)
{
+
+ if (is_selinux_enabled()) {
+ if (!security_get_boolean_active("allow_execmem") ||
+ !security_get_boolean_pending("allow_execmem"))
+ return 0;
+ }
+
if (!exec_heap)
exec_heap = mmInit( 0, EXEC_HEAP_SIZE );
@@ -65,6 +73,8 @@ init_heap(void)
exec_mem = (unsigned char *) mmap(0, EXEC_HEAP_SIZE,
PROT_EXEC | PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+ return (exec_mem != NULL);
}
@@ -76,7 +86,8 @@ _mesa_exec_malloc(GLuint size)
_glthread_LOCK_MUTEX(exec_mutex);
- init_heap();
+ if (!init_heap())
+ goto bail;
if (exec_heap) {
size = (size + 31) & ~31;
@@ -87,7 +98,8 @@ _mesa_exec_malloc(GLuint size)
addr = exec_mem + block->ofs;
else
_mesa_printf("_mesa_exec_malloc failed\n");
-
+
+bail:
_glthread_UNLOCK_MUTEX(exec_mutex);
return addr;
diff -up Mesa-7.0/configs/linux-dri.jx Mesa-7.0/configs/linux-dri
--- Mesa-7.0/configs/linux-dri.jx 2007-07-23 15:59:07.000000000 -0400
+++ Mesa-7.0/configs/linux-dri 2007-07-23 17:37:36.000000000 -0400
@@ -39,7 +39,8 @@ EXTRA_LIB_PATH =
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
+ -lselinux
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl \
$(LIBDRM_LIB)
mesa-7.0-symlinks-before-depend.patch:
--- NEW FILE mesa-7.0-symlinks-before-depend.patch ---
diff -up mesa-20070725/src/mesa/drivers/dri/Makefile.template.jx mesa-20070725/src/mesa/drivers/dri/Makefile.template
--- mesa-20070725/src/mesa/drivers/dri/Makefile.template.jx 2007-07-25 09:36:04.000000000 -0400
+++ mesa-20070725/src/mesa/drivers/dri/Makefile.template 2007-07-26 10:09:54.000000000 -0400
@@ -70,7 +70,7 @@ SHARED_INCLUDES = \
##### TARGETS #####
-default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
+default: symlinks depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 3 Dec 2006 23:11:22 -0000 1.16
+++ .cvsignore 14 Aug 2007 05:33:46 -0000 1.17
@@ -1,9 +1,3 @@
-MesaDemos-6.5.1.tar.bz2
-MesaLib-6.5.1.tar.bz2
-gl-man-pages.tar.bz2
-glu-man-pages.tar.bz2
-glx-man-pages.tar.bz2
-gl-manpages-1.0.tar.bz2
+MesaLib-7.0.1.tar.bz2
+MesaDemos-7.0.1.tar.bz2
gl-manpages-1.0.1.tar.bz2
-MesaDemos-6.5.2.tar.bz2
-MesaLib-6.5.2.tar.bz2
Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mesa.spec 25 Jul 2007 18:00:00 -0000 1.135
+++ mesa.spec 14 Aug 2007 05:33:46 -0000 1.136
@@ -31,8 +31,8 @@
Summary: Mesa graphics libraries
Name: mesa
-Version: 6.5.2
-Release: 16%{?dist}
+Version: 7.0.1
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -42,18 +42,14 @@
Source1: http://internap.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
Source2: %{manpages}.tar.bz2
-Patch0: mesa-6.5.1-build-config.patch
+Patch0: mesa-7.0-build-config.patch
Patch4: mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch
Patch5: mesa-6.5.2-xserver-1.1-source-compat.patch
-Patch18: mesa-6.5.1-selinux-awareness.patch
-Patch19: mesa-6.5.2-r300-parallel-build.patch
-Patch20: mesa-6.5.2-libgl-visibility.patch
-Patch21: mesa-6.5.2-picify-dri-drivers.patch
+Patch18: mesa-7.0-selinux-awareness.patch
Patch22: mesa-6.5.2-hush-synthetic-visual-warning.patch
Patch23: mesa-6.5.2-bindcontext-paranoia.patch
-Patch24: mesa-6.5.2-radeon-backports-231787.patch
-Patch25: mesa-6.5.2-via-respect-my-cliplist.patch
-Patch26: mesa-6.5.2-fix-glut-demos.patch
+Patch24: mesa-7.0-i-already-defined-glapi-you-twit.patch
+Patch25: mesa-7.0-symlinks-before-depend.patch
BuildRequires: pkgconfig
%if %{with_dri}
@@ -177,14 +173,10 @@
%patch4 -p0 -b .dont-libglut-me-harder-ok-thx-bye
%patch5 -p1 -b .xserver-1.1-compat
%patch18 -p1 -b .selinux-awareness
-%patch19 -p1 -b .r300-make-j
-%patch20 -p1 -b .libgl-visibility
-%patch21 -p1 -b .picify
%patch22 -p1 -b .visual-warning
%patch23 -p1 -b .bindcontext
-%patch24 -p1 -b .radeon-231787
-%patch25 -p1 -b .via-cliplist
-%patch26 -p1 -b .glutinit
+%patch24 -p1 -b .glapi
+%patch25 -p1 -b .makej
# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
# license and are not open source/free software, so we remove them.
@@ -336,11 +328,11 @@
%files libOSMesa
%defattr(-,root,root,-)
%{_libdir}/libOSMesa.so.6
-%{_libdir}/libOSMesa.so.%{version}
+%{_libdir}/libOSMesa.so.6.5.3
%{_libdir}/libOSMesa16.so.6
-%{_libdir}/libOSMesa16.so.%{version}
+%{_libdir}/libOSMesa16.so.6.5.3
%{_libdir}/libOSMesa32.so.6
-%{_libdir}/libOSMesa32.so.%{version}
+%{_libdir}/libOSMesa32.so.6.5.3
%files libOSMesa-devel
%defattr(-,root,root,-)
@@ -414,6 +406,12 @@
%{_libdir}/mesa-demos-data
%changelog
+* Mon Aug 13 2007 Dave Airlie <airlied at redhat.com> - 7.0.1-1
+- 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
+
* Wed Jul 25 2007 Jesse Keating <jkeating at redhat.com> - 6.5.2-16
- Rebuild for RH #249435
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 3 Dec 2006 23:11:22 -0000 1.15
+++ sources 14 Aug 2007 05:33:46 -0000 1.16
@@ -1,7 +1,3 @@
-92e3fd47f3a8a50fdf51b454867271e3 gl-man-pages.tar.bz2
-73a8d5bc5fe2f336549b56ac3bf06911 glu-man-pages.tar.bz2
-f97e46b9f29dd64996c4408fbac5f8a3 glx-man-pages.tar.bz2
-841dd9ef3dec2f67a7faeb65bc5c78b8 gl-manpages-1.0.tar.bz2
+c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2
+3b66b3268df12ca8a6c4e0c4c457912c MesaDemos-7.0.1.tar.bz2
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-e870efe98d3a50be01ab211b9b2e25d9 MesaDemos-6.5.2.tar.bz2
-e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2
--- i965-interleaved-arrays-fix.patch DELETED ---
--- mesa-6.5.1-build-config.patch DELETED ---
--- mesa-6.5.1-selinux-awareness.patch DELETED ---
--- mesa-6.5.2-fix-glut-demos.patch DELETED ---
--- mesa-6.5.2-libgl-visibility.patch DELETED ---
--- mesa-6.5.2-picify-dri-drivers.patch DELETED ---
--- mesa-6.5.2-r300-parallel-build.patch DELETED ---
--- mesa-6.5.2-radeon-backports-231787.patch DELETED ---
--- mesa-6.5.2-via-respect-my-cliplist.patch DELETED ---
--- post-6.5.1-i965-fixes.patch DELETED ---
--- redhat-mesa-source-filelist-generator DELETED ---
More information about the scm-commits
mailing list