Bug#390560: libgl1-mesa-swx11: opengl applications die with Illegal instruction after upgrade

[Ben Hutchings]

Here's the change I intend to make, confirmed as fixing the problem on a
Pentium II.  I'll be uploading this shortly if I get confirmation from
the release team that it's OK to do so.

Ben.

diff -u mesa-6.5.1/debian/changelog mesa-6.5.1/debian/changelog
--- mesa-6.5.1/debian/changelog
+++ mesa-6.5.1/debian/changelog
@@ -1,3 +1,11 @@
+mesa (6.5.1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Disable generation of SSE instructions (closes: #390560)
+  * Remove duplicate build configurations
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 11 Oct 2006 23:54:02 +0100
+
 mesa (6.5.1-0.1) unstable; urgency=low
 
   * New upstream version
diff -u mesa-6.5.1/configs/debian-debug_i386 mesa-6.5.1/configs/debian-debug_i386
--- mesa-6.5.1/configs/debian-debug_i386
+++ mesa-6.5.1/configs/debian-debug_i386
@@ -3,5 +3,5 @@
 CONFIG_NAME = debian-debug-i386
 
-DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+DEBIAN_OPT_CFLAGS = -march=i686 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff -u mesa-6.5.1/configs/debian-static_i386 mesa-6.5.1/configs/debian-static_i386
--- mesa-6.5.1/configs/debian-static_i386
+++ mesa-6.5.1/configs/debian-static_i386
@@ -3,5 +3,5 @@
 CONFIG_NAME = debian-static-i386
 
-DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+DEBIAN_OPT_CFLAGS = -O3 -march=i686 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
reverted:
--- mesa-6.5.1/configs/debian-i386
+++ mesa-6.5.1.orig/configs/debian-i386
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian
-
-CONFIG_NAME = debian-i386
-
-override DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=387 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
reverted:
--- mesa-6.5.1/configs/debian-glide-i386
+++ mesa-6.5.1.orig/configs/debian-glide-i386
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian-i386
-
-CONFIG_NAME = debian-glide-i386
-
-DEBIAN_COMMON_CPPFLAGS += -DFX -I/usr/include/glide3
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lglide3x -lm -lpthread
reverted:
--- mesa-6.5.1/configs/debian-debug-i386
+++ mesa-6.5.1.orig/configs/debian-debug-i386
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian-debug
-
-CONFIG_NAME = debian-debug-i386
-
-DEBIAN_OPT_CFLAGS = -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
reverted:
--- mesa-6.5.1/configs/debian-static-i386
+++ mesa-6.5.1.orig/configs/debian-static-i386
@@ -1,7 +0,0 @@
-include $(TOP)/configs/debian-static
-
-CONFIG_NAME = debian-static-i386
-
-DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=sse -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff -u mesa-6.5.1/configs/debian_i386 mesa-6.5.1/configs/debian_i386
--- mesa-6.5.1/configs/debian_i386
+++ mesa-6.5.1/configs/debian_i386
@@ -3,5 +3,5 @@
 CONFIG_NAME = debian-i386
 
-DEBIAN_OPT_CFLAGS = -O3 -march=i686 -msse -mfpmath=387 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+DEBIAN_OPT_CFLAGS = -O3 -march=i686 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff -u mesa-6.5.1/configs/debian-glide_i386 mesa-6.5.1/configs/debian-glide_i386
--- mesa-6.5.1/configs/debian-glide_i386
+++ mesa-6.5.1/configs/debian-glide_i386
@@ -1,4 +1,4 @@
-include $(TOP)/configs/debian-i386
+include $(TOP)/configs/debian_i386
 
 CONFIG_NAME = debian-glide-i386
 
-- END --

-- 
Ben Hutchings -- ben at decadentplace.org.uk shortened to ben at decadent.org.uk
If you've signed my GPG key, please send a signature on and to the new uid.
It is easier to write an incorrect program than to understand a correct one.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.alioth.debian.org/pipermail/pkg-mesa-devel/attachments/20061012/97d382d8/attachment.pgp