--- a/open-src/app/rss-glx/Copyright-notices Wed Jun 03 21:14:14 2009 -0700
+++ b/open-src/app/rss-glx/Copyright-notices Thu Jun 04 19:53:51 2009 -0700
@@ -16,54 +16,6 @@
------------------------------------------------------------------------------
-The colorfire hack is covered by the following notice:
-
-Copyright (c) 1999 by Andreas Gustafsson and Tugrul Galatali.
-
-Colorfire 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.
-
-Colorfire 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.
-
-------------------------------------------------------------------------------
-
-The hufo_smoke hack is covered by the following notice:
-
-Copyright (c) 2000 by Jeremie Allard and Tugrul Galatali.
-Copyright (C) 2002 Jeremie Allard (Hufo / N.A.A.)
-
-hufo_smoke 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.
-
-hufo_smoke 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.
-
-------------------------------------------------------------------------------
-
-The hufo_tunnel hack is covered by the following notice:
-
-Copyright (c) 2000 by Jeremie Allard and Tugrul Galatali.
-Copyright (C) 2002 Andreas Gustafsson
-Copyright (C) 2002 Jeremie Allard (Hufo / N.A.A.)
-
-hufo_tunnel 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.
-
-hufo_tunnel 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.
-
-------------------------------------------------------------------------------
-
The biof hack is covered by the following notice:
Copyright (c) 2002 by <[email protected]> and Tugrul Galatali.
@@ -94,49 +46,57 @@
------------------------------------------------------------------------------
-The matrixview hack is covered by the following notice:
+The colorfire hack is covered by the following notice:
-Copyright (c) 2003 by Alex Zolotov and Tugrul Galatali.
+Copyright (c) 1999 by Andreas Gustafsson and Tugrul Galatali.
-MatrixView is free software; you can redistribute it and/or modify
+Colorfire 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.
-MatrixView is distributed in the hope that it will be useful,
+Colorfire 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.
------------------------------------------------------------------------------
-The spirographx hack is covered by the following notice:
+The cyclone hack is covered by the following notice:
-Copyright (c) 2003 by Holmes Futrell and Tugrul Galatali.
+Copyright (c) 2002 by Terry Walsh and Tugrul Galatali.
-SpirographX is free software; you can redistribute it and/or modify
+Cyclone 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.
-SpirographX is distributed in the hope that it will be useful,
+Cyclone 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.
------------------------------------------------------------------------------
-The sundancer2 hack is covered by the following notice:
+The drempels hack is covered by the following notice:
-Copyright (c) 2002 by Dirk Songuer and Tugrul Galatali.
+Copyright (C) 2001 Ryan M. Geiss <guava at geissworks dot com>
+Ported to Linux by Tugrul Galatali <[email protected]>
+Copyright (C) 2009 Tugrul Galatali <[email protected]>
+Copyright � 2003-2005, Stefan Gustavson <[email protected]>
-Sundancer2 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.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-Sundancer2 is distributed in the hope that it will be useful,
+This program 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
+
------------------------------------------------------------------------------
The euphoria hack is covered by the following notice:
@@ -154,33 +114,24 @@
------------------------------------------------------------------------------
-The lattice hack is covered by the following notice:
+The feedback hack is covered by the following notice:
-Copyright (c) 2002 by Terry Walsh and Tugrul Galatali.
+Copyright (C) 2009 Tugrul Galatali <[email protected]
-Lattice 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.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-Lattice is distributed in the hope that it will be useful,
+This program 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.
-------------------------------------------------------------------------------
-
-The cyclone hack is covered by the following notice:
-
-Copyright (c) 2002 by Terry Walsh and Tugrul Galatali.
+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
-Cyclone 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.
-
-Cyclone 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.
------------------------------------------------------------------------------
@@ -244,6 +195,39 @@
------------------------------------------------------------------------------
+The hufo_smoke hack is covered by the following notice:
+
+Copyright (c) 2000 by Jeremie Allard and Tugrul Galatali.
+Copyright (C) 2002 Jeremie Allard (Hufo / N.A.A.)
+
+hufo_smoke 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.
+
+hufo_smoke 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.
+
+------------------------------------------------------------------------------
+
+The hufo_tunnel hack is covered by the following notice:
+
+Copyright (c) 2000 by Jeremie Allard and Tugrul Galatali.
+Copyright (C) 2002 Andreas Gustafsson
+Copyright (C) 2002 Jeremie Allard (Hufo / N.A.A.)
+
+hufo_tunnel 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.
+
+hufo_tunnel 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.
+
+------------------------------------------------------------------------------
+
The hyperspace hack is covered by the following notice:
Copyright (c) 2005 by Terry Walsh and Tugrul Galatali.
@@ -259,6 +243,52 @@
------------------------------------------------------------------------------
+The lattice hack is covered by the following notice:
+
+Copyright (c) 2002 by Terry Walsh and Tugrul Galatali.
+
+Lattice 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.
+
+Lattice 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.
+
+------------------------------------------------------------------------------
+
+The lorenz hack is covered by the following notice:
+
+Copyright (C) 2002, 2009 S?ren Sonnenburg <[email protected]>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program 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.
+
+------------------------------------------------------------------------------
+
+The matrixview hack is covered by the following notice:
+
+Copyright (c) 2003 by Alex Zolotov and Tugrul Galatali.
+
+MatrixView 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.
+
+MatrixView 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.
+
+------------------------------------------------------------------------------
+
The plasma hack is covered by the following notice:
Copyright (c) 2002 by Terry Walsh and Tugrul Galatali.
@@ -304,16 +334,30 @@
------------------------------------------------------------------------------
-The lorenz hack is covered by the following notice:
+The spirographx hack is covered by the following notice:
+
+Copyright (c) 2003 by Holmes Futrell and Tugrul Galatali.
-Copyright (C) 2002, 2009 S?ren Sonnenburg <[email protected]>
+SpirographX 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.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+SpirographX 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.
+
+------------------------------------------------------------------------------
-This program is distributed in the hope that it will be useful,
+The sundancer2 hack is covered by the following notice:
+
+Copyright (c) 2002 by Dirk Songuer and Tugrul Galatali.
+
+Sundancer2 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.
+
+Sundancer2 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.
--- a/open-src/app/rss-glx/Makefile Wed Jun 03 21:14:14 2009 -0700
+++ b/open-src/app/rss-glx/Makefile Thu Jun 04 19:53:51 2009 -0700
@@ -30,14 +30,14 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 09/04/16
+# @(#)Makefile 1.5 09/06/04
#
# Package name used in tarballs
MODULE_NAME=rss-glx
# Version number (used in path names)
-MODULE_VERSION=0.8.3
+MODULE_VERSION=0.9.0
# Source tarball/directory name - uses _ instead of default -
SOURCE_DIRNAME=$(MODULE_NAME)_$(MODULE_VERSION)
@@ -49,17 +49,11 @@
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES = \
- pkg-config.patch \
matrixview.patch \
- install-util.patch \
- cflags.patch \
- kde-config.patch \
- lorenz.patch,-p1 \
- sincosf.patch \
- sun-cxx.patch
+ install-util.patch
# Man pages to apply Sun footer to & attributes to list
-SUNTOUCHED_MANPAGES=*src/*.1 reallyslick/*src/*.1
+SUNTOUCHED_MANPAGES=*src/*.1
SUN_PACKAGE=SUNWxscreensaver-hacks-gl
MODULE_STABILITY=Volatile
MODULE_SUNTOUCH_MAN_FLAGS= -p $(XSS_DIR)/hacks/
@@ -81,12 +75,11 @@
include ../Makefile.inc
-# Regen configure script after changing configure.in in several patches
-AUTORECONF=yes
-
# Need to fix libtool interference with our linker flags
DELIBTOOLIZE=yes
+MODULE_CPPFLAGS=-D_FILE_OFFSET_BITS=64
+
MODULE_CONFIG_OPTS= --disable-sound \
--bindir='$$(prefix)/hacks' --mandir=$(X11_DIR)/share/man \
--with-configdir=$(XSS_DIR)/config/control-center-2.0
@@ -96,15 +89,15 @@
# Clear pictures we don't want in build
source_gen::
- rm $(SOURCE_DIR)/other_src/matrixview_textures/cpics
- touch $(SOURCE_DIR)/other_src/matrixview_textures/cpics
+ rm $(SOURCE_DIR)/src/matrixview_textures/cpics
+ touch $(SOURCE_DIR)/src/matrixview_textures/cpics
# XScreenSaver app-defaults file
XSS_AD=$(PROTODIR)$(X11_DIR)/lib/X11/app-defaults/XScreenSaver
$(XSS_AD):
(cd ../xscreensaver ; $(MAKE) $(MAKEFLAGS) install)
-install_gen:: $(RSS_GLX_BIN) $(XSS_AD)
+install_gen:: $(XSS_AD)
$(PROTODIR)$(XSS_DIR)/hacks/rss-glx_install.pl $(XSS_AD)
mkdir -p $(PROTODIR)$(X11_DIR)/share/man/man6
-case '$(MAKEFLAGS)' in *[ik]*) set +e;; esac;
--- a/open-src/app/rss-glx/cflags.patch Wed Jun 03 21:14:14 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-Don't try to set gcc/g++ flags for non-GNU compilers.
-
-Submitted upstream at:
-https://sourceforge.net/tracker/?func=detail&atid=517001&aid=2767126&group_id=67131
-
-diff -urp -x '*~' -x '*.orig' configure.in configure.in
---- configure.in 2009-04-15 16:27:40.888792000 -0700
-+++ configure.in 2009-04-15 16:27:43.635906000 -0700
-@@ -9,19 +9,27 @@ AC_PROG_AWK
- AC_PROG_CC
- AC_GNU_SOURCE
-
--CFLAGS=-O2
-+if test "x$GCC" = xyes; then
-+ CFLAGS="-O2"
-+fi
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
- [build with debugging information default=no])],
- [test "$enableval" = "yes" && CFLAGS="-g"])
--CFLAGS="$CFLAGS -Wall"
-+if test "x$GCC" = xyes; then
-+ CFLAGS="$CFLAGS -Wall"
-+fi
-
- AC_PROG_CXX
-
--CXXFLAGS=-O2
-+if test "x$GXX" = xyes; then
-+ CXXFLAGS="-O2"
-+fi
- AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
- [build with debugging information default=no])],
- [test "$enableval" = "yes" && CXXFLAGS="-g"])
--CXXFLAGS="$CXXFLAGS -Wall"
-+if test "x$GXX" = xyes; then
-+ CXXFLAGS="$CXXFLAGS -Wall"
-+fi
-
- AC_PROG_INSTALL
- AM_DISABLE_SHARED
--- a/open-src/app/rss-glx/install-util.patch Wed Jun 03 21:14:14 2009 -0700
+++ b/open-src/app/rss-glx/install-util.patch Thu Jun 04 19:53:51 2009 -0700
@@ -1,6 +1,6 @@
diff -urp -x '*~' -x '*.orig' utils/rss-glx_install.pl utils/rss-glx_install.pl
---- utils/rss-glx_install.pl 2009-04-15 17:30:13.075036000 -0700
-+++ utils/rss-glx_install.pl 2009-04-15 17:30:15.087953000 -0700
+--- utils/rss-glx_install.pl 2009-05-20 20:16:33.348436000 -0700
++++ utils/rss-glx_install.pl 2009-05-20 20:16:36.684360000 -0700
@@ -1,10 +1,10 @@
#!/usr/bin/env perl
use strict;
@@ -16,9 +16,9 @@
my $screensavers = { };
-@@ -29,15 +29,15 @@ $screensavers->{'spirographx'} = ' GL:
- $screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root -i /usr/share/pixmaps/faces \\n\\';
- $screensavers->{'lorenz'} = ' GL: "Lorenz" lorenz --root \\n\\';
+@@ -31,15 +31,15 @@ $screensavers->{'lorenz'} = ' GL:
+ $screensavers->{'drempels'} = ' GL: "Drempels" drempels --root \\n\\';
+ $screensavers->{'feedback'} = ' GL: "Feedback" feedback --root \\n\\';
-open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver";
+open XSCREENSAVER, "$ARGV[0]";
--- a/open-src/app/rss-glx/kde-config.patch Wed Jun 03 21:14:14 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-Don't install KDE config files if configure didn't find a place for them
-
-Submitted upstream at:
-https://sourceforge.net/tracker/?func=detail&aid=2767142&group_id=67131&atid=517001
-
-diff -urp -x '*~' -x '*.orig' reallyslick/cpp_src/Makefile.am reallyslick/cpp_src/Makefile.am
---- reallyslick/cpp_src/Makefile.am 2008-08-31 18:22:00.000000000 -0700
-+++ reallyslick/cpp_src/Makefile.am 2009-04-15 16:27:45.972615000 -0700
-@@ -20,7 +20,7 @@ if INSTALL_XSCREENSAVER_CONFIG_FILES
- dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml
- endif
-
--if INSTALL_XSCREENSAVER_CONFIG_FILES
-+if INSTALL_KDE_CONFIG_FILES
- dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop
- endif
-
--- a/open-src/app/rss-glx/lorenz.patch Wed Jun 03 21:14:14 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-Make lorenz build on Solaris by renaming time variable to avoid conflict
-with time() function defined in system headers.
-
-Fixes compiler errors:
-"lorenz.cpp", line 68: Error: Multiple declaration for time.
-"lorenz.cpp", line 245: Error: Formal argument t of type float in call to coords_
-at_time(float*, float, float*, float*, float*) is being passed extern "C" long(*)
-(long*).
-"lorenz.cpp", line 246: Error: The operation "extern "C" long(*)(long*) + int" is
- illegal.
-"lorenz.cpp", line 247: Error: The operation "extern "C" long(*)(long*) + int" is
- illegal.
-"lorenz.cpp", line 304: Error: The operation "extern "C" long(*)(long*) + int" is
- illegal.
-"lorenz.cpp", line 305: Error: The operation "extern "C" long(*)(long*) + int" is
- illegal.
-"lorenz.cpp", line 488: Error: The operand "time" cannot be assigned to.
-"lorenz.cpp", line 546: Error: The operand "*time" cannot be assigned to.
-
-Submitted upstream at:
-https://sourceforge.net/tracker/?func=detail&aid=2767289&group_id=67131&atid=517001
-
---- rss-glx_0.8.3/other_src/lorenz.cpp 2009-04-12 18:15:01.000000000 -0700
-+++ rss-glx_0.8.3/other_src/lorenz.cpp 2009-04-15 18:04:25.480328000 -0700
-@@ -65,7 +65,7 @@
- static float camera_angle_anim[2] = {5, 179};
- static float camera_angle_anim_speed=0.1;
- static float mean[3] = { 0, 0, 0 };
--static float time;
-+static float time_n;
- static float lastn0 = 0;
- static float flipn0 = 1;
- static float deltaflipn0 = 0;
-@@ -242,9 +242,9 @@
- glMatrixMode (GL_MODELVIEW);
- glLoadIdentity ();
-
-- coords_at_time(lorenz_coords, time, &p1[0], &p1[1], &p1[2]);
-- coords_at_time(lorenz_coords, time+10,&p2[0], &p2[1], &p2[2]);
-- coords_at_time(lorenz_coords, time+15,&p3[0], &p3[1], &p3[2]);
-+ coords_at_time(lorenz_coords, time_n, &p1[0], &p1[1], &p1[2]);
-+ coords_at_time(lorenz_coords, time_n+10,&p2[0], &p2[1], &p2[2]);
-+ coords_at_time(lorenz_coords, time_n+15,&p3[0], &p3[1], &p3[2]);
-
- calc_normal(p1[0], p1[1], p1[2],
- p2[0], p2[1], p2[2],
-@@ -301,8 +301,8 @@
- p2[0], p2[1], p2[2],
- n[0],n[1],n[2]);
-
-- coords_at_time(lorenz_coords, time+10,&p2[0], &p2[1], &p2[2]);
-- coords_at_time(lorenz_coords, time+2, &p3[0], &p3[1], &p3[2]);
-+ coords_at_time(lorenz_coords, time_n+10,&p2[0], &p2[1], &p2[2]);
-+ coords_at_time(lorenz_coords, time_n+2, &p3[0], &p3[1], &p3[2]);
-
- //set light
- GLfloat light_position0[] = { p2[0]+n[0], p2[1]+n[1], p2[2]+n[2], 1.0 };
-@@ -485,7 +485,7 @@
- set_camera();
- display();
-
-- time+=37*elapsedTime*camera_speed*num_points/num_precomputed_points;
-+ time_n+=37*elapsedTime*camera_speed*num_points/num_precomputed_points;
-
- camera_angle+=37*elapsedTime*camera_angle_anim_speed;
- if (camera_angle<camera_angle_anim[0] || camera_angle>camera_angle_anim[1])
-@@ -543,7 +543,7 @@
- #ifdef DEBUG
- printf("hack_init\n");
- #endif
-- time=num_points/3;
-+ time_n=num_points/3;
- precompute_lorenz_array();
- reduce_points(num_points_max);
- init_satellites();
--- a/open-src/app/rss-glx/matrixview.patch Wed Jun 03 21:14:14 2009 -0700
+++ b/open-src/app/rss-glx/matrixview.patch Thu Jun 04 19:53:51 2009 -0700
@@ -1,29 +1,9 @@
-diff -urp -x '*~' -x '*.orig' configure.in configure.in
---- configure.in 2009-04-15 17:30:11.192993000 -0700
-+++ configure.in 2009-04-15 17:30:13.073412000 -0700
-@@ -48,6 +48,7 @@ LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA
- AC_C_CONST
- AC_C_INLINE
- AC_HEADER_TIME
-+AC_SYS_LARGEFILE
-
- # Checks for library functions.
- AC_CHECK_FUNCS(getopt,,AC_MSG_ERROR([getopt is missing but required.]))
-diff -urp -x '*~' -x '*.orig' other_src/matrixview.c other_src/matrixview.c
---- other_src/matrixview.c 2006-02-25 13:55:26.000000000 -0800
-+++ other_src/matrixview.c 2009-04-15 17:30:13.074216000 -0700
-@@ -18,6 +18,8 @@
-
- // MatrixView screen saver
-
-+#include "config.h"
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
+Replace the removed default images for matrixview screensaver
+with those found in /usr/share/pixmaps/faces
+
diff -urp -x '*~' -x '*.orig' utils/rss-glx_install.pl utils/rss-glx_install.pl
---- utils/rss-glx_install.pl 2009-04-13 11:31:12.000000000 -0700
-+++ utils/rss-glx_install.pl 2009-04-15 17:30:13.075036000 -0700
+--- utils/rss-glx_install.pl 2009-05-19 07:36:29.000000000 -0700
++++ utils/rss-glx_install.pl 2009-05-20 20:16:33.348436000 -0700
@@ -26,7 +26,7 @@ $screensavers->{'sundancer2'} = ' GL:
$screensavers->{'biof'} = ' GL: "BioF" biof --root \\n\\';
$screensavers->{'busyspheres'} = ' GL: "BusySpheres" busyspheres --root \\n\\';
@@ -31,5 +11,5 @@
-$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root \\n\\';
+$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root -i /usr/share/pixmaps/faces \\n\\';
$screensavers->{'lorenz'} = ' GL: "Lorenz" lorenz --root \\n\\';
-
- open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver";
+ $screensavers->{'drempels'} = ' GL: "Drempels" drempels --root \\n\\';
+ $screensavers->{'feedback'} = ' GL: "Feedback" feedback --root \\n\\';
--- a/open-src/app/rss-glx/pkg-config.patch Wed Jun 03 21:14:14 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-When the configure script is run with --disable-sound, it fails with:
-
-checking for Wand... configure: error: The pkg-config script could not
-be found or is too old. Make sure it is in your PATH or set the
-PKG_CONFIG environment variable to the full path to pkg-config.
-
-This is because the first use of the PKG_CHECK_MODULES macro in
-configure.in is in the
-if test "x$enable_sound" != "xno"
-section, so is skipped if --disable-sound is given, causing the
-pkg-config variables to not be initialized.
-
-The pkg-config documentation warns about this and offers a fix:
-
-Note that if there is a possibility the first call to
-PKG_CHECK_MODULES might not happen, you should be sure to
-include an explicit call to PKG_PROG_PKG_CONFIG in your
-configure.ac
-
-PKG_PROG_PKG_CONFIG([minversion])
-
-Submitted upstream at:
-https://sourceforge.net/tracker/?func=detail&aid=2767166&group_id=67131&atid=517001
-
-diff -urp -x '*~' -x '*.orig' configure.in configure.in
---- configure.in 2009-04-13 07:12:07.000000000 -0700
-+++ configure.in 2009-04-15 17:30:11.192993000 -0700
-@@ -27,6 +27,7 @@ AC_PROG_INSTALL
- AM_DISABLE_SHARED
- AC_PROG_LIBTOOL
- AC_PROG_LN_S
-+PKG_PROG_PKG_CONFIG
-
- # Checks for libraries.
- AC_CHECK_LIB([m], [pow],,AC_MSG_ERROR(-lm was not found but required.))
--- a/open-src/app/rss-glx/sincosf.patch Wed Jun 03 21:14:14 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-The sincosf() function used by spirographx if _GNU_SOURCE is defined
-is also available on Solaris & OpenSolaris & several other platforms,
-not just Linux.
-
-The following patch converts to using a generic autoconf test for the
-function to enable its usage.
-
-Submitted upstream at:
-https://sourceforge.net/tracker/?func=detail&aid=2767432&group_id=67131&atid=517001
-
-diff -urp -x '*~' -x '*.orig' configure.in configure.in
---- configure.in 2009-04-15 20:14:25.995784000 -0700
-+++ configure.in 2009-04-15 20:14:28.005153000 -0700
-@@ -7,7 +7,7 @@ AM_CONFIG_HEADER(config.h)
- AC_PROG_AWK
-
- AC_PROG_CC
--AC_GNU_SOURCE
-+AC_USE_SYSTEM_EXTENSIONS
-
- if test "x$GCC" = xyes; then
- CFLAGS="-O2"
-@@ -39,6 +39,7 @@ PKG_PROG_PKG_CONFIG
-
- # Checks for libraries.
- AC_CHECK_LIB([m], [pow],,AC_MSG_ERROR(-lm was not found but required.))
-+AC_CHECK_FUNCS([sincosf])
- AC_ARG_ENABLE(bzip2, [ --disable-bzip2 Don't compress textures/audio with bzip2.])
- if test "x$enable_bzip2" != "xno" ; then
- AC_CHECK_LIB([bz2], [BZ2_bzBuffToBuffCompress], AC_SUBST(BZIP2, -lbz2) AC_DEFINE([HAVE_LIBBZ2], [], [libbz2 exists.]))
-diff -urp -x '*~' -x '*.orig' other_src/spirographx.c other_src/spirographx.c
---- other_src/spirographx.c 2008-08-31 18:36:48.000000000 -0700
-+++ other_src/spirographx.c 2009-04-15 20:14:28.006027000 -0700
-@@ -94,7 +94,7 @@ void getAll ()
- const float moverd = (float)m / DETAIL;
- for (n = 0; n < SUBLOOPS; n++) {
- const float pointpoweroverdetail = moverd * poweranswer[n];
--#ifdef _GNU_SOURCE
-+#ifdef HAVE_SINCOSF
- float sinppod, cosppod;
- sincosf(pointpoweroverdetail, &sinppod, &cosppod);
- #else
--- a/open-src/app/rss-glx/sun-cxx.patch Wed Jun 03 21:14:14 2009 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-The Sun C++ compiler reports errors building hufo-smoke:
-
-"FirePart.h", line 125: Error: Overloading ambiguity between "std::pow(double, double)" and "std::pow(float, float)".
-"FirePart.h", line 165: Error: Overloading ambiguity between "std::pow(double, double)" and "std::pow(float, float)".
-
-Defining the FIREDA constant as a float instead of a double resolves this
-by making both arguments to the function be float, instead of one float
-and one double.
-
-Submitted upstream at:
-https://sourceforge.net/tracker/?func=detail&aid=2767450&group_id=67131&atid=517001
-
-diff -urp -x '*~' -x '*.orig' oglc_src/FirePart.h oglc_src/FirePart.h
---- oglc_src/FirePart.h 2005-04-09 10:50:18.000000000 -0700
-+++ oglc_src/FirePart.h 2009-04-15 16:27:48.137837000 -0700
-@@ -60,7 +60,7 @@ double nrnd (double d) // normal distri
- #define FIRESIZE 1.0f
- #define FIREDS 0.7
- #define FIREALPHA 0.15f
--#define FIREDA 0.4
-+#define FIREDA 0.4f
- #define FIRECYLR 0.2f
-
- struct Particle {
--- a/packages/SUNWxscreensaver-hacks-gl/prototype_com Wed Jun 03 21:14:14 2009 -0700
+++ b/packages/SUNWxscreensaver-hacks-gl/prototype_com Thu Jun 04 19:53:51 2009 -0700
@@ -27,7 +27,7 @@
# of the copyright holder.
#
#
-# ident "@(#)prototype_com 1.8 09/04/16 SMI"
+# ident "@(#)prototype_com 1.9 09/06/04 SMI"
#
i pkginfo
@@ -123,7 +123,9 @@
f none X11/lib/xscreensaver/hacks/busyspheres 0555 root bin
f none X11/lib/xscreensaver/hacks/colorfire 0555 root bin
f none X11/lib/xscreensaver/hacks/cyclone 0555 root bin
+f none X11/lib/xscreensaver/hacks/drempels 0555 root bin
f none X11/lib/xscreensaver/hacks/euphoria 0555 root bin
+f none X11/lib/xscreensaver/hacks/feedback 0555 root bin
f none X11/lib/xscreensaver/hacks/fieldlines 0555 root bin
f none X11/lib/xscreensaver/hacks/flocks 0555 root bin
f none X11/lib/xscreensaver/hacks/flux 0555 root bin
@@ -224,13 +226,16 @@
f none X11/share/man/man6/busyspheres.6 0444 root bin
f none X11/share/man/man6/colorfire.6 0444 root bin
f none X11/share/man/man6/cyclone.6 0444 root bin
+f none X11/share/man/man6/drempels.6 0444 root bin
f none X11/share/man/man6/euphoria.6 0444 root bin
+f none X11/share/man/man6/feedback.6 0444 root bin
f none X11/share/man/man6/fieldlines.6 0444 root bin
f none X11/share/man/man6/flocks.6 0444 root bin
f none X11/share/man/man6/flux.6 0444 root bin
f none X11/share/man/man6/helios.6 0444 root bin
f none X11/share/man/man6/hufo_smoke.6 0444 root bin
f none X11/share/man/man6/hufo_tunnel.6 0444 root bin
+f none X11/share/man/man6/hyperspace.6 0444 root bin
f none X11/share/man/man6/lattice.6 0444 root bin
f none X11/share/man/man6/lorenz.6 0444 root bin
f none X11/share/man/man6/matrixview.6 0444 root bin
@@ -323,7 +328,9 @@
f none X11/lib/xscreensaver/config/control-center-2.0/busyspheres.xml 0444 root bin
f none X11/lib/xscreensaver/config/control-center-2.0/colorfire.xml 0444 root bin
f none X11/lib/xscreensaver/config/control-center-2.0/cyclone.xml 0444 root bin
+f none X11/lib/xscreensaver/config/control-center-2.0/drempels.xml 0444 root bin
f none X11/lib/xscreensaver/config/control-center-2.0/euphoria.xml 0444 root bin
+f none X11/lib/xscreensaver/config/control-center-2.0/feedback.xml 0444 root bin
f none X11/lib/xscreensaver/config/control-center-2.0/fieldlines.xml 0444 root bin
f none X11/lib/xscreensaver/config/control-center-2.0/flocks.xml 0444 root bin
f none X11/lib/xscreensaver/config/control-center-2.0/flux.xml 0444 root bin