From 210eabd120637c0c841a2ba86f7e3d42cd6a2807 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Dec 16 2012 14:17:07 +0000
Subject: Merge remote-tracking branch 'origin/master' into f18


---

diff --git a/xscreensaver-5.19-flurry-clangwarn.patch b/xscreensaver-5.19-flurry-clangwarn.patch
new file mode 100644
index 0000000..90ac670
--- /dev/null
+++ b/xscreensaver-5.19-flurry-clangwarn.patch
@@ -0,0 +1,18 @@
+--- xscreensaver-5.19/hacks/glx/flurry-smoke.c.andand	2006-02-07 21:42:12.000000000 +0900
++++ xscreensaver-5.19/hacks/glx/flurry-smoke.c	2012-08-22 13:09:34.770007165 +0900
+@@ -1023,12 +1023,14 @@
+ 					s->p[i].animFrame.i[k] = 0;
+ 				}
+ 		
+-				u0 = (s->p[i].animFrame.i[k]&&7) * 0.125f;
++				u0 = (s->p[i].animFrame.i[k]&7) * 0.125f;
+ 				v0 = (s->p[i].animFrame.i[k]>>3) * 0.125f;
+ 				u1 = u0 + 0.125f;
+ 				v1 = v0 + 0.125f;
++/*
+ 				u1 = u0 + 0.125f;
+ 				v1 = v0 + 0.125f;
++*/
+ 				cm = (1.375f - thisWidth/width);
+ 				if (s->p[i].dead.i[k] == 3)
+ 				{
diff --git a/xscreensaver-5.19-lament-wireframe.patch b/xscreensaver-5.19-lament-wireframe.patch
new file mode 100644
index 0000000..2f483bf
--- /dev/null
+++ b/xscreensaver-5.19-lament-wireframe.patch
@@ -0,0 +1,16 @@
+--- xscreensaver-5.19/hacks/glx/lament.c.wire	2012-06-25 06:12:16.000000000 +0900
++++ xscreensaver-5.19/hacks/glx/lament.c	2012-08-23 09:27:26.925105245 +0900
+@@ -1378,7 +1378,12 @@
+ scale_for_window(ModeInfo *mi)
+ {
+   lament_configuration *lc = &lcs[MI_SCREEN(mi)];
+-  int target_size = lc->texture->width * 1.4;
++
++  /* With -wireframe option, lc->texture is not created
++     Also -no-texture option does not create this
++  */
++  Bool wire = MI_IS_WIREFRAME(mi);
++  int target_size = lc->texture ? lc->texture->width * 1.4 : 340;
+   int win_size = (MI_WIDTH(mi) > MI_HEIGHT(mi) ? MI_HEIGHT(mi) : MI_WIDTH(mi));
+ 
+   /* This scale makes the box take up most of the window */