[xscreensaver/f16] More fix on bug 849961 (lament -no-texture)

[Mamoru Tasaka]

commit f1ffaa984a32e0bcfbf501bbfc6ea22c5107e3d9
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Thu Aug 23 09:40:13 2012 +0900

    More fix on bug 849961 (lament -no-texture)

 xscreensaver-5.19-lament-wireframe.patch |    7 ++++---
 xscreensaver.spec                        |    8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/xscreensaver-5.19-lament-wireframe.patch b/xscreensaver-5.19-lament-wireframe.patch
index 7129299..2f483bf 100644
--- a/xscreensaver-5.19-lament-wireframe.patch
+++ b/xscreensaver-5.19-lament-wireframe.patch
@@ -1,15 +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-22 12:50:31.105170351 +0900
-@@ -1378,7 +1378,11 @@
++++ 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 = wire ? 340 : lc->texture->width * 1.4;
++  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 */
diff --git a/xscreensaver.spec b/xscreensaver.spec
index dbf381e..1427aec 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    2
+%define fedora_rel    3
 
 %undefine extrarel
 
@@ -63,7 +63,8 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
-# Fix segv on lament with -wireframe option (bug 849961)
+# Fix segv on lament with -wireframe option 
+# or -no-texture option (bug 849961)
 Patch33:         xscreensaver-5.19-lament-wireframe.patch
 # Fix improper and operator on flurry detected by llvm-clang
 Patch34:         xscreensaver-5.19-flurry-clangwarn.patch
@@ -818,6 +819,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Aug 23 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-3
+- More fix on bug 849961 (lament -no-texture)
+
 * Wed Aug 22 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.19-2
 - Fix segv on lament with -wireframe option (bug 849961)
 - Fix improper and operator on flurry detected by llvm-clang