Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

rss-glx-0.9.1.p-linker.patch

@@ -1,11 +1,12 @@
-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 @@
+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
  plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
  pixelcity_SOURCES = driver.c
- pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
-+pixelcity_LINK = $(CXXLINK)
+-pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
++pixelcity_LDADD = -LPixelCity -lPixelCity @quesoglc_LIBS@ 
+ 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

rss-glx-0.9.1.p-pixelcity.patch

@@ -0,0 +1,11 @@
+--- 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);
+     }

rss-glx-ImageMagick7-configure.patch

@@ -0,0 +1,230 @@
+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 <http://pkg-config.freedesktop.org/>.
+ 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@

rss-glx-ImageMagick7.patch

@@ -0,0 +1,52 @@
+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 <cstdlib>
+ 
+-#include <magick/api.h>
+-#include <wand/magick-wand.h>
++#include <magick/MagickCore.h>
++#include <wand/MagickWand.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -258,7 +258,7 @@ void TexMgr::loadNextImageFromDisk() {
+ 	ExceptionInfo exception;
+ 	int dirLoop = 0;
+ 
+-	GetExceptionInfo (&exception);
++	ClearMagickException (&exception);
+ 
+ 	int imageLoaded = 0;
+ 	do {

rss-glx-gcc11.patch

@@ -0,0 +1,12 @@
+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 <vector>
+ #include <GL/gl.h>
++#include <cstddef>
+ 
+ 
+ class impSurface{

rss-glx-matrixview.conf

@@ -0,0 +1,48 @@
+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\

rss-glx.conf

@@ -0,0 +1,48 @@
+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\

rss-glx.spec

@@ -1,42 +1,14 @@
 %if 0%{?fedora}
-%if %{fedora} <= 4
-%bcond_with modular_x
-%bcond_with gss
-%global _gssconfigdir %{nil}%{?gssconfigdir}
-%else
 %bcond_without modular_x
-%bcond_without gss
-%if %{fedora} <= 5
-%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
-%else
-%global _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
-%global _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
-%endif
-
-%global kdessconfigdir %{?with_kde4:%{_datadir}/kde4/services/ScreenSavers}%{!?with_kde4:%{_datadir}/applnk/System/ScreenSavers}
 
 %global xssconfigdir %{_datadir}/xscreensaver/config
 %global xssexthacksconfdir %{_datadir}/xscreensaver/hacks.conf.d
 %global xssbindir %{_libexecdir}/xscreensaver
-%global gssbindir %{_libexecdir}/gnome-screensaver
 
 %bcond_with matrixview
 %global patchext %{nil}%{!?with_matrixview:.p}
@@ -44,9 +16,9 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.9.1%{patchext}
-Release: 29%{?dist}
-License: GPLv2
-Group: Amusements/Graphics
+Release: 64%{?dist}
+# Automatically converted from old format: GPLv2 - review is highly recommended.
+License: GPL-2.0-only
 URL: http://rss-glx.sourceforge.net/
 # We ship a tarball with one questionable hack patched out.
 # The original URL is the following without %%patchext:
@@ -56,11 +28,22 @@ 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
-Patch1: rss-glx-0.9.1.p-linker.patch
 Patch10: rss-glx-0.9.1.p-6-autoreconf.patch.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+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
 BuildRequires: libGL-devel
 BuildRequires: libGLU-devel
 BuildRequires: glew-devel
@@ -78,8 +61,9 @@ BuildRequires: bzip2-devel
 BuildRequires: freealut-devel
 BuildRequires: gawk
 BuildRequires: sed
-%if 0%{?fedora} >= 22
-Obsoletes:     %{name}-kde < 0.9.1.p-23
+
+%if 0%{?fedora} >= 33
+Obsoletes:     %{name}-gnome-screensaver < 0.9.1.p-43
 %endif
 
 %description
@@ -92,7 +76,6 @@ 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
@@ -100,9 +83,7 @@ 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
@@ -110,37 +91,6 @@ 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
 
@@ -150,12 +100,6 @@ 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
@@ -166,134 +110,40 @@ Build settings:
 %else
 - without modular xscreensaver support
 %endif
-%if 0%{?fedora} < 22
-%if %{with kde4}
-- with KDE4 support in: %kdessconfigdir
-%else
-- with KDE3 support in: %kdessconfigdir
-%endif
-%endif
-
 EOF
-%setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .optflags
-%patch1 -p1 -b .linker
-%patch10 -p1 -b .autoreconf
+
+%autosetup -p1 -n rss-glx_%{version}
 
 %build
 %configure \
     --with-configdir=%{xssconfigdir} \
-    --with-kdessconfigdir=%{kdessconfigdir} \
     --program-prefix=rss-glx-
-make %{?_smp_mflags}
+%make_build
 
 %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 "\"; desktopfilename=\"rss-glx-" $2 ".desktop\"; cmd=\"rss-glx-" $3 "\"; desc=\"" $4 "\""}')
-		trycmd="${cmd%%%% *}"
-        origtrycmd="${trycmd#rss-glx-}"
-		cat << EOF > %{buildroot}%{_gssconfigdir}/${desktopfilename}
-
-[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}
-%endif
-cat << EOF | generate_fix_desktop_files_links
-BioF§biof§biof§This is an attempt to recreate some of the work of William Latham.
-Busy Spheres§busyspheres§busyspheres§Spheres made of dancing particles.
-Colorfire§colorfire§colorfire§Burning colors.
-Cyclone§cyclone§cyclone§A cyclone made of particles.
-Drempels§drempels§drempels§A hallucinatory desktop enhancer.
-Euphoria§euphoria§euphoria§Psychedelic shapes.
-Feedback§feedback§feedback§Stirring colors with a jiggling warp.
-Fieldlines§fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
-Flocks§flocks§flocks§Floating wisps.
-Flux§flux§flux§Flux fields and stuff.
-Helios§helios§helios§Attraction/repulsion particle effects and some smooth surfaces.
-Hufo's Smoke§hufo_smoke§hufo_smoke§Particle smoke effect.
-Hufo's Tunnel§hufo_tunnel§hufo_tunnel§Inside a tunnel.
-Hyperspace§hyperspace§hyperspace§Flying through hyper space.
-Lattice§lattice§lattice§Fly through an endless world of linked rings.
-Lorenz§lorenz§lorenz§A visualization of the Lorenz Attractor fractal.
 %if %{with matrixview}
-MatrixView§matrixview§matrixview§The Matrix.
+install -m 0644 "%SOURCE4" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
+%else
+install -m 0644 "%SOURCE5" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
 %endif
-Pixel City§pixelcity§pixelcity§Procedural city fly through.
-Plasma§plasma§plasma§Oozing plasma.
-Skyrocket (silent)§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§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§solarwinds§This is a very mesmerizing particle effects saver.
-SpirographX§spirographx§spirographx§Spirograph-like screensaver.
-Sundancer2§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
+    mv -f ${file} rss-glx-${file}
 done
 
-%if 0%{?fedora} >= 22
-rm -rf %buildroot%{kdessconfigdir}
-%endif
-
-%clean
-rm -rf %buildroot
-
 %if %{with modular_xss}
 %post xscreensaver
 if [ -x %{_sbindir}/update-xscreensaver-hacks ]; then
@@ -307,37 +157,129 @@ 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
-
-%if 0%{?fedora} < 22
-%files kde
-%defattr(-, root, root)
-%dir %{kdessconfigdir}
-%{kdessconfigdir}/*.desktop
-%endif
-
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-64
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jan 17 2025 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-63
+- rebuild for broken dependency on libMagickWand
+
+* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.9.1.p-62
+- convert license to SPDX
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-61
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-60
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-59
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-58
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-57
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-56
+- Rebuild for ImageMagick 7
+
+* Mon Dec 05 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-55
+- Patch pregenerated configure script since regeneration fails
+
+* Sun Dec 04 2022 Neal Gompa <ngompa@fedoraproject.org> - 0.9.1.p-54
+- Add patch for ImageMagick 7 compatibility
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-53
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Feb 10 2022 Orion Poplawski <orion@nwra.com> - 0.9.1.p-52
+- Rebuild for glew 2.2
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-51
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sun Oct 17 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-50
+- Rebuild against new ImageMagick
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-49
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-48
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 15 2020 Jeff Law <law@redhat.com> - 0.9.1.p-47
+- Fix missing include of cstddef for gcc-11
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-46
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 07 2020 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-44
+- obsolete rss-glx-gnome-screensaver
+- further cleanup
+
+* Sat Jun 06 2020 josef radinger <cheese@nosuchhost.net> - 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 <cheese@nosuchhost.net> - 0.9.1.p-42
+- fix pixelcity rss-glx-0.9.1.p-pixelcity.patch
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-40
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Aug 31 2018 josef radinger <cheese@nosuchhost.net> - 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 <mike@cchtml.com> - 0.9.1.p-37
+- Rebuild for new ImageMagick 6.9.10
+
+* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 0.9.1.p-36
+- Rebuilt for glew 2.1.0
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.9.1.p-34
+- Escape macros in %%changelog
+
+* Tue Sep 05 2017 Adam Williamson <awilliam@redhat.com> - 0.9.1.p-33
+- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch
+
+* Mon Aug 28 2017 Michael Cronenworth <mike@cchtml.com> - 0.9.1.p-32
+- Rebuilt for ImageMagick
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-29
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
@@ -499,10 +441,10 @@ fi
 - include %%post/%%postun scripts only with modular xscreensaver support
 
 * Fri Sep 14 2007 Nils Philippsen <nphilipp@redhat.com> 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
 
@@ -519,7 +461,7 @@ fi
 
 * Thu Jun 14 2007 Nils Philippsen <nphilipp@redhat.com> 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 <nphilipp@redhat.com> 0.8.1.p-6
 - FC6 mass rebuild