summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <[email protected]>2006-10-16 13:05:42 +0000
committerThierry Reding <[email protected]>2006-10-16 13:05:42 +0000
commit65a324062f41bbc9baff9fc0e22e76e7047a034c (patch)
tree8e762948253fdc35f282e3dbe64c6bab86374ea7
parentc9db617e0b1764271e8a48450b356577132a82a3 (diff)
Add patches extracted from older Debian diffs but not applied yet because it's
not certain yet that they are needed.
-rw-r--r--debian/patches/02_use-ieee-fp-on-s390-and-m64k.patch10
-rw-r--r--debian/patches/03_handle-sync-and-dont-unlock-display.patch15
2 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m64k.patch b/debian/patches/02_use-ieee-fp-on-s390-and-m64k.patch
new file mode 100644
index 00000000000..2ca05adb61f
--- /dev/null
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m64k.patch
@@ -0,0 +1,10 @@
+--- a/src/mesa/main/imports.h
++++ b/src/mesa/main/imports.h
+@@ -153,6 +153,7 @@
+ defined(__mips) || defined(_MIPS_ARCH) || \
+ defined(__arm__) || \
+ defined(__sh__) || defined(__m32r__) || \
++ defined(__m68k__) || defined(__s390__) || \
+ (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
+ #define USE_IEEE
+ #define IEEE_ONE 0x3f800000
diff --git a/debian/patches/03_handle-sync-and-dont-unlock-display.patch b/debian/patches/03_handle-sync-and-dont-unlock-display.patch
new file mode 100644
index 00000000000..c9089ef86ed
--- /dev/null
+++ b/debian/patches/03_handle-sync-and-dont-unlock-display.patch
@@ -0,0 +1,15 @@
+--- a/src/glx/x11/glxext.c
++++ b/src/glx/x11/glxext.c
+@@ -1016,11 +1016,11 @@
+ if (!_XReply(dpy, (xReply*) &reply, 0, False)) {
+ /* Something is busted. Punt. */
+ UnlockDisplay(dpy);
++ SyncHandle();
+ FreeScreenConfigs(priv);
+ return GL_FALSE;
+ }
+
+- UnlockDisplay(dpy);
+ if (!reply.numVisuals) {
+ /* This screen does not support GL rendering */
+ UnlockDisplay(dpy);