From aea3b2068f0d488ef183ebc8912690a2468d62d4 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Oct 17 2012 01:53:39 +0000 Subject: Merge remote-tracking branch 'origin/master' into f18 --- diff --git a/.gitignore b/.gitignore index 0722cac..7896552 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /xscreensaver-5.17.tar.gz /xscreensaver-5.18.tar.gz /xscreensaver-5.19.tar.gz +/xscreensaver-5.20.tar.gz diff --git a/sources b/sources index 189d05d..67637e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db001e7d17b68fef22f66beb68beb114 xscreensaver-5.19.tar.gz +1faec61c61e29dc11f6ec9e4750ab877 xscreensaver-5.20.tar.gz diff --git a/xscreensaver-5.19-check-largefile-support.patch b/xscreensaver-5.19-check-largefile-support.patch new file mode 100644 index 0000000..b2eaea3 --- /dev/null +++ b/xscreensaver-5.19-check-largefile-support.patch @@ -0,0 +1,10 @@ +--- xscreensaver-5.19/configure.in.large 2012-07-01 07:50:43.000000000 +0900 ++++ xscreensaver-5.19/configure.in 2012-10-07 23:21:44.000000000 +0900 +@@ -1184,6 +1184,7 @@ + AC_HEADER_SYS_WAIT + AC_HEADER_DIRENT + AC_GETTIMEOFDAY_ARGS ++AC_SYS_LARGEFILE + AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk) + AC_CHECK_FUNCS(sigaction syslog realpath setrlimit) + AC_CHECK_FUNCS(setlocale) diff --git a/xscreensaver-5.19-engine-clangwarn.patch b/xscreensaver-5.19-engine-clangwarn.patch deleted file mode 100644 index 17715cf..0000000 --- a/xscreensaver-5.19-engine-clangwarn.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xscreensaver-5.19-clang/hacks/glx/engine.c.clang 2012-08-23 23:58:19.000000000 +0900 -+++ xscreensaver-5.19-clang/hacks/glx/engine.c 2012-08-24 00:01:13.000000000 +0900 -@@ -587,7 +587,7 @@ - glLightfv(GL_LIGHT1, GL_POSITION, e->boom_lpos); - glLightfv(GL_LIGHT1, GL_DIFFUSE, e->boom_red); - glLightfv(GL_LIGHT1, GL_SPECULAR, e->boom_red); -- glLighti(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3); -+ glLightf(GL_LIGHT1, GL_LINEAR_ATTENUATION, 1.3); - glLighti(GL_LIGHT1, GL_CONSTANT_ATTENUATION, 0); - - glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, e->boom_red); diff --git a/xscreensaver-5.19-flurry-clangwarn.patch b/xscreensaver-5.19-flurry-clangwarn.patch deleted file mode 100644 index 90ac670..0000000 --- a/xscreensaver-5.19-flurry-clangwarn.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 2f483bf..0000000 --- a/xscreensaver-5.19-lament-wireframe.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 */ diff --git a/xscreensaver.spec b/xscreensaver.spec index d088698..b1fb2be 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,6 +1,6 @@ %define name xscreensaver -%define mainversion 5.19 +%define mainversion 5.20 %define beta_ver %{nil} @@ -10,7 +10,7 @@ %define split_getimage 1 %endif -%define fedora_rel 4 +%define fedora_rel 1 %undefine extrarel @@ -32,7 +32,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Summary: X screen saver and locker Name: %{name} Version: %{mainversion} -Release: %{fedora_rel}%{?dist}%{?extrarel}.1 +Release: %{fedora_rel}%{?dist}%{?extrarel} Epoch: 1 License: MIT Group: Amusements/Graphics @@ -63,13 +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 -# 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 -# Remove warning from calling glLighti with float argument in engine.c -Patch35: xscreensaver-5.19-engine-clangwarn.patch +# Add -D_FILE_OFFSET_BITS=64 when this enabled stat64 +Patch37: xscreensaver-5.19-check-largefile-support.patch # driver/test-passwd tty segfaults Patch41: xscreensaver-5.12-test-passwd-segv-tty.patch # patch to compile driver/test-xdpms @@ -268,9 +263,7 @@ This package contains some test programs to debug XScreenSaver. %patch1 -p1 -b .sanitize-hacks %patch21 -p1 -b .nonet %patch32 -p1 -b .dpmsoff_japo -%patch33 -p1 -b .wire -%patch34 -p1 -b .andand -%patch35 -p1 -b .fl_int +%patch37 -p1 -b .large %patch41 -p1 -b .test_passwd %patch42 -p1 -b .test_misc %patch43 -p1 -b .hndl_extra @@ -427,7 +420,8 @@ popd export CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" # Build with -D_FILE_OFFSET_BITS=64 to support cifs-mounted # filesystem for image directory (Ubuntu bug 609451) -export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64" +# The below line changed to use Patch37 +# export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64" CONFIG_OPTS="--prefix=%{_prefix} --with-pam --without-shadow --without-kerberos" CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" @@ -824,6 +818,16 @@ exit 0 %defattr(-,root,root,-) %changelog +* Wed Oct 17 2012 Mamoru Tasaka - 1:5.20-1 +- Update to 5.20 + +* Sun Oct 7 2012 Mamoru Tasaka - 1:5.19-6 +- Use AC_SYS_LARGEFILE to detect support for -D_FILE_OFFSET_BITS=64 + +* Wed Oct 3 2012 Mamoru Tasaka - 1:5.19-5 +- May fix xscreensaver-getimage failure with BadMatch in + XPutImage (may fix debian bug 688955) + * Fri Sep 21 2012 Mamoru Tasaka - A bit spec file cleanup