diff --git a/.gitignore b/.gitignore
index 34d7f57..41d8299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@ rss-glx_0.8.1.p.tar.bz2
rss-glx_0.8.2.p.tar.bz2
rss-glx_0.9.0.p.tar.bz2
rss-glx_0.9.1.p.tar.bz2
-/rss-glx-0.9.1.p-6-autoreconf.patch.bz2
diff --git a/rss-glx-0.9.1.p-autoreconf.patch b/rss-glx-0.9.1.p-autoreconf.patch
new file mode 100644
index 0000000..591269e
--- /dev/null
+++ b/rss-glx-0.9.1.p-autoreconf.patch
@@ -0,0 +1,177 @@
+diff -up rss-glx_0.9.1.p/configure.autoreconf rss-glx_0.9.1.p/configure
+--- rss-glx_0.9.1.p/configure.autoreconf 2010-01-18 12:52:02.000000000 +0100
++++ rss-glx_0.9.1.p/configure 2010-01-26 16:19:16.475525018 +0100
+@@ -5362,6 +5362,7 @@ $as_echo "$as_me: error: unknown endiann
+ esac
+
+
++if test "x$CFLAGS" = x; then
+ if test "x$GCC" = xyes; then
+ CFLAGS="-O2"
+ fi
+@@ -5370,6 +5371,7 @@ if test "${enable_debug+set}" = set; the
+ enableval=$enable_debug; test "$enableval" = "yes" && CFLAGS="-g"
+ fi
+
++fi
+ if test "x$GCC" = xyes; then
+ CFLAGS="$CFLAGS -Wall"
+ fi
+@@ -5874,6 +5876,7 @@ fi
+
+
+
++if test "x$CXXFLAGS" = x; then
+ if test "x$GXX" = xyes; then
+ CXXFLAGS="-O2"
+ fi
+@@ -5882,6 +5885,7 @@ if test "${enable_debug+set}" = set; the
+ enableval=$enable_debug; test "$enableval" = "yes" && CXXFLAGS="-g"
+ fi
+
++fi
+ if test "x$GXX" = xyes; then
+ CXXFLAGS="$CXXFLAGS -Wall"
+ fi
+@@ -6578,13 +6582,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6581: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6585: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6584: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6587: output\"" >&5)
++ (eval echo "\"\$as_me:6591: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -7789,7 +7793,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7792 "configure"' > conftest.$ac_ext
++ echo '#line 7796 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9862,11 +9866,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9869: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9869: \$? = $ac_status" >&5
++ echo "$as_me:9873: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -10201,11 +10205,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10204: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10208: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10208: \$? = $ac_status" >&5
++ echo "$as_me:10212: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -10306,11 +10310,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10309: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10313: \$? = $ac_status" >&5
++ echo "$as_me:10317: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -10361,11 +10365,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10364: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10368: \$? = $ac_status" >&5
++ echo "$as_me:10372: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -13164,7 +13168,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 13167 "configure"
++#line 13171 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -13260,7 +13264,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 13263 "configure"
++#line 13267 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -15280,11 +15284,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:15287: \$? = $ac_status" >&5
++ echo "$as_me:15291: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -15379,11 +15383,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15386: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15386: \$? = $ac_status" >&5
++ echo "$as_me:15390: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -15431,11 +15435,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15438: \$? = $ac_status" >&5
++ echo "$as_me:15442: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
diff --git a/rss-glx-0.9.1.p-linker.patch b/rss-glx-0.9.1.p-linker.patch
index cd5b8ce..d195d98 100644
--- a/rss-glx-0.9.1.p-linker.patch
+++ b/rss-glx-0.9.1.p-linker.patch
@@ -1,12 +1,31 @@
-diff -ru rss-glx_0.9.1.p.orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
---- rss-glx_0.9.1.p.orig/src/Makefile.in.linker 2018-08-31 15:13:51.668365086 +0200
-+++ rss-glx_0.9.1.p/src/Makefile.in 2018-08-31 15:16:21.985747074 +0200
-@@ -446,7 +446,7 @@
- lorenz_LDADD = -LrsMath -lrsMath
+diff -ru rss-glx_0.9.1.p.orig/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
+--- rss-glx_0.9.1.p.orig/src/Makefile.am 2010-04-11 14:03:33.000000000 +0100
++++ rss-glx_0.9.1.p/src/Makefile.am 2010-04-11 18:29:45.000000000 +0100
+@@ -36,6 +36,7 @@
plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
pixelcity_SOURCES = driver.c
--pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
-+pixelcity_LDADD = -LPixelCity -lPixelCity @quesoglc_LIBS@
- pixelcity_LINK = $(CXXLINK)
+ pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LINK = $(CXXLINK)
skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
+ spirographx_SOURCES = driver.c spirographx.c
+diff -ru rss-glx_0.9.1.p.orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
+--- rss-glx_0.9.1.p.orig/src/Makefile.in 2010-04-11 14:03:33.000000000 +0100
++++ rss-glx_0.9.1.p/src/Makefile.in 2010-04-11 18:29:52.000000000 +0100
+@@ -446,6 +446,7 @@
+ plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
+ pixelcity_SOURCES = driver.c
+ pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LINK = $(CXXLINK)
+ skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
+ solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
+ spirographx_SOURCES = driver.c spirographx.c
+@@ -599,7 +600,7 @@
+ $(CXXLINK) $(lorenz_OBJECTS) $(lorenz_LDADD) $(LIBS)
+ pixelcity$(EXEEXT): $(pixelcity_OBJECTS) $(pixelcity_DEPENDENCIES)
+ @rm -f pixelcity$(EXEEXT)
+- $(LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
++ $(pixelcity_LINK) $(pixelcity_OBJECTS) $(pixelcity_LDADD) $(LIBS)
+ plasma$(EXEEXT): $(plasma_OBJECTS) $(plasma_DEPENDENCIES)
+ @rm -f plasma$(EXEEXT)
+ $(CXXLINK) $(plasma_OBJECTS) $(plasma_LDADD) $(LIBS)
diff --git a/rss-glx-0.9.1.p-pixelcity.patch b/rss-glx-0.9.1.p-pixelcity.patch
deleted file mode 100644
index c036914..0000000
--- a/rss-glx-0.9.1.p-pixelcity.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rss-glx_0.9.1.p.orig/src/PixelCity/Mesh.cpp 2010-01-04 04:12:24.000000000 +0100
-+++ rss-glx_0.9.1.p/src/PixelCity/Mesh.cpp 2020-05-16 15:22:13.288970473 +0200
-@@ -118,7 +118,7 @@
- }
- for (qsi = _quad_strip.begin(); qsi < _quad_strip.end(); ++qsi) {
- glBegin (GL_QUAD_STRIP);
-- for (n = qsi->index_list.begin(); n < qsi->index_list.end(); ++n) {
-+ for (n = qsi->index_list.begin(); n < qsi->index_list.end() -1 ; ++n) {
- glTexCoord2fv (&_vertex[*n].uv.x);
- glVertex3fv (&_vertex[*n].position.x);
- }
diff --git a/rss-glx-ImageMagick7-configure.patch b/rss-glx-ImageMagick7-configure.patch
deleted file mode 100644
index aa6ad18..0000000
--- a/rss-glx-ImageMagick7-configure.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/configure rss-glx_0.9.1.p/configure
---- rss-glx_0.9.1.p-orig/configure 2022-12-04 19:48:00.239307236 -0500
-+++ rss-glx_0.9.1.p/configure 2022-12-04 19:51:49.287547331 -0500
-@@ -621,8 +621,8 @@ freealut_LIBS
- freealut_CFLAGS
- WITHSOUND_FALSE
- WITHSOUND_TRUE
--Wand_LIBS
--Wand_CFLAGS
-+MagickWand_LIBS
-+MagickWand_CFLAGS
- PKG_CONFIG_LIBDIR
- PKG_CONFIG_PATH
- PKG_CONFIG
-@@ -777,8 +777,8 @@ XMKMF
- PKG_CONFIG
- PKG_CONFIG_PATH
- PKG_CONFIG_LIBDIR
--Wand_CFLAGS
--Wand_LIBS
-+MagickWand_CFLAGS
-+MagickWand_LIBS
- freealut_CFLAGS
- freealut_LIBS
- quesoglc_CFLAGS
-@@ -1443,8 +1443,8 @@ Some influential environment variables:
- directories to add to pkg-config's search path
- PKG_CONFIG_LIBDIR
- path overriding pkg-config's built-in search path
-- Wand_CFLAGS C compiler flags for Wand, overriding pkg-config
-- Wand_LIBS linker flags for Wand, overriding pkg-config
-+ MagickWand_CFLAGS C compiler flags for MagickWand, overriding pkg-config
-+ MagickWand_LIBS linker flags for MagickWand, overriding pkg-config
- freealut_CFLAGS
- C compiler flags for freealut, overriding pkg-config
- freealut_LIBS
-@@ -16124,35 +16124,35 @@ $as_echo "no" >&6; }
- fi
-
- pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Wand" >&5
--$as_echo_n "checking for Wand... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MagickWand" >&5
-+$as_echo_n "checking for MagickWand... " >&6; }
-
--if test -n "$Wand_CFLAGS"; then
-- pkg_cv_Wand_CFLAGS="$Wand_CFLAGS"
-+if test -n "$MagickWand_CFLAGS"; then
-+ pkg_cv_MagickWand_CFLAGS="$MagickWand_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.4\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "Wand >= 6.4") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.4\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.4") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_Wand_CFLAGS=`$PKG_CONFIG --cflags "Wand >= 6.4" 2>/dev/null`
-+ pkg_cv_MagickWand_CFLAGS=`$PKG_CONFIG --cflags "MagickWand >= 6.4" 2>/dev/null`
- else
- pkg_failed=yes
- fi
- else
- pkg_failed=untried
- fi
--if test -n "$Wand_LIBS"; then
-- pkg_cv_Wand_LIBS="$Wand_LIBS"
-+if test -n "$MagickWand_LIBS"; then
-+ pkg_cv_MagickWand_LIBS="$MagickWand_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Wand >= 6.4\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "Wand >= 6.4") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"MagickWand >= 6.4\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "MagickWand >= 6.4") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_Wand_LIBS=`$PKG_CONFIG --libs "Wand >= 6.4" 2>/dev/null`
-+ pkg_cv_MagickWand_LIBS=`$PKG_CONFIG --libs "MagickWand >= 6.4" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -16172,22 +16172,22 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- Wand_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Wand >= 6.4" 2>&1`
-+ MagickWand_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "MagickWand >= 6.4" 2>&1`
- else
-- Wand_PKG_ERRORS=`$PKG_CONFIG --print-errors "Wand >= 6.4" 2>&1`
-+ MagickWand_PKG_ERRORS=`$PKG_CONFIG --print-errors "MagickWand >= 6.4" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-- echo "$Wand_PKG_ERRORS" >&5
-+ echo "$MagickWand_PKG_ERRORS" >&5
-
-- as_fn_error $? "Package requirements (Wand >= 6.4) were not met:
-+ as_fn_error $? "Package requirements (MagickWand >= 6.4) were not met:
-
--$Wand_PKG_ERRORS
-+$MagickWand_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
-
--Alternatively, you may set the environment variables Wand_CFLAGS
--and Wand_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables MagickWand_CFLAGS
-+and MagickWand_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details." "$LINENO" 5
-
- elif test $pkg_failed = untried; then
-@@ -16199,16 +16199,16 @@ as_fn_error $? "The pkg-config script co
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
--Alternatively, you may set the environment variables Wand_CFLAGS
--and Wand_LIBS to avoid the need to call pkg-config.
-+Alternatively, you may set the environment variables MagickWand_CFLAGS
-+and MagickWand_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
- To get pkg-config, see .
- See \`config.log' for more details" "$LINENO" 5; }
-
- else
-- Wand_CFLAGS=$pkg_cv_Wand_CFLAGS
-- Wand_LIBS=$pkg_cv_Wand_LIBS
-+ MagickWand_CFLAGS=$pkg_cv_MagickWand_CFLAGS
-+ MagickWand_LIBS=$pkg_cv_MagickWand_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/Makefile.in rss-glx_0.9.1.p/Makefile.in
---- rss-glx_0.9.1.p-orig/Makefile.in 2022-12-04 19:48:00.246307213 -0500
-+++ rss-glx_0.9.1.p/Makefile.in 2022-12-04 19:57:46.709369115 -0500
-@@ -171,8 +171,8 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--Wand_CFLAGS = @Wand_CFLAGS@
--Wand_LIBS = @Wand_LIBS@
-+MagickWand_CFLAGS = @MagickWand_CFLAGS@
-+MagickWand_LIBS = @MagickWand_LIBS@
- XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/Implicit/Makefile.in rss-glx_0.9.1.p/src/Implicit/Makefile.in
---- rss-glx_0.9.1.p-orig/src/Implicit/Makefile.in 2022-12-04 19:48:00.246307213 -0500
-+++ rss-glx_0.9.1.p/src/Implicit/Makefile.in 2022-12-04 19:56:27.070631528 -0500
-@@ -159,8 +159,8 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--Wand_CFLAGS = @Wand_CFLAGS@
--Wand_LIBS = @Wand_LIBS@
-+MagickWand_CFLAGS = @MagickWand_CFLAGS@
-+MagickWand_LIBS = @MagickWand_LIBS@
- XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/Makefile.in rss-glx_0.9.1.p/src/Makefile.in
---- rss-glx_0.9.1.p-orig/src/Makefile.in 2022-12-04 19:48:00.258307174 -0500
-+++ rss-glx_0.9.1.p/src/Makefile.in 2022-12-04 19:55:53.893740843 -0500
-@@ -348,8 +348,8 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--Wand_CFLAGS = @Wand_CFLAGS@
--Wand_LIBS = @Wand_LIBS@
-+MagickWand_CFLAGS = @MagickWand_CFLAGS@
-+MagickWand_LIBS = @MagickWand_LIBS@
- XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -423,8 +423,8 @@ colorfire_LDADD = @BZIP2@
- cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h
- cyclone_LDADD = -LrsMath -lrsMath
- drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c
--drempels_CXXFLAGS = @Wand_CFLAGS@
--drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@
-+drempels_CXXFLAGS = @MagickWand_CFLAGS@
-+drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@
- euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp
- euphoria_LDADD = -LrsMath -lrsMath @BZIP2@
- feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/PixelCity/Makefile.in rss-glx_0.9.1.p/src/PixelCity/Makefile.in
---- rss-glx_0.9.1.p-orig/src/PixelCity/Makefile.in 2022-12-04 19:48:00.248307207 -0500
-+++ rss-glx_0.9.1.p/src/PixelCity/Makefile.in 2022-12-04 19:57:07.414498596 -0500
-@@ -169,8 +169,8 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--Wand_CFLAGS = @Wand_CFLAGS@
--Wand_LIBS = @Wand_LIBS@
-+MagickWand_CFLAGS = @MagickWand_CFLAGS@
-+MagickWand_LIBS = @MagickWand_LIBS@
- XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/src/rsMath/Makefile.in rss-glx_0.9.1.p/src/rsMath/Makefile.in
---- rss-glx_0.9.1.p-orig/src/rsMath/Makefile.in 2022-12-04 19:48:00.248307207 -0500
-+++ rss-glx_0.9.1.p/src/rsMath/Makefile.in 2022-12-04 19:56:10.994684496 -0500
-@@ -167,8 +167,8 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--Wand_CFLAGS = @Wand_CFLAGS@
--Wand_LIBS = @Wand_LIBS@
-+MagickWand_CFLAGS = @MagickWand_CFLAGS@
-+MagickWand_LIBS = @MagickWand_LIBS@
- XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
-diff '--color=auto' -rup rss-glx_0.9.1.p-orig/utils/Makefile.in rss-glx_0.9.1.p/utils/Makefile.in
---- rss-glx_0.9.1.p-orig/utils/Makefile.in 2022-12-04 19:48:00.248307207 -0500
-+++ rss-glx_0.9.1.p/utils/Makefile.in 2022-12-04 19:57:23.374446007 -0500
-@@ -139,8 +139,8 @@ SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--Wand_CFLAGS = @Wand_CFLAGS@
--Wand_LIBS = @Wand_LIBS@
-+MagickWand_CFLAGS = @MagickWand_CFLAGS@
-+MagickWand_LIBS = @MagickWand_LIBS@
- XMKMF = @XMKMF@
- X_CFLAGS = @X_CFLAGS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
diff --git a/rss-glx-ImageMagick7.patch b/rss-glx-ImageMagick7.patch
deleted file mode 100644
index cdb7ec8..0000000
--- a/rss-glx-ImageMagick7.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: rss-glx_0.9.1/configure.in
-===================================================================
---- rss-glx_0.9.1.orig/configure.in 2017-03-27 13:34:31.042941813 +0200
-+++ rss-glx_0.9.1/configure.in 2017-03-27 13:34:31.050941977 +0200
-@@ -75,7 +75,7 @@ fi
- AC_CHECK_FUNCS(random_r nrand48)
-
- # Check for ImageMagick.
--PKG_CHECK_MODULES(Wand, Wand >= 6.4)
-+PKG_CHECK_MODULES(MagickWand, MagickWand >= 6.4)
-
- if test -d src/skyrocket_sounds ; then
- AC_ARG_ENABLE(sound, [ --disable-sound Don't compile with sound.])
-Index: rss-glx_0.9.1/src/Makefile.am
-===================================================================
---- rss-glx_0.9.1.orig/src/Makefile.am 2010-01-04 01:44:04.000000000 +0100
-+++ rss-glx_0.9.1/src/Makefile.am 2017-03-27 13:36:06.468859903 +0200
-@@ -12,8 +12,8 @@ colorfire_LDADD = @BZIP2@
- cyclone_SOURCES = driver.c cyclone.cpp rgbhsl.h rgbhsl.cpp rsRand.h
- cyclone_LDADD = -LrsMath -lrsMath
- drempels_SOURCES = driver.h driver.c drempels.cpp gpoly.h gpoly.cpp TexMgr.h TexMgr.cpp rgbhsl.h rgbhsl.cpp noise1234.h noise1234.c
--drempels_CXXFLAGS = @Wand_CFLAGS@
--drempels_LDADD = @PTHREAD_LIBS@ @Wand_LIBS@
-+drempels_CXXFLAGS = @MagickWand_CFLAGS@
-+drempels_LDADD = @PTHREAD_LIBS@ @MagickWand_LIBS@
- euphoria_SOURCES = driver.h driver.c euphoria.cpp euphoria_textures.h euphoria_textures.c rgbhsl.h rgbhsl.cpp
- euphoria_LDADD = -LrsMath -lrsMath @BZIP2@
- feedback_SOURCES = driver.c feedback.cpp rgbhsl.h rgbhsl.cpp
-Index: rss-glx_0.9.1/src/TexMgr.cpp
-===================================================================
---- rss-glx_0.9.1.orig/src/TexMgr.cpp 2009-05-19 20:10:43.000000000 +0200
-+++ rss-glx_0.9.1/src/TexMgr.cpp 2017-03-27 13:34:31.050941977 +0200
-@@ -25,8 +25,8 @@
- #endif
- #include
-
--#include
--#include
-+#include
-+#include
- #include
- #include
- #include
-@@ -258,7 +258,7 @@ void TexMgr::loadNextImageFromDisk() {
- ExceptionInfo exception;
- int dirLoop = 0;
-
-- GetExceptionInfo (&exception);
-+ ClearMagickException (&exception);
-
- int imageLoaded = 0;
- do {
diff --git a/rss-glx-gcc11.patch b/rss-glx-gcc11.patch
deleted file mode 100644
index 53ad7d2..0000000
--- a/rss-glx-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Implicit/impSurface.h b/src/Implicit/impSurface.h
-index 41fab81..ecb692a 100644
---- a/src/Implicit/impSurface.h
-+++ b/src/Implicit/impSurface.h
-@@ -27,6 +27,7 @@
- #endif
- #include
- #include
-+#include
-
-
- class impSurface{
diff --git a/rss-glx-matrixview.conf b/rss-glx-matrixview.conf
deleted file mode 100644
index 33f631c..0000000
--- a/rss-glx-matrixview.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-GL: "BioF" \
- rss-glx-biof -r \n\
-GL: "Busy Spheres" \
- rss-glx-busyspheres -r \n\
-GL: "Colorfire" \
- rss-glx-colorfire -r \n\
-GL: "Cyclone" \
- rss-glx-cyclone -r \n\
-GL: "Drempels" \
- rss-glx-drempels -r \n\
-GL: "Euphoria" \
- rss-glx-euphoria -r \n\
-GL: "Feedback" \
- rss-glx-feedback -r \n\
-GL: "Fieldlines" \
- rss-glx-fieldlines -r \n\
-GL: "Flocks" \
- rss-glx-flocks -r \n\
-GL: "Flux" \
- rss-glx-flux -r \n\
-GL: "Helios" \
- rss-glx-helios -r \n\
-GL: "Hufo's Smoke" \
- rss-glx-hufo_smoke -r \n\
-GL: "Hufo's Tunnel" \
- rss-glx-hufo_tunnel -r \n\
-GL: "Hyperspace" \
- rss-glx-hyperspace -r \n\
-GL: "Lattice" \
- rss-glx-lattice -r \n\
-GL: "Lorenz" \
- rss-glx-lorenz -r \n\
-GL: "Pixel City" \
- rss-glx-pixelcity -r \n\
-GL: "Plasma" \
- rss-glx-plasma -r \n\
-GL: "Skyrocket (silent)" \
- rss-glx-skyrocket -v 0 -r \n\
-GL: "Skyrocket" \
- rss-glx-skyrocket -r \n\
-GL: "Solarwinds" \
- rss-glx-solarwinds -r \n\
-GL: "SpirographX" \
- rss-glx-spirographx -r \n\
-GL: "Sundancer2" \
- rss-glx-sundancer2 -r \n\
-GL: "Matrix" \
- rss-glx-matrixview -r \n\
diff --git a/rss-glx.conf b/rss-glx.conf
deleted file mode 100644
index 33f631c..0000000
--- a/rss-glx.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-GL: "BioF" \
- rss-glx-biof -r \n\
-GL: "Busy Spheres" \
- rss-glx-busyspheres -r \n\
-GL: "Colorfire" \
- rss-glx-colorfire -r \n\
-GL: "Cyclone" \
- rss-glx-cyclone -r \n\
-GL: "Drempels" \
- rss-glx-drempels -r \n\
-GL: "Euphoria" \
- rss-glx-euphoria -r \n\
-GL: "Feedback" \
- rss-glx-feedback -r \n\
-GL: "Fieldlines" \
- rss-glx-fieldlines -r \n\
-GL: "Flocks" \
- rss-glx-flocks -r \n\
-GL: "Flux" \
- rss-glx-flux -r \n\
-GL: "Helios" \
- rss-glx-helios -r \n\
-GL: "Hufo's Smoke" \
- rss-glx-hufo_smoke -r \n\
-GL: "Hufo's Tunnel" \
- rss-glx-hufo_tunnel -r \n\
-GL: "Hyperspace" \
- rss-glx-hyperspace -r \n\
-GL: "Lattice" \
- rss-glx-lattice -r \n\
-GL: "Lorenz" \
- rss-glx-lorenz -r \n\
-GL: "Pixel City" \
- rss-glx-pixelcity -r \n\
-GL: "Plasma" \
- rss-glx-plasma -r \n\
-GL: "Skyrocket (silent)" \
- rss-glx-skyrocket -v 0 -r \n\
-GL: "Skyrocket" \
- rss-glx-skyrocket -r \n\
-GL: "Solarwinds" \
- rss-glx-solarwinds -r \n\
-GL: "SpirographX" \
- rss-glx-spirographx -r \n\
-GL: "Sundancer2" \
- rss-glx-sundancer2 -r \n\
-GL: "Matrix" \
- rss-glx-matrixview -r \n\
diff --git a/rss-glx.spec b/rss-glx.spec
index ed2add2..7cf6ece 100644
--- a/rss-glx.spec
+++ b/rss-glx.spec
@@ -1,24 +1,52 @@
%if 0%{?fedora}
+%if %{fedora} <= 4
+%bcond_with modular_x
+%bcond_with gss
+%define _gssconfigdir %{nil}%{?gssconfigdir}
+%else
%bcond_without modular_x
+%bcond_without gss
+%if %{fedora} <= 5
+%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
+%else
+%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
+%endif
+%if %{fedora} >= 7
%bcond_without modular_xss
%else
-%bcond_with modular_x
%bcond_with modular_xss
%endif
+%if %{fedora} >= 8
+# KDE4
+%bcond_without kde4
+%else
+# KDE3
+%bcond_with kde4
+%endif
+%endif
+%else
+%bcond_without modular_x
+%bcond_without modular_xss
+%bcond_without gss
+%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
+%endif
-%global xssconfigdir %{_datadir}/xscreensaver/config
-%global xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
-%global xssbindir %{_libexecdir}/xscreensaver
+%define kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers}
+
+%define xssconfigdir %{_datadir}/xscreensaver/config
+%define xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
+%define xssbindir %{_libexecdir}/xscreensaver
+%define gssbindir %{_libexecdir}/gnome-screensaver
%bcond_with matrixview
-%global patchext %{nil}%{!?with_matrixview:.p}
+%define patchext %{nil}%{!?with_matrixview:.p}
Summary: Really Slick Screensavers
Name: rss-glx
Version: 0.9.1%{patchext}
-Release: 64%{?dist}
-# Automatically converted from old format: GPLv2 - review is highly recommended.
-License: GPL-2.0-only
+Release: 4%{?dist}.1
+License: GPLv2
+Group: Amusements/Graphics
URL: http://rss-glx.sourceforge.net/
# We ship a tarball with one questionable hack patched out.
# The original URL is the following without %%patchext:
@@ -28,22 +56,11 @@ Source1: README.fedora
# The following two strip matrixview from the package and build a new tarball
Source2: rss-glx-rm-matrixview.sh
Source3: rss-glx-0.9.1-0.9.1.p.diff
-Source4: rss-glx-matrixview.conf
-Source5: rss-glx.conf
# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
Patch0: rss-glx-0.9.0.p-optflags.patch
-Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
-Patch11: rss-glx-0.9.1.p-linker.patch
-Patch12: rss-glx-0.9.1.p-pixelcity.patch
-Patch13: rss-glx-gcc11.patch
-# Modified version from openSUSE: https://build.opensuse.org/package/view_file/X11:Utilities/rss-glx/rss-glx-ImageMagick7.patch?expand=1
-Patch14: rss-glx-ImageMagick7.patch
-# Autotools regeneration doesn't work
-Patch15: rss-glx-ImageMagick7-configure.patch
-
-BuildRequires: make
-BuildRequires: gcc-c++
-BuildRequires: gcc
+Patch1: rss-glx-0.9.1.p-autoreconf.patch
+Patch2: rss-glx-0.9.1.p-linker.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: glew-devel
@@ -62,10 +79,6 @@ BuildRequires: freealut-devel
BuildRequires: gawk
BuildRequires: sed
-%if 0%{?fedora} >= 33
-Obsoletes: %{name}-gnome-screensaver < 0.9.1.p-43
-%endif
-
%description
A port of the Really Slick Screensavers to GLX. Provides several visually
impressive and graphically intensive screensavers.
@@ -76,6 +89,7 @@ order to use them as screensavers.
%package xscreensaver
Summary: Really Slick Screensavers
+Group: Amusements/Graphics
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if %{with modular_xss}
Requires(post): xscreensaver-base >= 1:5.03-3
@@ -83,7 +97,9 @@ Requires(postun): xscreensaver-base >= 1:5.03-3
%else
Requires: xscreensaver-base < 1:5.03-3
%endif
+%if 0%{?fedora} >= 7
Requires: xscreensaver-gl-base
+%endif
%description xscreensaver
A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -91,6 +107,37 @@ impressive and graphically intensive screensavers.
This package contains files needed to use the hacks with xscreensaver.
+%if %{with gss}
+%package gnome-screensaver
+Summary: Really Slick Screensavers
+Group: Amusements/Graphics
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: gnome-screensaver
+
+%description gnome-screensaver
+A port of the Really Slick Screensavers to GLX. Provides several visually
+impressive and graphically intensive screensavers.
+
+This package contains files needed to use the hacks with gnome-screensaver.
+%endif
+
+%package kde
+Summary: Really Slick Screensavers
+Group: Amusements/Graphics
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-xscreensaver = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?fedora}%{?rhel} > 0 && 0%{?fedora} <= 6 && 0%{?rhel} <= 5
+Requires: kdeartwork-extras
+%else
+Requires: kdeartwork-kxs
+%endif
+
+%description kde
+A port of the Really Slick Screensavers to GLX. Provides several visually
+impressive and graphically intensive screensavers.
+
+This package contains files needed to use the hacks with KDE.
+
%prep
cat << EOF
@@ -100,6 +147,12 @@ Build settings:
%else
- with monolithic X
%endif
+%if %{with gss}
+- with gnome-screensaver support,
+ theme directory: %{_gssconfigdir}
+%else
+- without gnome-screensaver support
+%endif
%if %{with matrixview}
- with matrixview hack
%else
@@ -110,39 +163,122 @@ Build settings:
%else
- without modular xscreensaver support
%endif
-EOF
+%if %{with kde4}
+- with KDE4 support in: %kdessconfigdir
+%else
+- with KDE3 support in: %kdessconfigdir
+%endif
-%autosetup -p1 -n rss-glx_%{version}
+EOF
+%setup -q -n rss-glx_%{version}
+%patch0 -p1 -b .optflags
+%patch1 -p1 -b .autoreconf
+%patch2 -p1 -b .linker
%build
%configure \
--with-configdir=%{xssconfigdir} \
+ --with-kdessconfigdir=%{kdessconfigdir} \
--program-prefix=rss-glx-
-%make_build
+make %{?_smp_mflags}
%install
+generate_fix_desktop_files_links () {
+ local line name trycmd cmd desc
+ while read line; do
+%if %{with gss}
+ # generate GNOME screensaver desktop files
+ eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"rss-glx-" $2 "\"; desc=\"" $3 "\""}')
+ trycmd="${cmd%%%% *}"
+ origtrycmd="${trycmd#rss-glx-}"
+ cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
+
+[Desktop Entry]
+Name=${name}
+Comment=${desc}
+TryExec=${trycmd}
+Exec=${cmd} -r
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=GNOME;Screensaver;
+EOF
+ ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{gssbindir}/${trycmd}"
+%endif
+ # fix KDE screensaver desktop files
+ pushd "%{buildroot}%{kdessconfigdir}" >& /dev/null
+ if [ ! -f "${trycmd}.desktop" ]; then
+ awk '
+{
+ if ($0 ~ "^Actions=") {
+ print "Actions=InWindow;Root;Setup;";
+ print "X-KDE-Category=Really Slick Screensavers";
+ print "X-KDE-Type=OpenGL";
+ } else {
+ if ($0 ~ "^Type=") {
+ print "Type=Service";
+ print "X-KDE-ServiceTypes=ScreenSaver";
+ } else {
+ if ($0 !~ "^Encoding=") {
+ print;
+ }
+ }
+ }
+}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop"
+ rm -f "${origtrycmd}.desktop"
+ fi
+ popd >& /dev/null
+ # external hacks description and symlinks for XScreenSaver
+ cat << EOF >> %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
+GL: "${name}" \\
+ ${cmd} -r \\n\\
+EOF
+ ln -snf "%{_bindir}/${trycmd}" "%{buildroot}%{xssbindir}/${trycmd}"
+ done
+}
+
+rm -rf %buildroot
install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
make DESTDIR=%{buildroot} install
rm -f %{buildroot}%{_libdir}/lib*.{,l}a
rm %{buildroot}%{_bindir}/rss-glx-rss-glx_install.pl
-
+%if %{with gss}
+mkdir -p %{buildroot}%{_gssconfigdir}
+mkdir -p %{buildroot}%{gssbindir}
mkdir -p %{buildroot}%{xssbindir}
mkdir -p %{buildroot}%{xssexthacksconfdir}
-%if %{with matrixview}
-install -m 0644 "%SOURCE4" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
-%else
-install -m 0644 "%SOURCE5" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
%endif
+cat << EOF | generate_fix_desktop_files_links
+BioF§biof§This is an attempt to recreate some of the work of William Latham.
+Busy Spheres§busyspheres§Spheres made of dancing particles.
+Colorfire§colorfire§Burning colors.
+Cyclone§cyclone§A cyclone made of particles.
+Drempels§drempels§A hallucinatory desktop enhancer.
+Euphoria§euphoria§Psychedelic shapes.
+Feedback§feedback§Stirring colors with a jiggling warp.
+Fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
+Flocks§flocks§Floating wisps.
+Flux§flux§Flux fields and stuff.
+Helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
+Hufo's Smoke§hufo_smoke§Particle smoke effect.
+Hufo's Tunnel§hufo_tunnel§Inside a tunnel.
+Hyperspace§hyperspace§Flying through hyper space.
+Lattice§lattice§Fly through an endless world of linked rings.
+Lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
+%if %{with matrixview}
+MatrixView§matrixview§The Matrix.
+%endif
+Pixel City§pixelcity§Procedural city fly through.
+Plasma§plasma§Oozing plasma.
+Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
+Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
+Solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
+SpirographX§spirographx§Spirograph-like screensaver.
+Sundancer2§sundancer2§Rotating stack of quads.
+EOF
-cd %buildroot/%{_bindir}/
-for file in rss-glx*; do
- ln -snf "%{_bindir}/${file}" "%{buildroot}%{xssbindir}/${file}"
-done
-
-cd %buildroot/%{xssconfigdir}/
-for file in *.xml; do
- mv -f ${file} rss-glx-${file}
-done
+%clean
+rm -rf %buildroot
%if %{with modular_xss}
%post xscreensaver
@@ -157,202 +293,36 @@ fi
%endif
%files
+%defattr(-, root, root)
%doc ChangeLog COPYING INSTALL
%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.1-0.9.1.p.diff
%{_bindir}/*
%{_mandir}/*/*
%files xscreensaver
+%defattr(-, root, root)
# xscreensaver-base provides %{xssexthacksconfdir}
%config(noreplace) %{xssexthacksconfdir}/rss-glx.conf
%{xssconfigdir}/*.xml
%dir %{xssbindir}
%{xssbindir}/*
+%if %{with gss}
+%files gnome-screensaver
+%defattr(-, root, root)
+%dir %{_gssconfigdir}
+%{_gssconfigdir}/*.desktop
+%dir %{gssbindir}
+%{gssbindir}/*
+%endif
+
+%files kde
+%defattr(-, root, root)
+%dir %{kdessconfigdir}
+%{kdessconfigdir}/*.desktop
+
%changelog
-* Fri Jul 25 2025 Fedora Release Engineering - 0.9.1.p-64
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 josef radinger - 0.9.1.p-63
-- rebuild for broken dependency on libMagickWand
-
-* Mon Jul 29 2024 Miroslav Suchý - 0.9.1.p-62
-- convert license to SPDX
-
-* Fri Jul 19 2024 Fedora Release Engineering - 0.9.1.p-61
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering - 0.9.1.p-60
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering - 0.9.1.p-59
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering - 0.9.1.p-58
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jan 20 2023 Fedora Release Engineering - 0.9.1.p-57
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 05 2023 Neal Gompa - 0.9.1.p-56
-- Rebuild for ImageMagick 7
-
-* Mon Dec 05 2022 Neal Gompa - 0.9.1.p-55
-- Patch pregenerated configure script since regeneration fails
-
-* Sun Dec 04 2022 Neal Gompa - 0.9.1.p-54
-- Add patch for ImageMagick 7 compatibility
-
-* Sat Jul 23 2022 Fedora Release Engineering - 0.9.1.p-53
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Feb 10 2022 Orion Poplawski - 0.9.1.p-52
-- Rebuild for glew 2.2
-
-* Fri Jan 21 2022 Fedora Release Engineering - 0.9.1.p-51
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sun Oct 17 2021 Mamoru TASAKA - 0.9.1.p-50
-- Rebuild against new ImageMagick
-
-* Fri Jul 23 2021 Fedora Release Engineering - 0.9.1.p-49
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering - 0.9.1.p-48
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Sep 15 2020 Jeff Law - 0.9.1.p-47
-- Fix missing include of cstddef for gcc-11
-
-* Sat Aug 01 2020 Fedora Release Engineering - 0.9.1.p-46
-- Second attempt - Rebuilt for
- https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering - 0.9.1.p-45
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Jun 07 2020 josef radinger - 0.9.1.p-44
-- obsolete rss-glx-gnome-screensaver
-- further cleanup
-
-* Sat Jun 06 2020 josef radinger - 0.9.1.p-43
-- we no longer have gnome-screensaver
-- and we have no kde-packages for long times, too
-- specfile-cleanup
-
-
-* Sat May 16 2020 josef radinger - 0.9.1.p-42
-- fix pixelcity rss-glx-0.9.1.p-pixelcity.patch
-
-* Thu Jan 30 2020 Fedora Release Engineering - 0.9.1.p-41
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering - 0.9.1.p-40
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering - 0.9.1.p-39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Aug 31 2018 josef radinger - 0.9.1.p-38
-- fix rss-glx-0.9.1.p-linker.patch (reorder and patch Makefile.in instead of Makefile.am)
-
-* Tue Aug 28 2018 Michael Cronenworth - 0.9.1.p-37
-- Rebuild for new ImageMagick 6.9.10
-
-* Thu Aug 23 2018 Nicolas Chauvet - 0.9.1.p-36
-- Rebuilt for glew 2.1.0
-
-* Sat Jul 14 2018 Fedora Release Engineering - 0.9.1.p-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Igor Gnatenko - 0.9.1.p-34
-- Escape macros in %%changelog
-
-* Tue Sep 05 2017 Adam Williamson - 0.9.1.p-33
-- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch
-
-* Mon Aug 28 2017 Michael Cronenworth - 0.9.1.p-32
-- Rebuilt for ImageMagick
-
-* Thu Aug 03 2017 Fedora Release Engineering - 0.9.1.p-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering - 0.9.1.p-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering - 0.9.1.p-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jan 10 2017 Orion Poplawski - 0.9.1.p-28
-- Rebuild for glew 2.0.0
-
-* Thu Feb 04 2016 Fedora Release Engineering - 0.9.1.p-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jan 19 2016 Nils Philippsen
-- use %%global instead of %%define
-
-* Thu Jan 14 2016 Adam Jackson - 0.9.1.p-26
-- Rebuild for glew 1.13
-
-* Thu Jun 18 2015 Fedora Release Engineering - 0.9.1.p-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Apr 28 2015 Mamoru TASAKA - 0.9.1.p-24
-- F-22+: Obsoletes -kde subpackage
-
-* Mon Aug 18 2014 Fedora Release Engineering - 0.9.1.p-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering - 0.9.1.p-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Apr 02 2014 josef radinger - 0.9.1.p-20
-- fix date in changelog
-
-* Tue Apr 01 2014 josef radinger - 0.9.1.p-19
-- rename xml-files (#744862)
-
-* Mon Nov 18 2013 Dave Airlie - 0.9.1.p-18
-- rebuilt for GLEW 1.10
-
-* Sun Aug 04 2013 Fedora Release Engineering - 0.9.1.p-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Mar 30 2013 Kevin Fenzi - 0.9.1.p-16
-- Rebuild for broken deps in rawhide
-
-* Thu Feb 14 2013 Fedora Release Engineering - 0.9.1.p-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Dec 13 2012 Adam Jackson - 0.9.1.p-14
-- Rebuild for glew 1.9.0
-
-* Wed Aug 01 2012 Adam Jackson - 0.9.1.p-13
-- -Rebuild for new glew
-
-* Sat Jul 21 2012 Fedora Release Engineering - 0.9.1.p-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Apr 13 2012 Tom Callawau - 0.9.1.p-11
-- rebuild for new ImageMagick
-
-* Tue Jan 10 2012 Nils Philippsen - 0.9.1.p-10
-- rebuild for gcc 4.7
-
-* Mon Jul 04 2011 Nils Philippsen - 0.9.1.p-9
-- rebuild against new ImageMagick
-
-* Mon Jun 20 2011 ajax@redhat.com - 0.9.1.p-8
-- Rebuild for new glew soname
-
-* Wed Feb 09 2011 Fedora Release Engineering - 0.9.1.p-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Oct 11 2010 Nils Philippsen 0.9.1.p-6
-- fix silent skyrocket desktop filename (#617531)
-
-* Wed Sep 29 2010 jkeating - 0.9.1.p-5
+* Tue Oct 05 2010 jkeating - 0.9.1.p-4.1
- Rebuilt for gcc bug 634757
* Wed Sep 15 2010 Nils Philippsen 0.9.1.p-4
@@ -415,7 +385,7 @@ fi
- -kde: drop Requires: kdebase (kdeartwork dep is enough)
- fix %%kdessconfigdir for kde4
-* Thu Jan 31 2008 Adel Gadllah 0.8.1.p-18
+* Fri Jan 31 2008 Adel Gadllah 0.8.1.p-18
- Fix build with gcc43
* Mon Nov 05 2007 Nils Philippsen 0.8.1.p-17
@@ -441,10 +411,10 @@ fi
- include %%post/%%postun scripts only with modular xscreensaver support
* Fri Sep 14 2007 Nils Philippsen 0.8.1.p-10
-- replace requirement on %%{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
+- replace requirement on %{_bindir}/kxsconfig by kdeartwork-kxe (Fedora >= 7,
RHEL >= 6), kdeartwork-extras (<= Fedora 6, RHEL 5)
- license is GPLv2
-- run %%{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
+- run %{_sbindir}/update-xscreensaver-hacks in %%post, %%postun, require
xscreensaver-base >= 5.03-3 for that
- don't reference upstream URL for source tarball as we ship a modified one
@@ -461,7 +431,7 @@ fi
* Thu Jun 14 2007 Nils Philippsen 0.8.1.p-7
- build xscreensaver hack description files (#200881)
-- require %%{_bindir}/kxsconfig (#219106)
+- require %{_bindir}/kxsconfig (#219106)
* Mon Aug 28 2006 Nils Philippsen 0.8.1.p-6
- FC6 mass rebuild
diff --git a/sources b/sources
index f353def..0477243 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
bc420d230634fe8d3bbc79dc6a3c6678 rss-glx_0.9.1.p.tar.bz2
-86fdbdf7e06b184c70c1280c5a030021 rss-glx-0.9.1.p-6-autoreconf.patch.bz2