Hello community, here is the log from the commit of package xscreensaver for openSUSE:Factory checked in at 2017-03-01 23:40:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscreensaver (Old) and /work/SRC/openSUSE:Factory/.xscreensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscreensaver" Wed Mar 1 23:40:59 2017 rev:53 rq:460725 version:5.36 Changes: -------- --- /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver.changes 2015-11-12 19:39:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver.changes 2017-03-01 23:41:10.606094303 +0100 @@ -1,0 +2,28 @@ +Mon Feb 27 04:32:05 UTC 2017 - [email protected] + +- Added new hacks to xscreensaver-data-extra.list +- Rebased patches: + * xscreensaver-disable-upgrade-nagging-message.patch + * xscreensaver-slideshow-dri-detect.patch +- Update to 5.36: + * New hacks, `discoball', `cubetwist', `cubestack', `splodesic' + and `hexstrut'. + * OSX: loading image files works in `dymaxionmap', `glplanet', + `lavalite', `pulsar', `gleidescope' and `extrusion'. + * Several new programs in `m6502'. + * `rotzoomer -mode circle'. + * Better titles in `photopile'. +- Update to 5.35: + * New hacks, `dymaxionmap', `unicrud', `energystream', `raverhoop' + and `hydrostat'. + * Added Windows 10 to `bsod'. + * X11: ignore WM_USER_TIME property changes with days-old timestamps. + Thanks, KDE. + * MacOS, iOS: Better fonts in `BSOD' and `memscroller'. + * MacOS 10.8 or later and iOS 6.0 or later are now required, since + Xcode 6 can no longer build executables that work on older OSes. + * Many, many Android improvements. + * iOS: Fixed rotation to work with the new iOS 8+ API. + * X11: `pong' is now playable. + +------------------------------------------------------------------- Old: ---- xscreensaver-5.34.tar.gz New: ---- xscreensaver-5.36.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscreensaver.spec ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.681942581 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.685942017 +0100 @@ -1,7 +1,7 @@ # # spec file for package xscreensaver # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xscreensaver -Version: 5.34 +Version: 5.36 Release: 0 Summary: A screen saver and locker for the X Window System License: BSD-3-Clause and GPL-2.0+ @@ -125,11 +125,11 @@ %patch20 %patch21 # FIXME: Test, whether this patch is still needed: -%patch24 +%patch24 -p1 %patch29 %patch32 %patch42 -%patch43 +%patch43 -p1 # KDE, GNOME and MATE have there own screensavers: echo 'NotShowIn=KDE;GNOME;MATE;' >> driver/screensaver-properties.desktop.in cp -f %{SOURCE4} xscreensaver-desktops-generate @@ -234,7 +234,7 @@ %{_datadir}/X11/app-defaults/XScreenSaver %config %{_sysconfdir}/pam.d/xscreensaver %dir %{_sysconfdir}/xscreensaver/ -%{_sysconfdir}/xscreensaver/README +%config %{_sysconfdir}/xscreensaver/README %files data -f %{name}-data.lst %defattr(-,root,root) ++++++ xscreensaver-5.34.tar.gz -> xscreensaver-5.36.tar.gz ++++++ /work/SRC/openSUSE:Factory/xscreensaver/xscreensaver-5.34.tar.gz /work/SRC/openSUSE:Factory/.xscreensaver.new/xscreensaver-5.36.tar.gz differ: char 5, line 1 ++++++ xscreensaver-data-extra.list ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.753932429 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.757931865 +0100 @@ -39,7 +39,9 @@ crystal cube21 cubenetic +cubestack cubestorm +cubetwist cubicgrid cwaves cynosure @@ -49,9 +51,12 @@ deluxe demon discrete +discoball distort drift +dymaxionmap endgame +energystream engine epicycle eruption @@ -88,8 +93,10 @@ halo helix hexadrop +hexstrut hilbert hopalong +hydrostat hypertorus hypnowheel ifs @@ -147,6 +154,7 @@ qix quasicrystal queens +raverhoop rd-bomb ripples rocks @@ -164,6 +172,7 @@ sonar speedmine spheremonics +splodesic spotlight sproingies squiral @@ -185,6 +194,7 @@ truchet twang unknownpleasures +unicrud vermiculate vidwhacker voronoi ++++++ xscreensaver-disable-upgrade-nagging-message.patch ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.785927916 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.789927353 +0100 @@ -1,41 +1,42 @@ -Index: driver/prefs.c +Index: xscreensaver-5.36/driver/prefs.c =================================================================== ---- driver/prefs.c.orig -+++ driver/prefs.c -@@ -1706,35 +1706,5 @@ senescent_p (void) - - jwz, 2014 +--- xscreensaver-5.36.orig/driver/prefs.c ++++ xscreensaver-5.36/driver/prefs.c +@@ -1735,36 +1735,5 @@ decrepit_p (void) + upgrading it again -- which would be the worst possible outcome for + everyone involved, most especially the users. */ -- time_t now = time ((time_t *) 0); /* N */ -- struct tm *tm = localtime (&now); /* o */ -- const char *s = screensaver_id; /* */ -- char mon[4], year[5]; /* d */ -- int m, y, months; /* o */ -- s = strchr (s, ' '); if (!s) abort(); s++; /* n */ -- s = strchr (s, '('); if (!s) abort(); s++; /* ' */ -- s = strchr (s, '-'); if (!s) abort(); s++; /* t */ -- strncpy (mon, s, 3); /* */ -- mon[3] = 0; /* d */ -- s = strchr (s, '-'); if (!s) abort(); s++; /* o */ -- strncpy (year, s, 4); /* */ -- year[4] = 0; /* i */ -- y = atoi (year); /* t */ -- if (!strcmp(mon, "Jan")) m = 0; /* , */ -- else if (!strcmp(mon, "Feb")) m = 1; /* */ -- else if (!strcmp(mon, "Mar")) m = 2; /* s */ -- else if (!strcmp(mon, "Apr")) m = 3; /* t */ -- else if (!strcmp(mon, "May")) m = 4; /* o */ -- else if (!strcmp(mon, "Jun")) m = 5; /* p */ -- else if (!strcmp(mon, "Jul")) m = 6; /* , */ -- else if (!strcmp(mon, "Aug")) m = 7; /* */ -- else if (!strcmp(mon, "Sep")) m = 8; /* s */ -- else if (!strcmp(mon, "Oct")) m = 9; /* t */ +- +- time_t now = time ((time_t *) 0); /* */ +- struct tm *tm = localtime (&now); /* d */ +- const char *s = screensaver_id; /* o */ +- char mon[4], year[5]; /* n */ +- int m, y, months; /* ' */ +- s = strchr (s, ' '); if (!s) abort(); s++; /* t */ +- s = strchr (s, '('); if (!s) abort(); s++; /* */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* d */ +- strncpy (mon, s, 3); /* o */ +- mon[3] = 0; /* */ +- s = strchr (s, '-'); if (!s) abort(); s++; /* i */ +- strncpy (year, s, 4); /* t */ +- year[4] = 0; /* , */ +- y = atoi (year); /* */ +- if (!strcmp(mon, "Jan")) m = 0; /* s */ +- else if (!strcmp(mon, "Feb")) m = 1; /* t */ +- else if (!strcmp(mon, "Mar")) m = 2; /* o */ +- else if (!strcmp(mon, "Apr")) m = 3; /* p */ +- else if (!strcmp(mon, "May")) m = 4; /* , */ +- else if (!strcmp(mon, "Jun")) m = 5; /* */ +- else if (!strcmp(mon, "Jul")) m = 6; /* s */ +- else if (!strcmp(mon, "Aug")) m = 7; /* t */ +- else if (!strcmp(mon, "Sep")) m = 8; /* a */ +- else if (!strcmp(mon, "Oct")) m = 9; /* a */ - else if (!strcmp(mon, "Nov")) m = 10; /* a */ -- else if (!strcmp(mon, "Dec")) m = 11; /* a */ -- else abort(); /* a */ +- else if (!strcmp(mon, "Dec")) m = 11; /* h */ +- else abort(); /* h */ - months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ -- (y * 12 + m)); /* h */ -- /* h */ -- return (months > 18); /* p */ -+ return False; +- (y * 12 + m)); /* p */ +- /* . */ +- return (months >= 17); /* */ ++return False; } ++++++ xscreensaver-slideshow-dri-detect.patch ++++++ --- /var/tmp/diff_new_pack.Y9pyCH/_old 2017-03-01 23:41:11.821922841 +0100 +++ /var/tmp/diff_new_pack.Y9pyCH/_new 2017-03-01 23:41:11.821922841 +0100 @@ -1,8 +1,8 @@ -Index: hacks/glx/glslideshow.c +Index: xscreensaver-5.36/hacks/glx/glslideshow.c =================================================================== ---- hacks/glx/glslideshow.c.orig -+++ hacks/glx/glslideshow.c -@@ -989,6 +989,29 @@ sanity_check (ModeInfo *mi) +--- xscreensaver-5.36.orig/hacks/glx/glslideshow.c ++++ xscreensaver-5.36/hacks/glx/glslideshow.c +@@ -992,7 +992,29 @@ sanity_check (ModeInfo *mi) else if (fps_cutoff > 30) fps_cutoff = 30; } @@ -14,25 +14,25 @@ + + zoom = 100; + fade_seconds = 0; -+ + + sanity_check (mi); + + for (i = 0; i < ss->nsprites; i++) -+ { -+ sprite *sp = ss->sprites[i]; -+ randomize_sprite (mi, sp); -+ sp->state = FULL; -+ } ++ { ++ sprite *sp = ss->sprites[i]; ++ randomize_sprite (mi, sp); ++ sp->state = FULL; ++ } + -+ ss->redisplay_needed_p = True; ++ss->redisplay_needed_p = True; + -+ /* Need this in case zoom changed. */ -+ reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height); ++/* Need this in case zoom changed. */ ++reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height); +} - static void check_fps (ModeInfo *mi) -@@ -998,7 +1021,6 @@ check_fps (ModeInfo *mi) + { +@@ -1001,7 +1023,6 @@ check_fps (ModeInfo *mi) slideshow_state *ss = &sss[MI_SCREEN(mi)]; double start_time, end_time, wall_elapsed, frame_duration, fps; @@ -40,7 +40,7 @@ start_time = ss->now; end_time = double_time(); -@@ -1029,22 +1051,7 @@ check_fps (ModeInfo *mi) +@@ -1032,22 +1053,7 @@ check_fps (ModeInfo *mi) fprintf (stderr, "%s: only %.1f fps! Turning off pan/fade to compensate...\n", blurb(), fps); @@ -60,21 +60,20 @@ - - /* Need this in case zoom changed. */ - reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height); -+ low_fps_mode (mi); - #endif /* HAVE_COCOA */ ++low_fps_mode (mi); + #endif /* HAVE_JWXYZ */ } -@@ -1084,7 +1091,13 @@ init_slideshow (ModeInfo *mi) +@@ -1087,7 +1093,12 @@ init_slideshow (ModeInfo *mi) ss = &sss[screen]; if ((ss->glx_context = init_GL(mi)) != NULL) { - reshape_slideshow (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); -+ -+ if (glXIsDirect (MI_DISPLAY(mi), *ss->glx_context) == True) { -+ reshape_slideshow (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); -+ } else { -+ low_fps_mode (mi); -+ } ++ if (glXIsDirect (MI_DISPLAY(mi), *ss->glx_context) == True) { ++ reshape_slideshow (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); ++ } else { ++ low_fps_mode (mi); ++ } + } else { MI_CLEARWINDOW(mi);
