Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xlockmore for openSUSE:Factory checked in at 2022-01-26 21:26:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xlockmore (Old) and /work/SRC/openSUSE:Factory/.xlockmore.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xlockmore" Wed Jan 26 21:26:59 2022 rev:42 rq:949171 version:5.68 Changes: -------- --- /work/SRC/openSUSE:Factory/xlockmore/xlockmore.changes 2021-10-18 22:02:51.558122528 +0200 +++ /work/SRC/openSUSE:Factory/.xlockmore.new.1938/xlockmore.changes 2022-01-26 21:27:41.133702375 +0100 @@ -1,0 +2,12 @@ +Tue Jan 25 15:38:09 UTC 2022 - Avinesh Kumar <[email protected]> + +- update to 5.68: + * Updated xscreensaver port for xscreensaver-6.02. + * Various NetBsd install issues fixed including config.cygport. + * pam vulnerabiliy patch added thanks to Elmar Hoffmann, elho AT elho.net. + Card vulnerability may remain, see README. + * module fixes for deluxe, eyes, starfish, swirl, text3d2, module use is + still experimental. + * biof mode removed again (though was not building by default). + +------------------------------------------------------------------- Old: ---- xlockmore-5.67.tar.xz xlockmore-5.67.tar.xz.asc New: ---- xlockmore-5.68.tar.xz xlockmore-5.68.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xlockmore.spec ++++++ --- /var/tmp/diff_new_pack.qgRL25/_old 2022-01-26 21:27:42.089695783 +0100 +++ /var/tmp/diff_new_pack.qgRL25/_new 2022-01-26 21:27:42.093695756 +0100 @@ -1,7 +1,7 @@ # # spec file for package xlockmore # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # 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: xlockmore -Version: 5.67 +Version: 5.68 Release: 0 Summary: Screen Saver and Locker for the X Window System License: MIT ++++++ xlockmore-5.67.tar.xz -> xlockmore-5.68.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/README new/xlockmore-5.68/README --- old/xlockmore-5.67/README 2021-08-30 01:53:45.000000000 +0200 +++ new/xlockmore-5.68/README 2021-12-20 01:48:20.000000000 +0100 @@ -1,4 +1,4 @@ -xlockmore-5.67: the maintained version of xlock +xlockmore-5.68: the maintained version of xlock see docs/Revisions for more version stuff see docs/TODO for stuff to do :) Help is always appreciated too ;) . @@ -518,6 +518,11 @@ PAM http://www.kernel.org/pub/linux/libs/pam/ + Problem reported (elho's patch there currently added): + https://nvd.nist.gov/vuln/detail/CVE-2006-0061 + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=318123 + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=399003 + Rplay Audio package. See below on availability. Follow its instructions and then go to iconfig.h and uncomment (should be autodetected if you use diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/config.cygport new/xlockmore-5.68/config.cygport --- old/xlockmore-5.67/config.cygport 2019-12-05 01:56:37.000000000 +0100 +++ new/xlockmore-5.68/config.cygport 2021-12-10 20:48:43.000000000 +0100 @@ -4,12 +4,12 @@ #NAME=${DIR} NAME=xlockmore GROUP=${NAME} -if test "$1" == ""; then +if test "$1" = ""; then VERSION=`grep VERSION xlock/version.h | sed 's/^.*"\(.*\)"/\1/'` RELEASE=1 else VERSION=$1 - if test "$2" == ""; then + if test "$2" = ""; then RELEASE=1 else RELEASE=$2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/configure new/xlockmore-5.68/configure --- old/xlockmore-5.67/configure 2020-06-04 16:43:47.000000000 +0200 +++ new/xlockmore-5.68/configure 2021-12-20 01:27:36.000000000 +0100 @@ -633,6 +633,8 @@ UNSTABLE INTERACTIVE BOMB +FREETYPE +TTF FTGL GLTT GL @@ -1537,7 +1539,7 @@ enable SUNOS Adjunct passwording --disable-mb disable Xmb function series so will only display ASCII --enable-customization enable customization of XResource - --enable-modules enable modules (better to use xmkmf for this) + --enable-modules enable modules (experimental!) --enable-blank-only enable blank mode only (boring) --enable-nice-only enable only low cpu modes --enable-check enable check (experimental) @@ -4876,7 +4878,7 @@ #define PACKAGE "$PACKAGE" _ACEOF -VERSION=5.64 +VERSION=5.67 cat >>confdefs.h <<_ACEOF @@ -8927,7 +8929,7 @@ $as_echo_n "(cached) " >&6 else cat > conftest.$ac_ext <<EOF -#line 8930 "configure" +#line 8932 "configure" #include "confdefs.h" #include <GL/xmesa.h> configure: XMESA_MAJOR_VERSION XMESA_MINOR_VERSION @@ -12717,6 +12719,8 @@ + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/configure.ac new/xlockmore-5.68/configure.ac --- old/xlockmore-5.67/configure.ac 2020-06-04 16:23:25.000000000 +0200 +++ new/xlockmore-5.68/configure.ac 2021-12-20 01:17:55.000000000 +0100 @@ -5003,7 +5003,7 @@ AC_DEFINE([CUSTOMIZATION], [1], [allow customization of XResoure]) fi -AC_ARG_ENABLE(modules, [ --enable-modules enable modules (better to use xmkmf for this)], +AC_ARG_ENABLE(modules, [ --enable-modules enable modules (experimental!)], modules=$enableval, modules=no) if test "$modules" = yes; then @@ -5191,6 +5191,8 @@ AC_SUBST(GL) AC_SUBST(GLTT) AC_SUBST(FTGL) +AC_SUBST(TTF) +AC_SUBST(FREETYPE) AC_SUBST(BOMB) AC_SUBST(INTERACTIVE) AC_SUBST(UNSTABLE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/docs/Revisions new/xlockmore-5.68/docs/Revisions --- old/xlockmore-5.67/docs/Revisions 2021-08-30 02:44:54.000000000 +0200 +++ new/xlockmore-5.68/docs/Revisions 2021-12-20 02:12:44.000000000 +0100 @@ -1,4 +1,4 @@ -xlockmore-5.67 as of 29 August 2021, the maintained version of xlock +xlockmore-5.68 as of 19 December 2021, the maintained version of xlock Primary site: https://www.sillycycle.com/xlock Alternate site: http://ibiblio.org/pub/Linux/X11/screensavers @@ -12,10 +12,19 @@ Adapted from Patrick J. Naughton's original xlock, with lots of help from others. +5.68 + Updated xscreensaver port for xscreensaver-6.02. + Various NetBsd install issues fixed including config.cygport. + pam vulnerabiliy patch added thanks to Elmar Hoffmann, elho AT elho.net. + Card vulnerability may remain, see README. + module fixes for deluxe, eyes, starfish, swirl, text3d2, module use is + still experimental. + biof mode removed again (though was not building by default). + 5.67 Fixing specified bound equals destination size warning in iostuff.c. Port updated for xscreensaver-6.01. With help from EoflaOE ViceCity. - Also removed some warnings. + Also removed some warnings. maze3d.c updated for VMS as CRTL now contains more standard functions, thanks to Jouk Jansen. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/Imakefile new/xlockmore-5.68/modes/Imakefile --- old/xlockmore-5.67/modes/Imakefile 2019-09-06 02:50:19.000000000 +0200 +++ new/xlockmore-5.68/modes/Imakefile 2021-12-17 06:12:28.000000000 +0100 @@ -149,6 +149,8 @@ XLOCKMULTCPPGLOBJS = $(DOG)invert$(O) #if defined(TtfLibrary) && defined(GlttLibrary) XLOCKTEXTGLOBJS = $(DOG)text3d$(O) +#endif +#if defined(FreetypeLibrary) && defined(FtglLibrary) XLOCKTEXT2GLOBJS = $(DOG)text3d2$(O) #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/Makefile.in new/xlockmore-5.68/modes/Makefile.in --- old/xlockmore-5.67/modes/Makefile.in 2020-10-05 04:36:51.000000000 +0200 +++ new/xlockmore-5.68/modes/Makefile.in 2021-12-17 05:47:25.000000000 +0100 @@ -102,8 +102,8 @@ @CCC@@GL@$(DOG)i_twojet$(OG)i_twojetvec$(O) @CCC@@GL@XLOCKDEPCPPGLOBJS = $(INVERTOBJS) @CCC@@GL@XLOCKMULTCPPGLOBJS = $(DOG)invert$(O) -@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O) -@CCC@@GL@@FTGL@XLOCKTEXT2GLOBJS = $(DOG)text3d2$(O) +@CCC@@GL@@TTF@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O) +@CCC@@GL@@FREETYPE@@FTGL@XLOCKTEXT2GLOBJS = $(DOG)text3d2$(O) @GL@SPROINGIESOBJS = $(DOG)buildlwo$(OG)sproingiewrap$(OG)s1_b$(O)$(S)\ @GL@$(DOG)s1_1$(OG)s1_2$(OG)s1_3$(OG)s1_4$(OG)s1_5$(OG)s1_6$(O) @GL@ATLANTISOBJS = $(DOG)dolphin$(OG)shark$(OG)swim$(OG)whale$(O) @@ -345,7 +345,7 @@ CXXFLAGS = @CXXFLAGS@ #CFLAGS = -O #CFLAGS = -g -XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) +XLOCKLDFLAGS = @XLOCKLDFLAGS@ @LDFLAGS@ $(CHECKLDFLAG) XLIBS = @XLIBS@ XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ @@ -634,9 +634,9 @@ install-program : xlock $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir) - @MODULES@mkdir -p $(DEF_MODULEPATH) - @MODULES@cp *.xlk $(DEF_MODULEPATH) - @MODULES@cp glx/*.xlk $(DEF_MODULEPATH) + @MODULES@mkdir -p $(DESTDIR)$(DEF_MODULEPATH) + @MODULES@cp *.xlk $(DESTDIR)$(DEF_MODULEPATH) + @MODULES@cp glx/*.xlk $(DESTDIR)$(DEF_MODULEPATH) install-man : $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/deluxe.c new/xlockmore-5.68/modes/deluxe.c --- old/xlockmore-5.67/modes/deluxe.c 2021-07-22 02:21:58.000000000 +0200 +++ new/xlockmore-5.68/modes/deluxe.c 2021-12-15 02:24:21.000000000 +0100 @@ -179,7 +179,7 @@ #ifdef USE_MODULES ModStruct deluxe_description = {"deluxe", "init_deluxe", "draw_deluxe", "release_deluxe", - "(char *) NULL", "init_deluxe", (char *) NULL, &deluxe_opts, + (char *) NULL, "init_deluxe", (char *) NULL, &deluxe_opts, 5000, 5, 1, 1, 64, 1.0, "", "Shows pulsing sequence of stars, circles, and lines.", 0, NULL}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/eyes.c new/xlockmore-5.68/modes/eyes.c --- old/xlockmore-5.67/modes/eyes.c 2020-10-05 01:49:28.000000000 +0200 +++ new/xlockmore-5.68/modes/eyes.c 2021-12-15 02:12:26.000000000 +0100 @@ -87,7 +87,7 @@ #ifdef USE_MODULES ModStruct eyes_description = {"eyes", "init_eyes", "draw_eyes", "release_eyes", - "refresh_eyes", "init_eyes", ((char *) NULL, &eyes_opts, + "refresh_eyes", "init_eyes", (char *) NULL, &eyes_opts, 20000, -8, 5, 1, 64, 1.0, "", "Shows eyes following a bouncing grelb", 0, NULL}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/flow.c new/xlockmore-5.68/modes/flow.c --- old/xlockmore-5.67/modes/flow.c 2020-10-05 01:54:31.000000000 +0200 +++ new/xlockmore-5.68/modes/flow.c 2021-12-17 02:15:07.000000000 +0100 @@ -176,7 +176,7 @@ ModStruct flow_description = { "flow", "init_flow", "draw_flow", "release_flow", "refresh_flow", "init_flow", (char *) NULL, &flow_opts, - 1000, 1024, 10000, -10, 200, 1.0, "", + 1000, 1024, 10000, -10, 64, 1.0, "", "Shows dynamic strange attractors", 0, NULL }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/Imakefile new/xlockmore-5.68/modes/glx/Imakefile --- old/xlockmore-5.67/modes/glx/Imakefile 2011-12-05 21:23:38.000000000 +0100 +++ new/xlockmore-5.68/modes/glx/Imakefile 2021-12-17 06:14:35.000000000 +0100 @@ -40,6 +40,8 @@ XLOCKMULTCPPGLOBJS = $(DOG)invert$(O) #if defined(TtfLibrary) && defined(GlttLibrary) XLOCKTEXTGLOBJS = $(DOG)text3d$(O) +#endif +#if defined(FreetypeLibrary) && defined(FtglLibrary) XLOCKTEXT2GLOBJS = $(DOG)text3d2$(O) #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/Makefile.in new/xlockmore-5.68/modes/glx/Makefile.in --- old/xlockmore-5.67/modes/glx/Makefile.in 2020-10-05 04:49:01.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/Makefile.in 2021-12-17 05:48:04.000000000 +0100 @@ -54,8 +54,8 @@ @CCC@@GL@$(DOG)i_twojet$(OG)i_twojetvec$(O) @CCC@@GL@XLOCKDEPCPPGLOBJS = $(INVERTOBJS) @CCC@@GL@XLOCKMULTCPPGLOBJS = $(DOG)invert$(O) -@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O) -@CCC@@GL@@FTGL@XLOCKTEXT2GLOBJS = $(DOG)text3d2$(O) +@CCC@@GL@@TTF@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O) +@CCC@@GL@@FREETYPE@@FTGL@XLOCKTEXT2GLOBJS = $(DOG)text3d2$(O) @GL@SPROINGIESOBJS = $(DOG)buildlwo$(OG)sproingiewrap$(OG)s1_b$(O)$(S)\ @GL@$(DOG)s1_1$(OG)s1_2$(OG)s1_3$(OG)s1_4$(OG)s1_5$(OG)s1_6$(O) @GL@ATLANTISOBJS = $(DOG)dolphin$(OG)shark$(OG)swim$(OG)whale$(O) @@ -77,7 +77,7 @@ @GL@$(XLOCKTEXT2GLOBJS)$(S)$(XLOCKUNSTABLEGLOBJS) @GL@XLOCKMULTGLOBJS = $(DOG)fire$(OG)lament$(OG)sballs$(OG)molecule$(O)$(S)\ @GL@$(DOG)pipes$(OG)sproingies$(OG)atlantis$(OG)atunnels$(O)$(S)\ -@GL@boxed$(OG)bubble3d$(OG)glplanet$(OG)juggler3d$(O)$(S)\ +@GL@$(DOG)boxed$(OG)bubble3d$(OG)glplanet$(OG)juggler3d$(O)$(S)\ @GL@maze3d$(OG)$(XLOCKMULTCPPGLOBJS) XLOCKGLOBJS = $(XLOCKNORMGLOBJS)$(S)\ $(XLOCKDEPGLOBJS)$(S)$(XLOCKMULTGLOBJS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/Makefile.inxs new/xlockmore-5.68/modes/glx/Makefile.inxs --- old/xlockmore-5.67/modes/glx/Makefile.inxs 2021-07-16 03:15:04.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/Makefile.inxs 2021-12-17 04:05:58.000000000 +0100 @@ -97,7 +97,7 @@ $(HACK_BIN)/fps.o $(HACK_BIN)/ximage-loader.o PNG = $(HACK_BIN)/ximage-loader.o -SRCS = biof.c fire.c invert.c skewb.c \ +SRCS = fire.c invert.c skewb.c \ xscreensaver-gl-helper.c normals.c erase-gl.c fps-gl.c \ atlantis.c b_draw.c b_lockglue.c b_sphere.c bubble3d.c \ buildlwo.c cage.c dolphin.c gears.c lament.c lament_model.c \ @@ -150,7 +150,7 @@ gibson.c etruscanvenus.c sphereeversion.c covid19.c \ co____9.c headroom.c headroom_model.c beats.c glsl-utils.c -OBJS = biof.o fire.o invert.o skewb.o \ +OBJS = fire.o invert.o skewb.o \ xscreensaver-gl-helper.o normals.o erase-gl.o fps-gl.o \ atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \ buildlwo.o cage.o dolphin.o gears.o lament.o lament_model.o \ @@ -204,7 +204,7 @@ headroom.o headroom_model.o beats.o glsl-utils.o -GL_EXES = biof boxed bubble3d cage fire juggler3d gears \ +GL_EXES = boxed bubble3d cage fire juggler3d gears \ moebius molecule morph3d noof pipes rubik sierpinski3d \ skewb sproingies stairs superquadrics \ maze3d invert atlantis atunnels glplanet lament sballs \ @@ -269,7 +269,7 @@ dropshadow.h starwars.h teapot2.h dnapizza.h curlicue.h \ quickhull.h dymaxionmap-coords.h handsy_anim.h GL_MEN = atlantis.man boxed.man bubble3d.man cage.man circuit.man \ - biof.man skewb.man \ + skewb.man \ cubenetic.man dangerball.man engine.man extrusion.man \ flipscreen3d.man gears.man gflux.man \ glplanet.man glsnake.man gltext.man lament.man lavalite.man \ @@ -621,9 +621,6 @@ atunnels: atunnels.o $(ATUNNELS_OBJS) $(CC_HACK) -o $@ [email protected] $(ATUNNELS_OBJS) $(HACK_LIBS) -lXpm -biof: biof.o $(HACK_OBJS) - $(CC_HACK) -o $@ [email protected] $(HACK_OBJS) $(HACK_LIBS) - boxed: boxed.o $(HACK_OBJS) $(CC_HACK) -o $@ [email protected] $(HACK_OBJS) $(HACK_LIBS) @@ -1230,20 +1227,6 @@ b_draw.o: $(UTILS_SRC)/visual.h b_draw.o: $(UTILS_SRC)/yarandom.h b_draw.o: $(HACK_SRC)/xlockmoreI.h -biof.o: ../../../config.h -biof.o: $(HACK_SRC)/fps.h -biof.o: $(HACK_SRC)/recanim.h -biof.o: $(HACK_SRC)/screenhackI.h -biof.o: $(UTILS_SRC)/colors.h -biof.o: $(UTILS_SRC)/erase.h -biof.o: $(UTILS_SRC)/font-retry.h -biof.o: $(UTILS_SRC)/grabscreen.h -biof.o: $(UTILS_SRC)/hsv.h -biof.o: $(UTILS_SRC)/resources.h -biof.o: $(UTILS_SRC)/usleep.h -biof.o: $(UTILS_SRC)/visual.h -biof.o: $(UTILS_SRC)/yarandom.h -biof.o: $(HACK_SRC)/xlockmoreI.h fire.o: ../../../config.h fire.o: $(HACK_SRC)/fps.h fire.o: $(HACK_SRC)/recanim.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/atunnels.c new/xlockmore-5.68/modes/glx/atunnels.c --- old/xlockmore-5.67/modes/glx/atunnels.c 2020-10-05 02:47:33.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/atunnels.c 2021-12-17 02:20:40.000000000 +0100 @@ -120,8 +120,8 @@ #ifdef USE_MODULES ModStruct atunnels_description = {"atunnels", "init_atunnels", "draw_atunnels", "release_atunnels", - "draw_atunnels", "init_atunnels", NULL, &atunnels_opts, - 25000, 1, 1, 1, 0, 1.0, "", + "draw_atunnels", "change_atunnels", NULL, &atunnels_opts, + 25000, 1, 1, 0, 64, 1.0, "", "Shows an OpenGL advanced tunnel screensaver", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/biof.c new/xlockmore-5.68/modes/glx/biof.c --- old/xlockmore-5.67/modes/glx/biof.c 2019-09-26 04:54:27.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/biof.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,630 +0,0 @@ -/* biof --- 3D Bioform */ - -#if 0 -static const char sccsid[] = "@(#)biof.c 5.15 2005/02/15 xlockmore"; -#endif - -/* Copyright (c) E. Lassauge, 2005. */ - -/* - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation. - * - * This file is provided AS IS with no warranties of any kind. The author - * shall have no liability with respect to the infringement of copyrights, - * trade secrets or any patents by this file or any part thereof. In no - * event will the author be liable for any lost revenue or profits or - * other special, indirect and consequential damages. - * - * The original code is from the really slick screensaver series - * (see below the original header) - * - * Eric Lassauge (Feb-15-2005) <lassauge AT users.sourceforge.net> - * - * REVISION HISTORY: - * - * - Eric Lassauge (Feb-15-2005) <lassauge AT users.sourceforge.net> - * Ported the rss_glx version to xlockmore (added random color + wireframe + fps) - */ - -/* - * Copyright (C) 2002 <[email protected]> - * Ported to Linux by Tugrul Galatali <[email protected]> - * - * BioF is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * BioF is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifdef STANDALONE -# define MODE_biof -# define DEFAULTS "*delay: 25000 \n" \ - "*count: 4 \n" \ - "*showFPS: False \n" \ - "*cycles: 100 \n" \ - "*size: 6000 \n" \ - -/* "*preset: 5 \n" */ -#define free_biof 0 -#define biof_handle_event 0 -# include "xlockmore.h" /* from the xscreensaver distribution */ -# include <stdio.h> -# include <stdlib.h> -# include <math.h> -#else /* !STANDALONE */ -# include "xlock.h" /* from the xlockmore distribution */ -# include "visgl.h" -#endif /* !STANDALONE */ - -#ifdef MODE_biof -/* BioF screen saver */ - -#include <stdlib.h> -#include <GL/gl.h> -#include <GL/glu.h> - -#define TRIANGLES 1 -#define SPHERES 2 -#define BIGSPHERES 3 -#define POINTS 4 -#define LIGHTMAP 5 - -/*#define COLOR 0.9, 0.75, 0.5 */ -/*#define COLOR_RAND(i) ((float) (NRAND(i)) / 100.0) */ -/* Try to keep the same 'weight' on the components: */ -#define COLOR_RAND(i) ((float) ( (2*i - 100) + NRAND(100 - i) ) / 100.0) -static float C_RED; -static float C_GREEN; -static float C_BLUE; -#define COLOR C_RED, C_GREEN, C_BLUE - -static void handle_opts (ModeInfo * mi); - -static XrmOptionDescRec opts[] = -{ - {(char *) "-preset", (char *) ".biof.preset", XrmoptionSepArg, (caddr_t)NULL}, - {(char *) "-triangles", (char *) ".biof.preset", XrmoptionNoArg, (caddr_t)"1"}, - {(char *) "-spheres", (char *) ".biof.preset", XrmoptionNoArg, (caddr_t)"2"}, - {(char *) "-bigspheres", (char *) ".biof.preset", XrmoptionNoArg, (caddr_t)"3"}, - {(char *) "-lightmap", (char *) ".biof.preset", XrmoptionNoArg, (caddr_t)"5"}, - {(char *) "-lines", (char *) ".biof.lines", XrmoptionSepArg, (caddr_t)NULL}, - {(char *) "-points", (char *) ".biof.points", XrmoptionSepArg, (caddr_t)NULL}, - {(char *) "-offangle", (char *) ".biof.offangle", XrmoptionNoArg, (caddr_t)"True"}, - {(char *) "+offangle", (char *) ".biof.offangle", XrmoptionNoArg, (caddr_t)"False"}, -}; - -static int var_preset; -static int var_offangle; -static int var_lines; -static int var_points; - -static argtype vars[] = -{ - {(void *) & var_preset, (char *) "preset", (char *) "Preset", (char *) "0", t_Int}, - {(void *) & var_lines, (char *) "lines", (char *) "Lines", (char *) "0", t_Int}, - {(void *) & var_points, (char *) "points", (char *) "Points", (char *) "0", t_Int}, - {(void *) & var_offangle, (char *) "offangle", (char *) "OffAngle", (char *) "False", t_Bool}, -}; - -static OptionStruct desc[] = -{ - {(char *) "-preset num", (char *) "preset to use [1-5]"}, - {(char *) "-triangles", (char *) "preset 1"}, - {(char *) "-spheres", (char *) "preset 2"}, - {(char *) "-bigspheres", (char *) "preset 3"}, - {(char *) "-lightmap", (char *) "preset 5"}, - {(char *) "-lines num", (char *) "use num lines"}, - {(char *) "-points num", (char *) "use num points"}, - {(char *) "+/-offangle", (char *) "whether to use OffAngle"}, -}; - -ENTRYPOINT ModeSpecOpt biof_opts = -{sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; - -#ifdef USE_MODULES -ModStruct biof_description = -{"biof", "init_biof", "draw_biof", "release_biof", - "draw_biof", "init_biof", (char *) NULL, &cage_opts, - 10000, 800, 1, 0, 1.0, "", - "Shows BioF", 0, NULL}; - -#endif - -typedef struct { -#ifdef WIN32 - HGLRC glx_context; -#else - GLXContext *glx_context; -#endif - GLint WinH, WinW; - int wire; - - int NRPOINTS, NRLINES; - int dGeometry; - int dOffAngle; - double time; - - GLUquadricObj *shapes; -} biofstruct; - -static biofstruct *biof = (biofstruct *) NULL; - -static void Horn (ModeInfo * mi, int ribs, double bend, double stack, double twist, double twisttrans, double grow) -{ - biofstruct *bp = &biof[MI_SCREEN(mi)]; - int i; - - for (i = 0; i < ribs; i++) { - glPushMatrix (); - glRotated (i * bend / ribs, 1, 0, 0); - glTranslated (0, 0, i * stack / ribs); - glTranslated (twisttrans, 0, 0); - glRotated (i * twist / ribs, 0, 0, 1); - glTranslated (-twisttrans, 0, 0); - - switch (bp->dGeometry) { - case TRIANGLES: - glBegin (bp->wire?GL_LINE_LOOP:GL_TRIANGLES); - glColor4d (COLOR, 1.0); - glVertex3d (2.0, 2.0, 0.0); - glColor4d (COLOR, 0.0); - glVertex3d (0.0, 2.0, 0.0); - glVertex3d (2.0, 0.0, 0.0); - glEnd (); - - break; - - case BIGSPHERES: - if (!bp->wire) - { - gluQuadricDrawStyle (bp->shapes, GLU_FILL); - gluQuadricNormals (bp->shapes, GLU_SMOOTH); - } - else - { - gluQuadricDrawStyle (bp->shapes, GLU_LINE); - gluQuadricNormals (bp->shapes, GLU_NONE); - } - gluSphere (bp->shapes, 7 * exp (i / ribs * log (grow)), 20, 10); - - break; - - case SPHERES: - if (!bp->wire) - { - gluQuadricDrawStyle (bp->shapes, GLU_FILL); - gluQuadricNormals (bp->shapes, GLU_SMOOTH); - } - else - { - gluQuadricDrawStyle (bp->shapes, GLU_LINE); - gluQuadricNormals (bp->shapes, GLU_NONE); - } - /*gluSphere(bp->shapes, power(grow,i/ribs), 5, 5);*/ - gluSphere (bp->shapes, exp (i / ribs * log (grow)), 6, 4); - - break; - - case LIGHTMAP: - case POINTS: - glBegin (GL_POINTS); - glVertex3d (0, 0, 0); - glEnd (); - - break; - } - - glPopMatrix (); - } -} - -ENTRYPOINT void -reshape_biof (ModeInfo * mi, int width, int height) -{ - biofstruct *bp = &biof[MI_SCREEN(mi)]; - - glViewport (0, 0, bp->WinW = (GLint) width, bp->WinH = (GLint) height); - glMatrixMode (GL_PROJECTION); - glLoadIdentity (); - gluPerspective (30, (GLdouble) width / (GLdouble) height, 100, 300); -} - -ENTRYPOINT void -init_biof (ModeInfo * mi) -{ - float glfLightPosition[4] = { 100.0, 100.0, 100.0, 0.0 }; - float glfFog[4] = { 0.0, 0.0, 0.3, 1.0 }; - /*float DiffuseLightColor[4] = { 1, 0.8, 0.4, 1.0 };*/ - float DiffuseLightColor[4] = { 1.0, 1.0, 1.0, 1.0 }; - int i, j; - double x, y, r, d; - unsigned char texbuf[64][64]; - int screen = MI_SCREEN(mi); - biofstruct *bp; - - MI_INIT(mi, biof); - bp = &biof[screen]; - bp->wire = MI_IS_WIREFRAME(mi); - C_RED = COLOR_RAND(90); - C_GREEN = COLOR_RAND(75); - C_BLUE = COLOR_RAND(50); - DiffuseLightColor[1] = COLOR_RAND(80); - DiffuseLightColor[2] = COLOR_RAND(40); - - handle_opts(mi); - if (MI_IS_DEBUG(mi)) { - (void) fprintf(stderr, - "%s:\n\tpreset=%d\n\toffangle=%d\n\tlines=%d\n\tpoints=%d\n\twireframe=%s\n", - MI_NAME(mi), - bp->dGeometry, - bp->dOffAngle, - bp->NRLINES, - bp->NRPOINTS, - bp->wire ? "yes" : "no" - ); - } - - if ((bp->glx_context = init_GL(mi)) != NULL) { - - glEnable (GL_DEPTH_TEST); - - if (bp->wire) - { - glDisable (GL_BLEND); - } - else - { - glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable (GL_BLEND); - } - - if ((bp->dGeometry == SPHERES) || (bp->dGeometry == BIGSPHERES)) { - if (bp->wire) - { - glDisable (GL_CULL_FACE); - glDisable (GL_LIGHTING); - glDisable (GL_LIGHT0); - } - else - { - glEnable (GL_CULL_FACE); - glCullFace (GL_BACK); - - glLightfv (GL_LIGHT0, GL_POSITION, glfLightPosition); - glEnable (GL_LIGHTING); - glEnable (GL_LIGHT0); - - glLightfv (GL_LIGHT0, GL_DIFFUSE, DiffuseLightColor); - } - - bp->shapes = gluNewQuadric (); - } else if (bp->dGeometry == POINTS) { - if (bp->wire) - { - glDisable (GL_POINT_SMOOTH); - glPointSize (3.0); - } - else - { - glHint (GL_POINT_SMOOTH_HINT, GL_NICEST); - glPointSize (3.0); - glEnable (GL_POINT_SMOOTH); - - glFogi (GL_FOG_MODE, GL_LINEAR); - glHint (GL_FOG_HINT, GL_NICEST); - glFogfv (GL_FOG_COLOR, glfFog); - glFogf (GL_FOG_START, 150); - glFogf (GL_FOG_END, 250); - glEnable (GL_FOG); - } - } else if (bp->dGeometry == LIGHTMAP) { /* Can't be wired ! */ - r = 32; - - memset ((void *)&texbuf, 0, 4096); - - for (i = 0; i < 64; i++) { - for (j = 0; j < 64; j++) { - x = abs (i - 32); - y = abs (j - 32); - d = sqrt (x * x + y * y); - - if (d < r) { - d = 1 - (d / r); - texbuf[i][j] = (char)(255.0f * d * d); - } - } - } - - gluBuild2DMipmaps (GL_TEXTURE_2D, 1, 64, 64, GL_LUMINANCE, GL_UNSIGNED_BYTE, texbuf); - - glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); - glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - } - - reshape_biof (mi,MI_WIDTH(mi), MI_HEIGHT(mi)); - } else { - MI_CLEARWINDOW(mi); - } - -} - -ENTRYPOINT void -release_biof (ModeInfo * mi) -{ - int screen; - - if (biof != NULL) { - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - biofstruct *bp = &biof[screen]; - if ((bp->dGeometry == SPHERES) || (bp->dGeometry == BIGSPHERES)) - gluDeleteQuadric(bp->shapes); - } - (void)free((void *)biof); - biof = (biofstruct *) NULL; - } - FreeAllGL(mi); -} - -ENTRYPOINT void -draw_biof (ModeInfo * mi) -{ -#ifndef WIN32 - struct timeval now; -#endif - double dt = 0; - biofstruct *bp = &biof[MI_SCREEN(mi)]; - Display *display = MI_DISPLAY(mi); - Window window = MI_WINDOW(mi); - - MI_IS_DRAWN(mi) = True; - - if (!bp->glx_context) - return; -#ifdef WIN32 - wglMakeCurrent(hdc, bp->glx_context); -#else - glXMakeCurrent(display, window, *(bp->glx_context)); -#endif -#ifdef WIN32 - bp->time += MI_DELAY(mi) / 100000.0; - dt = bp->time; -#else - GETTIMEOFDAY (&now); - dt = (now.tv_sec * 1000000 + now.tv_usec) * 0.000001; -#endif - if (bp->dGeometry == LIGHTMAP) { - int i, j, offset; - float *fb_buffer; - double x, y, w; - - if ((fb_buffer = (float *) malloc(bp->NRPOINTS * - bp->NRLINES * 3 * sizeof (float))) == NULL) { - return; - } - glDisable (GL_DEPTH_TEST); - glFeedbackBuffer (bp->NRPOINTS * bp->NRLINES * 3, GL_2D, fb_buffer); - glRenderMode (GL_FEEDBACK); - - glMatrixMode (GL_MODELVIEW); - glPushMatrix (); - glLoadIdentity (); - - gluLookAt (200, 0, 0, 0, 0, 0, 0, 0, 1); - - glRotated (90, 0, 1, 0); - glRotated (10 * dt, 0, 0, 1); - - glNewList (1, GL_COMPILE); - Horn (mi, bp->NRPOINTS, 315 * sin (dt * 0.237), 45 /* + 20 * sin(dt * 0.133) */ , 1500 * sin (dt * 0.213), 7.5 + 2.5 * sin (dt * 0.173), 1); - glEndList (); - - if (bp->dOffAngle) - glRotated (45, 1, 1, 0); - - for (i = 0; i < bp->NRLINES; i++) { - glPushMatrix (); - - glRotated (360 * i / bp->NRLINES, 0, 0, 1); - glRotated (45, 1, 0, 0); - glTranslated (0, 0, 2); - - glCallList (1); - - glPopMatrix (); - } - - glPopMatrix (); - - glRenderMode (GL_RENDER); - - glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - - glMatrixMode (GL_PROJECTION); - glPushMatrix (); - glLoadIdentity (); - - glMatrixMode (GL_MODELVIEW); - glPushMatrix (); - glLoadIdentity (); - - glScalef (2.0 / bp->WinW, 2.0 / bp->WinH, 1.0); - glTranslatef (-0.5 * bp->WinW, -0.5 * bp->WinH, 0.0); - - glClear (GL_COLOR_BUFFER_BIT); - - glEnable (GL_TEXTURE_2D); - glBlendFunc (GL_ONE, GL_ONE); - glEnable (GL_BLEND); - - glBegin (GL_QUADS); - - w = bp->WinW >> 7; - - for (j = 0; j < bp->NRPOINTS; j++) { - glColor3f (0.25 - 0.15 * j / bp->NRPOINTS, 0.15 + 0.10 * j / bp->NRPOINTS, 0.06 + 0.14 * j / bp->NRPOINTS); - for (i = 0; i < bp->NRLINES; i++) { - offset = 3 * (i * bp->NRPOINTS + j); - x = fb_buffer[offset + 1]; - y = fb_buffer[offset + 2]; - - glTexCoord2f (0.0, 0.0); - glVertex2f (x - w, y - w); - - glTexCoord2f (1.0, 0.0); - glVertex2f (x + w, y - w); - - glTexCoord2f (1.0, 1.0); - glVertex2f (x + w, y + w); - - glTexCoord2f (0.0, 1.0); - glVertex2f (x - w, y + w); - } - } - if (fb_buffer != NULL) - free(fb_buffer); - glEnd (); - - glMatrixMode (GL_MODELVIEW); - glPopMatrix (); - glMatrixMode (GL_PROJECTION); - glPopMatrix (); - } else { - int i; - - glClear (GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); - - glMatrixMode (GL_MODELVIEW); - glLoadIdentity (); - gluLookAt (200, 0, 0, 0, 0, 0, 0, 0, 1); - - glPushMatrix (); - glRotated (90, 0, 1, 0); - glRotated (10 * dt, 0, 0, 1); - - glColor3d (COLOR); - - glNewList (1, GL_COMPILE); - Horn (mi, bp->NRPOINTS, 315 * sin (dt * 0.237), 50 + 20 * sin (dt * 0.133), 1500 * sin (dt * 0.213), 7.5 + 2.5 * sin (dt * 0.173), 0.6 + 0.1 * sin (dt * 0.317)); - glEndList (); - - if (bp->dOffAngle) - glRotated (45, 1, 1, 0); - - for (i = 0; i < bp->NRLINES; i++) { - glPushMatrix (); - glRotated (360 * i / bp->NRLINES, 0, 0, 1); - glRotated (45, 1, 0, 0); - glTranslated (0, 0, 2); - glCallList (1); - glPopMatrix (); - } - - glPopMatrix (); - } - - if (MI_IS_FPS(mi)) do_fps (mi); - glXSwapBuffers(display, window); -} - -static void setDefaults (ModeInfo *mi, int use_preset) -{ - biofstruct *bp = &biof[MI_SCREEN(mi)]; - bp->dGeometry = use_preset; - - switch (use_preset) { - case TRIANGLES: - bp->NRPOINTS = 80; - bp->NRLINES = 32; - - break; - case SPHERES: - bp->NRPOINTS = 80; - bp->NRLINES = 30; - - break; - case BIGSPHERES: - bp->NRPOINTS = 20; - bp->NRLINES = 5; - - break; - case POINTS: - bp->NRPOINTS = 250; - bp->NRLINES = 30; - - break; - case LIGHTMAP: - bp->NRPOINTS = 150; - bp->NRLINES = 20; - - break; - } -} - -static void handle_opts (ModeInfo * mi) -{ - biofstruct *bp = &biof[MI_SCREEN(mi)]; - int change_flag = 0; - - setDefaults(mi,LIGHTMAP); - bp->dOffAngle = 0; - - if ( (var_preset > 0) && (var_preset < 6)) - { - change_flag = 1; - setDefaults (mi, var_preset); - } - if (var_lines > 0) - { - change_flag = 1; - bp->NRLINES = var_lines; - } - if (var_points > 0) - { - change_flag = 1; - bp->NRPOINTS = var_points; - } - if (var_offangle) - { - change_flag = 1; - bp->dOffAngle = 1; - } - - if (!change_flag) { - bp->dGeometry = NRAND (5) + 1; - bp->dOffAngle = NRAND (2); - - switch (bp->dGeometry) { - case TRIANGLES: - case SPHERES: - bp->NRLINES = NRAND (7) + 2; - bp->NRPOINTS = NRAND (96) + 32; - break; - - case BIGSPHERES: - bp->NRLINES = NRAND (7) + 4; - bp->NRPOINTS = NRAND (32) + 4; - break; - - case POINTS: - case LIGHTMAP: - bp->NRLINES = NRAND (32) + 4; - bp->NRPOINTS = NRAND (64) + 64; - } - } -} - -XSCREENSAVER_MODULE ("Biof", biof) - -#endif /* MODE_biof */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/moebius.c new/xlockmore-5.68/modes/glx/moebius.c --- old/xlockmore-5.67/modes/glx/moebius.c 2021-07-22 03:48:45.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/moebius.c 2021-12-17 02:25:48.000000000 +0100 @@ -133,7 +133,7 @@ ModStruct moebius_description = {"moebius", "init_moebius", "draw_moebius", "release_moebius", "draw_moebius", "change_moebius", (char *) NULL, &moebius_opts, - 30000, 1, 1, 1, 4, 1.0, "", + 30000, 1, 1, 1, 64, 1.0, "", "Shows Moebius Strip II, an Escher-like GL scene with ants", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/morph3d.c new/xlockmore-5.68/modes/glx/morph3d.c --- old/xlockmore-5.67/modes/glx/morph3d.c 2020-10-04 16:51:21.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/morph3d.c 2021-12-17 02:26:29.000000000 +0100 @@ -236,7 +236,7 @@ ModStruct morph3d_description = {"morph3d", "init_morph3d", "draw_morph3d", "release_morph3d", "draw_morph3d", "change_morph3d", (char *) NULL, &morph3d_opts, - 1000, 0, 1, 1, 4, 1.0, "", + 1000, 0, 1, 1, 64, 1.0, "", "Shows GL morphing polyhedra", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/pipes.c new/xlockmore-5.68/modes/glx/pipes.c --- old/xlockmore-5.67/modes/glx/pipes.c 2020-10-05 01:03:15.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/pipes.c 2021-12-17 02:27:15.000000000 +0100 @@ -117,7 +117,7 @@ "change_pipes", #endif "change_pipes", (char *) NULL, &pipes_opts, - 1000, 2, 5, 500, 4, 1.0, "", + 1000, 2, 5, 500, 64, 1.0, "", "Shows a selfbuilding pipe system", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/stairs.c new/xlockmore-5.68/modes/glx/stairs.c --- old/xlockmore-5.67/modes/glx/stairs.c 2020-10-04 17:54:56.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/stairs.c 2021-12-17 02:28:13.000000000 +0100 @@ -85,7 +85,7 @@ ModStruct stairs_description = {"stairs", "init_stairs", "draw_stairs", "release_stairs", "draw_stairs", "change_stairs", (char *) NULL, &stairs_opts, - 1000, 1, 1, 1, 4, 1.0, "", + 200000, 0, 1, 1, 64, 1.0, "", "Shows Infinite Stairs, an Escher-like scene", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/superquadrics.c new/xlockmore-5.68/modes/glx/superquadrics.c --- old/xlockmore-5.67/modes/glx/superquadrics.c 2020-04-03 03:46:41.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/superquadrics.c 2021-12-17 02:32:59.000000000 +0100 @@ -122,7 +122,7 @@ ModStruct superquadrics_description = {"superquadrics", "init_superquadrics", "draw_superquadrics", "release_superquadrics", (char *) NULL, "init_superquadrics", (char *) NULL, &superquadrics_opts, - 40000, 25, 40, 1, 4, 1.0, "", + 40000, 25, 40, 1, 64, 1.0, "", "Shows 3D mathematical shapes", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/text3d.cc new/xlockmore-5.68/modes/glx/text3d.cc --- old/xlockmore-5.67/modes/glx/text3d.cc 2021-07-26 19:39:00.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/text3d.cc 2021-12-15 02:47:03.000000000 +0100 @@ -59,7 +59,7 @@ * */ -#ifdef STANDALONE /* xscreensaver mode: can't work ! */ +#ifdef STANDALONE #define MODE_text3d #define DEFAULTS "*delay: 100000 \n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/glx/text3d2.cc new/xlockmore-5.68/modes/glx/text3d2.cc --- old/xlockmore-5.67/modes/glx/text3d2.cc 2021-07-26 19:38:26.000000000 +0200 +++ new/xlockmore-5.68/modes/glx/text3d2.cc 2021-12-15 02:43:04.000000000 +0100 @@ -155,7 +155,7 @@ ModStruct text3d2_description = {"text3d2", "init_text3d2", "draw_text3d2", "release_text3d2", "refresh_text3d2", "change_text3d2", (char *) NULL, &text3d2_opts, - 100000, 1, 10, 1, 64, 1.0, "", + 100000, 10, 1, 1, 64, 1.0, "", "Shows 3D text", 0, NULL}; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/life.h new/xlockmore-5.68/modes/life.h --- old/xlockmore-5.67/modes/life.h 2019-12-05 01:41:43.000000000 +0100 +++ new/xlockmore-5.68/modes/life.h 2021-12-20 00:53:53.000000000 +0100 @@ -8569,6 +8569,18 @@ 127 }, #ifdef LIFE_NAMES + {"black hole (p6)"}, +#endif + { + 3, -4, 1, -4, + -4, -3, -2, -3, -1, -3, 3, -3, 4, -3, + 2, -2, 4, -2, + -4, -1, -2, -1, + -4, 0, -3, 0, 1, 0, 2, 0, 4, 0, + -1, 1, 3, 1, + 127 + }, +#ifdef LIFE_NAMES {"walking triangle (p6)"}, #endif { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/random.c new/xlockmore-5.68/modes/random.c --- old/xlockmore-5.67/modes/random.c 2019-09-21 03:54:03.000000000 +0200 +++ new/xlockmore-5.68/modes/random.c 2021-12-15 03:19:07.000000000 +0100 @@ -944,7 +944,8 @@ if (MI_IS_DEBUG(mi)) { (void) fprintf(stderr, "%d mode%s: ", nmodes, ((nmodes == 1) ? "" : "s")); for (i = 0; i < nmodes; i++) - (void) fprintf(stderr, "%d ", modes[i]); + (void) fprintf(stderr, "%s, ", + LockProcs[i].cmdline_arg); (void) fprintf(stderr, "\n"); } return True; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/starfish.c new/xlockmore-5.68/modes/starfish.c --- old/xlockmore-5.67/modes/starfish.c 2021-07-22 03:37:09.000000000 +0200 +++ new/xlockmore-5.68/modes/starfish.c 2021-12-15 02:13:54.000000000 +0100 @@ -89,7 +89,7 @@ #ifdef USE_MODULES ModStruct starfish_description = {"starfish", "init_starfish", "draw_starfish", "release_starfish", - "init_starfish", "init_starfish", (char *), &starfish_opts, + "init_starfish", "init_starfish", (char *) NULL, &starfish_opts, 2000, 1, 1000, 1, 64, 1.0, "", "Shows starfish", 0, NULL}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/modes/swirl.c new/xlockmore-5.68/modes/swirl.c --- old/xlockmore-5.67/modes/swirl.c 2020-10-05 02:28:34.000000000 +0200 +++ new/xlockmore-5.68/modes/swirl.c 2021-12-15 02:14:46.000000000 +0100 @@ -81,7 +81,7 @@ #ifdef USE_MODULES ModStruct swirl_description = {"swirl", "init_swirl", "draw_swirl", "release_swirl", - "refresh_swirl", "init_swirl", (char* NULL), &swirl_opts, + "refresh_swirl", "init_swirl", (char *) NULL, &swirl_opts, 5000, 5, 1, 1, 64, 1.0, "", "Shows animated swirling patterns", 0, NULL}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/xglock/Makefile.in new/xlockmore-5.68/xglock/Makefile.in --- old/xlockmore-5.67/xglock/Makefile.in 2020-10-05 04:48:50.000000000 +0200 +++ new/xlockmore-5.68/xglock/Makefile.in 2021-12-14 15:52:06.000000000 +0100 @@ -93,7 +93,7 @@ CFLAGS = @GTK_CFLAGS@ @CFLAGS@ #CFLAGS = -O #CFLAGS = -g -XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ +XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ @LDFLAGS@ XLIBS = @XLIBS@ XGLOCKLIBS = @XGLOCKLIBS@ #If you have purify, and want to use it, uncomment this definition or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/xlock/passwd.c new/xlockmore-5.68/xlock/passwd.c --- old/xlockmore-5.67/xlock/passwd.c 2020-04-04 17:51:58.000000000 +0200 +++ new/xlockmore-5.68/xlock/passwd.c 2021-12-14 04:06:35.000000000 +0100 @@ -302,8 +302,8 @@ #define COPY_STRING(s) (s) ? strdup(s) : NULL - reply = (struct pam_response *) malloc(sizeof (struct pam_response) * - num_msg); + reply = (struct pam_response *) calloc(num_msg, + sizeof (struct pam_response)); /* * reply[] members is not initialized! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/xlock/version.h new/xlockmore-5.68/xlock/version.h --- old/xlockmore-5.67/xlock/version.h 2021-08-30 01:54:04.000000000 +0200 +++ new/xlockmore-5.68/xlock/version.h 2021-12-20 01:54:00.000000000 +0100 @@ -1,6 +1,6 @@ #ifndef _version_h #define _version_h -#define VERSION "5.67" +#define VERSION "5.68" #endif /* _version_h */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/xlockmore.spec new/xlockmore-5.68/xlockmore.spec --- old/xlockmore-5.67/xlockmore.spec 2021-08-30 01:53:36.000000000 +0200 +++ new/xlockmore-5.68/xlockmore.spec 2021-12-20 01:43:47.000000000 +0100 @@ -19,7 +19,7 @@ # https://www.sillycycle.com/xlockmore.html %define name xlockmore -%define stableversion 5.67 +%define stableversion 5.68 %define release 1 %define serial 1 # Comment quality for stable release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/xmlock/Makefile.in new/xlockmore-5.68/xmlock/Makefile.in --- old/xlockmore-5.67/xmlock/Makefile.in 2020-10-05 04:48:56.000000000 +0200 +++ new/xlockmore-5.68/xmlock/Makefile.in 2021-12-14 15:53:16.000000000 +0100 @@ -95,7 +95,7 @@ CFLAGS = @CFLAGS@ #CFLAGS = -O #CFLAGS = -g -XMLOCKLDFLAGS = @XMLOCKLDFLAGS@ +XMLOCKLDFLAGS = @XMLOCKLDFLAGS@ @LDFLAGS@ XLIBS = @XLIBS@ XMLOCKLIBS = @XMLOCKLIBS@ #If you have purify, and want to use it, uncomment this definition or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xlockmore-5.67/xscreensaver/README new/xlockmore-5.68/xscreensaver/README --- old/xlockmore-5.67/xscreensaver/README 2021-07-26 22:32:53.000000000 +0200 +++ new/xlockmore-5.68/xscreensaver/README 2021-12-10 23:29:45.000000000 +0100 @@ -1,5 +1,5 @@ # Previously written for xscreensaver-2.17 and xscreensaver-5.10. -Currently this is for getting xlockmore modes running in xscreensaver-6.01. +Currently this is for getting xlockmore modes running in xscreensaver-6.02. First figure out how to compile xscreensaver without my changes. For me I had to do this: @@ -11,17 +11,12 @@ (previously had trouble with: libglade-2.0 not found... no demo it warns and no jpeg) Then... with a "make -f Makefile.in disclean" copy of latest code, say its xlockmore-5.67 - cp -rp xlockmore-5.67 xsreensaver-6.01/xlockmore - cd xsreensaver-6.01 - edit configure.ac (previously configure.in) replace -for d in utils jwxyz hacks hacks/glx driver ; do -for d in utils jwxyz hacks xlockmore/xlock xlockmore/modes xlockmore/modes/glx hacks/glx driver; do - similar for AC_OUTPUT add these 2 lines after hacks/Makefile in AC_CONFIG_FILES (or AC_OUTPUT) - xlockmore/xlock/Makefile - xlockmore/modes/Makefile - xlockmore/modes/glx/Makefile - - autoconf + cp -rp xlockmore-5.67 xsreensaver-6.02/xlockmore + cd xsreensaver-6.02 + # edit configure.ac (previously configure.in) replace + sed -i 's#utils jwxyz hacks hacks/glx driver#utils jwxyz hacks xlockmore/xlock xlockmore/modes xlockmore/modes/glx hacks/glx driver#' + sed -i 's#hacks/Makefile#hacks/Makefile\n xlockmore/xlock/Makefile\n xlockmore/modes/Makefile\n xlockmore/modes/glx/Makefile#' configure.ac + autoconf (I made copies configure.ac and configure in this directory, but may go out of date) cd xlockmore/xlock mv Makefile.inxs Makefile.in @@ -38,6 +33,7 @@ # I had to add -lpng16 to the end of HACK_POST in many Makefiles (hacks/Makefile)) make + # for me this ends with a fatal error for X11/extensions/XInput2.h cd hacks cp -p xlockmore.h xlockmore.h.orig cp -p xlockmoreI.h xlockmoreI.h.orig @@ -45,14 +41,15 @@ cp ../xlockmore/xscreensaver/xlockmore.h . # just edited to add common.h, stuff Jamie forgot about I guess cp ../xlockmore/xscreensaver/xlockmoreI.h . # small edit for recursion_depth cp ../xlockmore/xscreensaver/xlockmore.c . # small edit for blank mode for the completionist - make xlockmore.o # a few warnings + make xlockmore.o cd glx make # fails so needed -lpng16 also (< 5.45) cd ../../xlockmore/xlock make -# gives a few warnings about iostuff +# gives a few warnings about fgets in iostuff.c cd ../modes make +# gives a few warnings about kill, wait, geoms_buf in run.c # New automata.c and automata.h supplied and all automata modes should use this. # (Makefile.inxs modified to use this version already rather than the one in xscreensaver.) cd glx
