mesa: Changes to 'debian-unstable'
Makefile | 17
bin/mklib | 30
configs/aix-gcc | 4
configs/beos | 4
configs/bluegene-osmesa | 4
configs/bluegene-xlc-osmesa | 29
configs/catamount-osmesa-pgi | 32
configs/darwin | 4
configs/darwin-static | 4
configs/darwin-static-x86ppc | 4
configs/darwin-x86ppc | 4
configs/debian-default | 2
configs/default | 9
configs/freebsd | 4
configs/freebsd-dri | 4
configs/hpux10-gcc | 4
configs/linux | 4
configs/linux-alpha | 4
configs/linux-alpha-static | 4
configs/linux-directfb | 4
configs/linux-dri | 9
configs/linux-dri-x86 | 3
configs/linux-dri-xcb | 12
configs/linux-fbdev | 3
configs/linux-glide | 3
configs/linux-indirect | 3
configs/linux-osmesa | 3
configs/linux-osmesa16 | 3
configs/linux-osmesa16-static | 4
configs/linux-osmesa32 | 3
configs/linux-ppc-static | 1
configs/linux-solo | 3
configs/linux-solo-x86 | 3
configs/linux-static | 5
configs/linux-x86-64-static | 4
configs/linux-x86-glide | 3
configs/linux-x86-static | 4
configs/netbsd | 3
configs/openbsd | 4
configs/solaris-x86-gcc | 4
configs/solaris-x86-gcc-static | 4
configs/sunos4-gcc | 4
configs/sunos5-gcc | 4
configs/sunos5-v9-cc-g++ | 3
configs/ultrix-gcc | 4
debian/changelog | 16
debian/control | 2
debian/patches/03_optional-progs-and-install.patch | 32
debian/patches/04_cleanup-osmesa-configs.patch | 86 -
debian/patches/05_static-nonpic.patch | 60 -
debian/patches/series | 1
docs/download.html | 2
docs/fbdev-dri.html | 6
docs/helpwanted.html | 39
docs/install.html | 83 -
docs/license.html | 29
docs/modelers.html | 2
docs/news.html | 7
docs/relnotes-7.0.2.html | 44
progs/beos/.gitignore | 3
progs/beos/Makefile | 10
progs/demos/Makefile | 14
progs/directfb/.gitignore | 4
progs/egl/.gitignore | 5
progs/fbdev/.gitignore | 1
progs/fp/.gitignore | 42
progs/glsl/.gitignore | 13
progs/glsl/Makefile | 6
progs/glsl/bump.c | 6
progs/glsl/mandelbrot.c | 6
progs/glsl/noise.c | 2
progs/glsl/toyball.c | 6
progs/miniglx/.gitignore | 6
progs/osdemos/.gitignore | 8
progs/osdemos/Makefile | 12
progs/redbook/Makefile | 4
progs/samples/Makefile | 6
progs/slang/.gitignore | 3
progs/tools/trace/.gitignore | 1
progs/trivial/.gitignore | 65 +
progs/vp/.gitignore | 1
progs/xdemos/Makefile | 24
src/glu/Makefile | 16
src/glu/glu.pc.in | 11
src/glu/sgi/Makefile | 2
src/glu/sgi/libutil/project.c | 6
src/glut/beos/Makefile | 3
src/glut/fbdev/Makefile | 10
src/glut/ggi/Makefile | 2
src/glut/glx/Makefile | 22
src/glut/glx/glut.pc.in | 11
src/glut/mini/Makefile | 2
src/glw/Makefile | 22
src/glw/glw.pc.in | 11
src/glx/x11/Makefile | 2
src/mesa/Makefile | 44
src/mesa/drivers/beos/Makefile | 3
src/mesa/drivers/dri/Makefile.template | 6
src/mesa/drivers/dri/common/dri_bufmgr.c | 2
src/mesa/drivers/dri/common/extension_helper.h | 18
src/mesa/drivers/dri/glcore/Makefile | 3
src/mesa/drivers/dri/i915tex/i915_metaops.c | 2
src/mesa/drivers/dri/i915tex/i915_tex_layout.c | 2
src/mesa/drivers/dri/i915tex/intel_blit.c | 3
src/mesa/drivers/dri/i915tex/intel_buffers.c | 9
src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c | 11
src/mesa/drivers/dri/i965/brw_aub.c | 16
src/mesa/drivers/dri/i965/brw_clip.c | 4
src/mesa/drivers/dri/i965/brw_curbe.c | 2
src/mesa/drivers/dri/i965/brw_draw.c | 6
src/mesa/drivers/dri/i965/brw_sf_emit.c | 4
src/mesa/drivers/dri/i965/brw_vs_tnl.c | 11
src/mesa/drivers/dri/i965/brw_wm_fp.c | 52
src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 8
src/mesa/drivers/dri/i965/brw_wm_state.c | 2
src/mesa/drivers/dri/i965/intel_buffers.c | 36
src/mesa/drivers/dri/i965/intel_context.c | 10
src/mesa/drivers/dri/i965/intel_context.h | 3
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 19
src/mesa/drivers/dri/i965/intel_pixel_copy.c | 5
src/mesa/drivers/dri/i965/intel_state.c | 25
src/mesa/drivers/dri/i965/server/i830_common.h | 10
src/mesa/drivers/dri/r200/r200_context.h | 1
src/mesa/drivers/dri/r200/r200_tex.h | 4
src/mesa/drivers/dri/r200/r200_texmem.c | 5
src/mesa/drivers/dri/r200/r200_texstate.c | 94 +
src/mesa/drivers/dri/radeon/radeon_screen.c | 4
src/mesa/drivers/dri/unichrome/via_tris.c | 27
src/mesa/drivers/windows/gdi/wmesa.c | 95 +
src/mesa/drivers/x11/xm_dd.c | 13
src/mesa/gl.pc.in | 11
src/mesa/glapi/dispatch.h | 17
src/mesa/glapi/gl_API.xml | 31
src/mesa/glapi/glapioffsets.h | 12
src/mesa/glapi/glapitable.h | 11
src/mesa/glapi/glapitemp.h | 33
src/mesa/glapi/glprocs.h | 562 ++++-----
src/mesa/main/api_validate.c | 7
src/mesa/main/attrib.c | 3
src/mesa/main/context.c | 11
src/mesa/main/enable.c | 13
src/mesa/main/enums.c | 1208 ++++++++++-----------
src/mesa/main/glheader.h | 2
src/mesa/main/light.c | 9
src/mesa/main/lines.c | 5
src/mesa/main/points.c | 6
src/mesa/main/polygon.c | 5
src/mesa/main/state.c | 43
src/mesa/main/stencil.c | 295 ++---
src/mesa/main/stencil.h | 7
src/mesa/main/texenvprogram.c | 15
src/mesa/main/version.h | 6
src/mesa/shader/arbprogparse.c | 116 +-
src/mesa/shader/prog_statevars.c | 2
src/mesa/sparc/glapi_sparc.S | 2
src/mesa/swrast/s_copypix.c | 11
src/mesa/swrast/s_span.c | 7
src/mesa/swrast_setup/ss_tritmp.h | 18
src/mesa/tnl/t_draw.c | 7
src/mesa/tnl/t_vb_fog.c | 43
src/mesa/tnl/t_vertex_sse.c | 16
src/mesa/tnl/t_vp_build.c | 71 -
src/mesa/vbo/vbo_save_draw.c | 6
src/mesa/x86-64/glapi_x86-64.S | 46
src/mesa/x86-64/xform4.S | 10
src/mesa/x86/glapi_x86.S | 13
src/mesa/x86/read_rgba_span_x86.S | 133 --
src/mesa/x86/rtasm/x86sse.c | 25
src/mesa/x86/rtasm/x86sse.h | 3
windows/VC7/mesa/gdi/gdi.vcproj | 376 +++---
windows/VC7/mesa/glu/glu.vcproj | 66 -
windows/VC7/mesa/mesa.sln | 20
windows/VC7/mesa/mesa/mesa.vcproj | 294 +++--
windows/VC7/mesa/osmesa/osmesa.vcproj | 18
174 files changed, 3170 insertions(+), 2055 deletions(-)
New commits:
commit caf283329bcadae964fdc2a419661ac760a6506a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 11:55:05 2007 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 418d5a0..9b7c8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.0.2-1) UNRELEASED; urgency=low
+mesa (7.0.2-1) unstable; urgency=low
* New upstream release.
+ Fix Blender crash in triangle_twoside(), closes: #439668, #446315.
@@ -10,8 +10,9 @@ mesa (7.0.2-1) UNRELEASED; urgency=low
+ Drop 05_static-nonpic.patch,, applied upstream.
+ Remove DESTDIR from INSTALL_DIR in configs/debian-default since
the upstream Makefiles now support DESTDIR.
+ * Add myself to Uploaders.
- -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 00:25:31 +0100
+ -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 11:53:26 +0100
mesa (7.0.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0cfb971..ec78060 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mesa
Section: graphics
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <jcristau@debian.org>, David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.2.0) [!hurd-i386], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.8), libxxf86vm-dev, libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.13.19), libxfixes-dev, libxdamage-dev
commit 5cedd4a43e162da644360e1cbb390dcf03285723
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 11:49:16 2007 +0100
Remove DESTDIR from INSTALL_DIR in configs/debian-default
... and update 03_optional-progs-and-install.patch accordingly.
diff --git a/configs/debian-default b/configs/debian-default
index aa4721a..f80ec30 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -12,7 +12,7 @@ EXTRA_LIB_PATH =
SRC_DIRS = mesa
PROGRAM_DIRS =
-INSTALL_DIR = $(DESTDIR)/usr
+INSTALL_DIR = /usr
# vim: ft=make
diff --git a/debian/changelog b/debian/changelog
index f38dece..418d5a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mesa (7.0.2-1) UNRELEASED; urgency=low
built when building progs/xdemos.
+ Refresh 04_cleanup-osmesa-configs.patch.
+ Drop 05_static-nonpic.patch,, applied upstream.
+ + Remove DESTDIR from INSTALL_DIR in configs/debian-default since
+ the upstream Makefiles now support DESTDIR.
-- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 00:25:31 +0100
diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch
index c5f8b12..f802a42 100644
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -34,8 +34,8 @@ Index: mesa/progs/xdemos/Makefile
default: $(PROGS)
+install: $(PROGS)
-+ $(INSTALL) -d $(INSTALL_DIR)/bin
-+ $(INSTALL) -m 755 $(PROGS) $(INSTALL_DIR)/bin
++ $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin
++ $(INSTALL) -m 755 $(PROGS) $(DESTDIR)$(INSTALL_DIR)/bin
clean:
-rm -f $(PROGS)
commit 0595d32d8af331fffb616011a22ebe888cb05158
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 11:48:32 2007 +0100
Refresh 03_optional-progs-and-install.patch
The default Makefile requires libGLU to be built
while linking progs/xdemos. However, we don't build
libGLU and progs/xdemos at the same time, and
these progs don't actually need libGLU.
diff --git a/debian/changelog b/debian/changelog
index b69f2fd..f38dece 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (7.0.2-1) UNRELEASED; urgency=low
+ Fix Blender crash in triangle_twoside(), closes: #439668, #446315.
+ Fix crash in _generic_read_RGBA_span_RGB565_MMX(), closes: #445313.
+ Fix the new __gluInvertMatrix() function, closes: #440137 ,#441071.
+ + Refresh 03_optional-progs-and-install.patch since libGLU is not
+ built when building progs/xdemos.
+ Refresh 04_cleanup-osmesa-configs.patch.
+ Drop 05_static-nonpic.patch,, applied upstream.
diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch
index 66a4771..c5f8b12 100644
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -5,19 +5,31 @@ Provide an install target for installing the programs in $(INSTALL_DIR)/bin.
This patch by Thierry Reding.
Not submitted to Mesa.
+--
+Also remove references to GLU library since it is not required
+and we don't actually build it at this point.
---- a/progs/xdemos/Makefile
-+++ b/progs/xdemos/Makefile
-@@ -8,7 +8,7 @@
+
+Index: mesa/progs/xdemos/Makefile
+===================================================================
+--- mesa.orig/progs/xdemos/Makefile 2007-11-11 00:34:12.000000000 +0100
++++ mesa/progs/xdemos/Makefile 2007-11-11 02:07:52.000000000 +0100
+@@ -6,11 +6,11 @@
+
+ INCDIR = $(TOP)/include
+
+-LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
++LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
+-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
-PROGS = glthreads \
+PROGS ?= glthreads \
glxdemo \
glxgears \
glxgears_fbconfig \
-@@ -44,6 +44,9 @@
+@@ -46,6 +46,9 @@
default: $(PROGS)
@@ -27,8 +39,10 @@ Not submitted to Mesa.
clean:
-rm -f $(PROGS)
---- a/progs/Makefile
-+++ b/progs/Makefile
+Index: mesa/progs/Makefile
+===================================================================
+--- mesa.orig/progs/Makefile 2007-11-11 00:34:12.000000000 +0100
++++ mesa/progs/Makefile 2007-11-11 02:06:48.000000000 +0100
@@ -21,8 +21,12 @@
fi \
done
commit e339b4e8da6443ed6f36cdebddf22b63a5ebc41a
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Nov 11 00:34:46 2007 +0100
New upstream release
diff --git a/debian/changelog b/debian/changelog
index b67350d..b69f2fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mesa (7.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + Fix Blender crash in triangle_twoside(), closes: #439668, #446315.
+ + Fix crash in _generic_read_RGBA_span_RGB565_MMX(), closes: #445313.
+ + Fix the new __gluInvertMatrix() function, closes: #440137 ,#441071.
+ + Refresh 04_cleanup-osmesa-configs.patch.
+ + Drop 05_static-nonpic.patch,, applied upstream.
+
+ -- Brice Goglin <bgoglin@debian.org> Sun, 11 Nov 2007 00:25:31 +0100
+
mesa (7.0.1-2) unstable; urgency=low
* Update to latest git (from mesa_7_0_branch)
diff --git a/debian/patches/04_cleanup-osmesa-configs.patch b/debian/patches/04_cleanup-osmesa-configs.patch
index ffc4de9..68bd477 100644
--- a/debian/patches/04_cleanup-osmesa-configs.patch
+++ b/debian/patches/04_cleanup-osmesa-configs.patch
@@ -1,8 +1,8 @@
-diff --git a/configs/linux-osmesa b/configs/linux-osmesa
-index cc1fbbd..aabab59 100644
---- a/configs/linux-osmesa
-+++ b/configs/linux-osmesa
-@@ -9,8 +9,17 @@ CONFIG_NAME = linux-osmesa
+Index: mesa/configs/linux-osmesa
+===================================================================
+--- mesa.orig/configs/linux-osmesa 2007-11-11 00:24:07.000000000 +0100
++++ mesa/configs/linux-osmesa 2007-11-11 00:33:20.000000000 +0100
+@@ -9,8 +9,17 @@
# Compiler and flags
CC = gcc
CXX = g++
@@ -20,18 +20,18 @@ index cc1fbbd..aabab59 100644
+
+CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
- # Directories
-@@ -23,3 +33,4 @@ PROGRAM_DIRS = osdemos
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+@@ -26,3 +35,4 @@
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lOSMesa -lGLU
+
-diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
-index 465f83c..eb3575f 100644
---- a/configs/linux-osmesa-static
-+++ b/configs/linux-osmesa-static
-@@ -8,7 +8,8 @@ CONFIG_NAME = linux-osmesa-static
+Index: mesa/configs/linux-osmesa-static
+===================================================================
+--- mesa.orig/configs/linux-osmesa-static 2007-11-11 00:24:01.000000000 +0100
++++ mesa/configs/linux-osmesa-static 2007-11-11 00:33:20.000000000 +0100
+@@ -8,7 +8,8 @@
# Compiler and flags
MKLIB_OPTIONS = -static
@@ -41,11 +41,11 @@ index 465f83c..eb3575f 100644
-OSMESA_LIB_NAME = libOSMesa.a
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
-index 1fb0186..2a06254 100644
---- a/configs/linux-osmesa16
-+++ b/configs/linux-osmesa16
-@@ -1,28 +1,17 @@
+Index: mesa/configs/linux-osmesa16
+===================================================================
+--- mesa.orig/configs/linux-osmesa16 2007-11-11 00:24:07.000000000 +0100
++++ mesa/configs/linux-osmesa16 2007-11-11 00:33:41.000000000 +0100
+@@ -1,31 +1,19 @@
# Configuration for 16 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
@@ -59,8 +59,11 @@ index 1fb0186..2a06254 100644
-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
-
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+ CXXFLAGS += -fno-strict-aliasing
+-
+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
-
# Library names
OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.so
@@ -78,11 +81,11 @@ index 1fb0186..2a06254 100644
-APP_LIB_DEPS = -lOSMesa16
+APP_LIB_DEPS = -l$(OSMESA_LIB)
+
-diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
-index 6645504..894cf82 100644
---- a/configs/linux-osmesa16-static
-+++ b/configs/linux-osmesa16-static
-@@ -1,28 +1,13 @@
+Index: mesa/configs/linux-osmesa16-static
+===================================================================
+--- mesa.orig/configs/linux-osmesa16-static 2007-11-11 00:24:07.000000000 +0100
++++ mesa/configs/linux-osmesa16-static 2007-11-11 00:33:20.000000000 +0100
+@@ -1,14 +1,10 @@
# Configuration for 16 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
@@ -96,29 +99,31 @@ index 6645504..894cf82 100644
-CFLAGS = -O3 -ansi -pedantic -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 -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
MKLIB_OPTIONS = -static
--
-+PIC_FLAGS =
+ PIC_FLAGS =
+
+@@ -17,16 +13,5 @@
+ CXXFLAGS += -fno-strict-aliasing
# Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.a
--
++OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
+-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa16
-diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
-index a1e5a35..5a703f6 100644
---- a/configs/linux-osmesa32
-+++ b/configs/linux-osmesa32
-@@ -1,28 +1,18 @@
+Index: mesa/configs/linux-osmesa32
+===================================================================
+--- mesa.orig/configs/linux-osmesa32 2007-11-11 00:24:07.000000000 +0100
++++ mesa/configs/linux-osmesa32 2007-11-11 00:33:51.000000000 +0100
+@@ -1,31 +1,22 @@
# Configuration for 32 bits/channel OSMesa library on Linux
-include $(TOP)/configs/default
@@ -131,7 +136,10 @@ index a1e5a35..5a703f6 100644
-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
--
+
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+ CXXFLAGS += -fno-strict-aliasing
+DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
# Library names
@@ -151,10 +159,10 @@ index a1e5a35..5a703f6 100644
-APP_LIB_DEPS = -lOSMesa32
+APP_LIB_DEPS = -l$(OSMESA_LIB)
+
-diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
-index 6db8bc0..ecbb72e 100644
---- a/configs/linux-osmesa32-static
-+++ b/configs/linux-osmesa32-static
+Index: mesa/configs/linux-osmesa32-static
+===================================================================
+--- mesa.orig/configs/linux-osmesa32-static 2007-11-11 00:24:01.000000000 +0100
++++ mesa/configs/linux-osmesa32-static 2007-11-11 00:33:20.000000000 +0100
@@ -1,28 +1,13 @@
# Configuration for 32 bits/channel OSMesa library on Linux
diff --git a/debian/patches/05_static-nonpic.patch b/debian/patches/05_static-nonpic.patch
deleted file mode 100644
index a6b7f40..0000000
--- a/debian/patches/05_static-nonpic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/configs/linux-alpha-static b/configs/linux-alpha-static
-index 2a30af9..eb6a08a 100644
---- a/configs/linux-alpha-static
-+++ b/configs/linux-alpha-static
-@@ -11,6 +11,7 @@ CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
- CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
- GLUT_CFLAGS = -fexceptions
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
-
- # Library names (actual file names)
-diff --git a/configs/linux-ppc-static b/configs/linux-ppc-static
-index d0e1688..3f3dc55 100644
---- a/configs/linux-ppc-static
-+++ b/configs/linux-ppc-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-ppc
- CONFIG_NAME = linux-ppc-static
-
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
-diff --git a/configs/linux-static b/configs/linux-static
-index 85141ea..1592668 100644
---- a/configs/linux-static
-+++ b/configs/linux-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux
- CONFIG_NAME = linux-static
-
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
-diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
-index 0257430..2d0b664 100644
---- a/configs/linux-x86-64-static
-+++ b/configs/linux-x86-64-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86-64
- CONFIG_NAME = linux-x86-64-static
-
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
-diff --git a/configs/linux-x86-static b/configs/linux-x86-static
-index 9915987..e6a3696 100644
---- a/configs/linux-x86-static
-+++ b/configs/linux-x86-static
-@@ -5,6 +5,7 @@ include $(TOP)/configs/linux-x86
- CONFIG_NAME = linux-x86-static
-
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
- # Library names (actual file names)
- GL_LIB_NAME = libGL.a
diff --git a/debian/patches/series b/debian/patches/series
index 280a2f3..61b5df2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
04_cleanup-osmesa-configs.patch
-05_static-nonpic.patch
commit 8a40b670c3babc31f96d08bce16fe10eb718fa8f
Author: Brian <brian.paul@tungstengraphics.com>
Date: Sat Nov 10 09:53:00 2007 -0700
added md5 checksums
diff --git a/docs/relnotes-7.0.2.html b/docs/relnotes-7.0.2.html
index 55d126e..7a7c70f 100644
--- a/docs/relnotes-7.0.2.html
+++ b/docs/relnotes-7.0.2.html
@@ -17,6 +17,15 @@ Mesa 7.0.2 is a stable release with bug fixes since version 7.0.
<h2>MD5 checksums</h2>
<pre>
+c9cf607f36e7e50172f5f9c7d552c34e MesaLib-7.0.2.tar.gz
+93e6ed7924ff069a4f883b4fce5349dc MesaLib-7.0.2.tar.bz2
+10c324c3613f90f059cb8429f700f300 MesaLib-7.0.2.zip
+aa8b1244a5de1d23e5814bf9b67f1435 MesaDemos-7.0.2.tar.gz
+11a10410bae7be85cf25bc7119966468 MesaDemos-7.0.2.tar.bz2
+1dd0b5fd6d69430a2fd76a6adbfd8fff MesaDemos-7.0.2.zip
+a7dbf25c025955858bd2d89a6eb6db4c MesaGLUT-7.0.2.tar.gz
+3a33f8efc8c58a592a854cfc7a643286 MesaGLUT-7.0.2.tar.bz2
+eba4ef2aa8c362ead81b54357f1903a3 MesaGLUT-7.0.2.zip
</pre>
commit d9fa5cbfc906ae545135248fbf5086d0ba3db84a
Author: Brian <brian.paul@tungstengraphics.com>
Date: Sat Nov 10 09:41:52 2007 -0700
final changes for 7.0.2 relesae
diff --git a/Makefile b/Makefile
index 26e764c..fe0c354 100644
--- a/Makefile
+++ b/Makefile
@@ -166,10 +166,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.0.2-rc2
-LIB_NAME = MesaLib-7.0.2-rc2
-DEMO_NAME = MesaDemos-7.0.2-rc2
-GLUT_NAME = MesaGLUT-7.0.2-rc2
+DIRECTORY = Mesa-7.0.2
+LIB_NAME = MesaLib-7.0.2
+DEMO_NAME = MesaDemos-7.0.2
+GLUT_NAME = MesaGLUT-7.0.2
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
diff --git a/docs/news.html b/docs/news.html
index 8694ce4..79fc599 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,7 +11,7 @@
<H1>News</H1>
-<h2>September ??, 2007</h2>
+<h2>November 10, 2007</h2>
<p>
<a href="relnotes-7.0.2.html">Mesa 7.0.2</a> is released.
This is a bug-fix release.
diff --git a/docs/relnotes-7.0.2.html b/docs/relnotes-7.0.2.html
index 39af8e9..55d126e 100644
--- a/docs/relnotes-7.0.2.html
+++ b/docs/relnotes-7.0.2.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.0.2 Release Notes / (TBD) 2007</H1>
+<H1>Mesa 7.0.2 Release Notes / November 10, 2007</H1>
<p>
Mesa 7.0.2 is a stable release with bug fixes since version 7.0.
@@ -56,19 +56,6 @@ Mesa 7.0.2 is a stable release with bug fixes since version 7.0.
</ul>
-<h2>Changes</h2>
-<ul>
-</ul>
-
-
-<h2>To Do (someday) items</h2>
-<ul>
-<li>Switch to freeglut
-<li>Fix linux-glide target/driver.
-<li>Improved lambda and derivative calculation for frag progs.
-</ul>
-
-
<h2>Driver Status</h2>
<pre>
commit 1c21564292cba75d3309d141222c29d1081c54ea
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Fri Nov 9 08:53:41 2007 -0700
code clean-ups, reformatting
diff --git a/src/mesa/drivers/dri/unichrome/via_tris.c b/src/mesa/drivers/dri/unichrome/via_tris.c
index 73e6626..b97dacd 100644
--- a/src/mesa/drivers/dri/unichrome/via_tris.c
+++ b/src/mesa/drivers/dri/unichrome/via_tris.c
@@ -625,13 +625,12 @@ static void viaFastRenderClippedPoly(GLcontext *ctx, const GLuint *elts,
}
}
+
/**********************************************************************/
/* Choose render functions */
/**********************************************************************/
-
-
#define _VIA_NEW_VERTEX (_NEW_TEXTURE | \
_DD_NEW_SEPARATE_SPECULAR | \
_DD_NEW_TRI_UNFILLED | \
@@ -665,16 +664,17 @@ static void viaChooseRenderState(GLcontext *ctx)
vmesa->drawTri = via_draw_triangle;
}
- if (flags & (ANY_FALLBACK_FLAGS|ANY_RASTER_FLAGS)) {
+ if (flags & (ANY_FALLBACK_FLAGS | ANY_RASTER_FLAGS)) {
if (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
index |= VIA_TWOSIDE_BIT;
- if (flags & DD_TRI_OFFSET) index |= VIA_OFFSET_BIT;
if (ctx->Polygon.FrontMode != GL_FILL || ctx->Polygon.BackMode != GL_FILL)
index |= VIA_UNFILLED_BIT;
- if (flags & ANY_FALLBACK_FLAGS) index |= VIA_FALLBACK_BIT;
+ if (flags & DD_TRI_OFFSET)
+ index |= VIA_OFFSET_BIT;
+ if (flags & ANY_FALLBACK_FLAGS)
+ index |= VIA_FALLBACK_BIT;
- /* Hook in fallbacks for specific primitives.
- */
+ /* Hook in fallbacks for specific primitives. */
if (flags & POINT_FALLBACK)
vmesa->drawPoint = via_fallback_point;
@@ -685,11 +685,8 @@ static void viaChooseRenderState(GLcontext *ctx)
vmesa->drawTri = via_fallback_tri;
}
-
- if ((flags & DD_SEPARATE_SPECULAR) &&
- ctx->Light.ShadeModel == GL_FLAT) {
+ if ((flags & DD_SEPARATE_SPECULAR) && ctx->Light.ShadeModel == GL_FLAT)
index = VIA_MAX_TRIFUNC; /* flat specular */
- }
if (vmesa->renderIndex != index) {
vmesa->renderIndex = index;
commit 6cc96bf156519d6d4e2d17ea0ce9ca68661a3991
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Fri Nov 9 08:53:15 2007 -0700
remove commented-out code
diff --git a/src/mesa/x86/read_rgba_span_x86.S b/src/mesa/x86/read_rgba_span_x86.S
index 8509df6..2e5c3be 100644
--- a/src/mesa/x86/read_rgba_span_x86.S
+++ b/src/mesa/x86/read_rgba_span_x86.S
@@ -33,20 +33,7 @@
.file "read_rgba_span_x86.S"
#if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */
/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- .section .rodata
- .align 16
- .type mask, @object
- .size mask, 32
-mask:
- .long 0xff00ff00
- .long 0xff00ff00
- .long 0xff00ff00
- .long 0xff00ff00
- .long 0x00ff0000
- .long 0x00ff0000
- .long 0x00ff0000
- .long 0x00ff0000
+ * Replaced data segment constants with text-segment instructions.
*/
#define LOAD_MASK(mvins,m1,m2) \
pushl $0xff00ff00 ;\
@@ -61,8 +48,7 @@ mask:
mvins (%esp), m2 ;\
addl $32, %esp
-
-/* I implemented these as macros because the appear in quite a few places,
+/* I implemented these as macros because they appear in several places,
* and I've tweaked them a number of times. I got tired of changing every
* place they appear. :)
*/
@@ -99,11 +85,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX:
#ifdef USE_INNER_EMMS
emms
#endif
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- movq mask, %mm1
- movq mask+16, %mm2
- */
LOAD_MASK(movq,%mm1,%mm2)
movl 8(%esp), %ebx /* source pointer */
@@ -201,11 +182,7 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE:
#ifdef USE_INNER_EMMS
emms
#endif
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- movq mask, %mm1
- movq mask+16, %mm2
- */
+
LOAD_MASK(movq,%mm1,%mm2)
movl 16(%esp), %ebx /* source pointer */
@@ -364,11 +341,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
pushl %esi
pushl %ebx
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- movdqa mask, %xmm1
- movdqa mask+16, %xmm2
- */
LOAD_MASK(movdqu,%xmm1,%xmm2)
movl 12(%esp), %ebx /* source pointer */
@@ -491,60 +463,12 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE2:
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- */
-#if 0
- .section .rodata
-
- .align 16
-mask_565:
- .word 0xf800
- .word 0x07e0
- .word 0x001f
- .word 0x0000
-
-/* Setting SCALE_ADJUST to 5 gives a perfect match with the classic C
- * implementation in Mesa. Setting SCALE_ADJUST to 0 is slightly faster but
- * at a small cost to accuracy.
- */
-
-#define SCALE_ADJUST 5
-#if SCALE_ADJUST == 5
-prescale:
- .word 0x0001
- .word 0x0010
- .word 0x0200
- .word 0x0000
-
-scale:
- .word 0x20e8 /* (0x00ff0000 / 0x000007c0) + 1 */
- .word 0x40c5 /* (0x00ff0000 / 0x000003f0) + 1 */
- .word 0x839d /* (0x00ff0000 / 0x000001f0) + 1 */
- .word 0x0000
-#elif SCALE_ADJUST == 0
-prescale:
- .word 0x0001
- .word 0x0020
- .word 0x0800
- .word 0x0000
-
-scale:
- .word 0x0108 /* (0x00ff0000 / 0x0000f800) + 1 */
- .word 0x0104 /* (0x00ff0000 / 0x0000fc00) + 1 */
- .word 0x0108 /* (0x00ff0000 / 0x0000f800) + 1 */
- .word 0x0000
-#else
-#error SCALE_ADJUST must either be 5 or 0.
-#endif
-
-
-alpha: .long 0x00000000
- .long 0x00ff0000
-#endif
-
#define MASK_565_L 0x07e0f800
#define MASK_565_H 0x0000001f
+/* Setting SCALE_ADJUST to 5 gives a perfect match with the
+ * classic C implementation in Mesa. Setting SCALE_ADJUST
+ * to 0 is slightly faster but at a small cost to accuracy.
+ */
#define SCALE_ADJUST 5
#if SCALE_ADJUST == 5
#define PRESCALE_L 0x00100001
@@ -581,12 +505,6 @@ _generic_read_RGBA_span_RGB565_MMX:
movl 8(%esp), %edx /* destination pointer */
movl 12(%esp), %ecx /* number of pixels to copy */
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- movq mask_565, %mm5
- movq prescale, %mm6
- movq scale, %mm7
- */
pushl $MASK_565_H
pushl $MASK_565_L
movq (%esp), %mm5
@@ -648,11 +566,6 @@ _generic_read_RGBA_span_RGB565_MMX:
/* Always set the alpha value to 0xff.
*/
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- por alpha, %mm0
- por alpha, %mm2
- */
por %mm3, %mm0
por %mm3, %mm2
@@ -665,8 +578,6 @@ _generic_read_RGBA_span_RGB565_MMX:
movq %mm0, (%edx)
addl $8, %edx
-
-
pshufw $0xaa, %mm4, %mm0
pshufw $0xff, %mm4, %mm2
@@ -681,11 +592,6 @@ _generic_read_RGBA_span_RGB565_MMX:
pmulhuw %mm7, %mm0
pmulhuw %mm7, %mm2
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- por alpha, %mm0
- por alpha, %mm2
- */
por %mm3, %mm0
por %mm3, %mm2
@@ -724,11 +630,6 @@ _generic_read_RGBA_span_RGB565_MMX:
pmulhuw %mm7, %mm0
pmulhuw %mm7, %mm2
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- por alpha, %mm0
- por alpha, %mm2
- */
por %mm3, %mm0
por %mm3, %mm2
@@ -757,10 +658,6 @@ _generic_read_RGBA_span_RGB565_MMX:
#endif
pmulhuw %mm7, %mm0
-/* Kevin F. Quinn 2nd July 2006
- * Replace data segment constants with text-segment instructions
- por alpha, %mm0
- */
por %mm3, %mm0
packuswb %mm0, %mm0
commit 29afd4bbc453e947d31006a80e121b08b880b8ba
Author: Brian <brian.paul@tungstengraphics.com>
Date: Thu Nov 8 07:35:36 2007 -0700
fix blender/unichrome crash, bug 13142
diff --git a/docs/relnotes-7.0.2.html b/docs/relnotes-7.0.2.html
index cdf2ac1..39af8e9 100644
--- a/docs/relnotes-7.0.2.html
+++ b/docs/relnotes-7.0.2.html
@@ -52,6 +52,7 @@ Mesa 7.0.2 is a stable release with bug fixes since version 7.0.
<li>Fix SSE code gen memory leak, possible crash
<li>Fixed MMX 565 rgb conversion problem (bug 12614)
<li>Added -fno-strict-aliasing and -fPIC flags for gcc
+<li>Fixed Blender crash in Unichrome driver (bug 13142)
</ul>
Reply to: