Compare commits

..

5 commits

Author SHA1 Message Date
Fedora Release Engineering
0a78881204 dist-git conversion 2010-07-29 11:41:14 +00:00
Bill Nottingham
adb40f75bf Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:29:47 +00:00
Nils Philippsen
215d5f04d1 use autoreconf to avoid using non-matching ltmain.sh correct KDE desktop
files so that they work with KDE 4.1 remove encoding lines from desktop
    files as they're deprecated version 0.8.2.p remove obsolete freealut
    patch update flags, gcc43 patches
2008-12-22 17:08:31 +00:00
Nils Philippsen
e54db36760 use %bcond, %with macros for consistency don't use quotes around %fedora
macro to make it work with Fedora 10 use correct binary names for KDE
    (#448844)
2008-05-29 10:06:33 +00:00
Jesse Keating
667c1c66d3 Initialize branch F-9 for rss-glx 2008-04-21 18:48:38 +00:00
16 changed files with 382 additions and 826 deletions

4
.gitignore vendored
View file

@ -1,5 +1 @@
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

108
rss-glx-0.8.2-0.8.2.p.diff Normal file
View file

@ -0,0 +1,108 @@
diff -ur rss-glx_0.8.2/ChangeLog rss-glx_0.8.2.p/ChangeLog
--- rss-glx_0.8.2/ChangeLog 2008-09-01 03:38:28.000000000 +0200
+++ rss-glx_0.8.2.p/ChangeLog 2008-12-16 15:41:14.000000000 +0100
@@ -1,3 +1,7 @@
+****************************** Version 0.8.2.p ********************************
+
+ Removed matrixview
+
******************************* Version 0.8.2 *********************************
Limit frame rate to vertical refresh by default if compiled with GLEW
diff -ur rss-glx_0.8.2/configure.in rss-glx_0.8.2.p/configure.in
--- rss-glx_0.8.2/configure.in 2008-09-01 03:30:28.000000000 +0200
+++ rss-glx_0.8.2.p/configure.in 2008-12-16 15:41:49.000000000 +0100
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(src/driver.cpp)
-AM_INIT_AUTOMAKE(rss-glx,0.7.3)
+AM_INIT_AUTOMAKE(rss-glx,0.8.2.p)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
@@ -126,9 +126,6 @@
AC_CHECK_LIB([MesaGLU],[gluLookAt],,AC_MSG_ERROR(GLU library was not found.))
fi
-# Check for ImageMagick.
-PKG_CHECK_MODULES(Wand, Wand >= 6.2)
-
AC_CHECK_HEADERS([GL/glew.h])
if test "x$ac_cv_header_GL_glew_h" = "xyes" ; then
diff -ur rss-glx_0.8.2/other_src/Makefile.am rss-glx_0.8.2.p/other_src/Makefile.am
--- rss-glx_0.8.2/other_src/Makefile.am 2008-06-30 02:59:56.000000000 +0200
+++ rss-glx_0.8.2.p/other_src/Makefile.am 2008-12-16 15:42:54.000000000 +0100
@@ -1,36 +1,21 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
AM_LDFLAGS=@GLEW@
-bin_PROGRAMS = biof busyspheres matrixview spirographx sundancer2
+bin_PROGRAMS = biof busyspheres spirographx sundancer2
biof_SOURCES = driver.c biof.c
busyspheres_SOURCES = driver.c busyspheres.c
-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
spirographx_SOURCES = driver.c spirographx.c
sundancer2_SOURCES = driver.c sundancer2.c
if INSTALL_XSCREENSAVER_CONFIG_FILES
-dist_config_DATA = biof.xml busyspheres.xml matrixview.xml spirographx.xml sundancer2.xml
+dist_config_DATA = biof.xml busyspheres.xml spirographx.xml sundancer2.xml
endif
if INSTALL_KDE_CONFIG_FILES
-dist_kdessconfig_DATA = biof.desktop busyspheres.desktop matrixview.desktop spirographx.desktop sundancer2.desktop
+dist_kdessconfig_DATA = biof.desktop busyspheres.desktop spirographx.desktop sundancer2.desktop
endif
-man_MANS = biof.1 busyspheres.1 matrixview.1 spirographx.1 sundancer2.1
+man_MANS = biof.1 busyspheres.1 spirographx.1 sundancer2.1
EXTRA_DIST = $(man_MANS)
-
-noinst_PROGRAMS = stringify
-stringify_LDADD = @BZIP2@
-
-matrixview_LDADD = @BZIP2@ @Wand_LIBS@
-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
- ./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
-
-if WITHPTHREADS
-matrixview_LDADD += @PTHREADS@
-endif
-
-CLEANFILES = matrixview_textures.c
-
diff -ur rss-glx_0.8.2/README rss-glx_0.8.2.p/README
--- rss-glx_0.8.2/README 2008-08-31 04:38:42.000000000 +0200
+++ rss-glx_0.8.2.p/README 2008-12-16 15:43:14.000000000 +0100
@@ -1,7 +1,5 @@
Requirements:
(1) Recent gcc/g++ (2.95.x, 3.x).
(2) X11+GLX.
- (3) ImageMagick >6.2
(4) OPTIONAL: OpenAL for sound. (skyrocket)
- (5) OPTIONAL: pthreads for smoother image loading. (matrixview)
(6) OPTIONAL: GLEW for vertical refresh (all) and shaders (hyperspace).
diff -ur rss-glx_0.8.2/README.xscreensaver rss-glx_0.8.2.p/README.xscreensaver
--- rss-glx_0.8.2/README.xscreensaver 2005-04-10 04:16:42.000000000 +0200
+++ rss-glx_0.8.2.p/README.xscreensaver 2008-12-16 15:43:32.000000000 +0100
@@ -28,6 +28,5 @@
GL: "BioF" biof --root \n\
GL: "BusySpheres" busyspheres --root \n\
GL: "SpirographX" spirographx --root \n\
- GL: "MatrixView" matrixview --root \n\
-- End Here --
diff -ur rss-glx_0.8.2/utils/rss-glx_install.pl rss-glx_0.8.2.p/utils/rss-glx_install.pl
--- rss-glx_0.8.2/utils/rss-glx_install.pl 2005-04-10 04:09:41.000000000 +0200
+++ rss-glx_0.8.2.p/utils/rss-glx_install.pl 2008-12-16 15:43:55.000000000 +0100
@@ -26,7 +26,6 @@
$screensavers->{'biof'} = ' GL: "BioF" biof --root \\n\\';
$screensavers->{'busyspheres'} = ' GL: "BusySpheres" busyspheres --root \\n\\';
$screensavers->{'spirographx'} = ' GL: "SpirographX" spirographx --root \\n\\';
-$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root \\n\\';
open XSCREENSAVER, "$ENV{'HOME'}/.xscreensaver";
my @xscreensaver_config_file = <XSCREENSAVER>;

View file

@ -0,0 +1,34 @@
diff -up rss-glx_0.8.2.p/configure.in.flags rss-glx_0.8.2.p/configure.in
--- rss-glx_0.8.2.p/configure.in.flags 2008-12-16 15:51:05.000000000 +0100
+++ rss-glx_0.8.2.p/configure.in 2008-12-16 16:06:51.000000000 +0100
@@ -9,18 +9,26 @@ AC_PROG_AWK
AC_PROG_CC
AC_GNU_SOURCE
-CFLAGS=-O2
AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
[build with debugging information default=no])],
- [test "$enableval" = "yes" && CFLAGS="-g"])
+ [if test "$enableval" = "yes"; then
+ : ${CFLAGS="-g"}
+ else
+ : ${CFLAGS="-O2"}
+ fi
+ ])
CFLAGS="$CFLAGS -Wall"
AC_PROG_CXX
-CXXFLAGS=-O2
AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
[build with debugging information default=no])],
- [test "$enableval" = "yes" && CXXFLAGS="-g"])
+ [if test "$enableval" = "yes"; then
+ : ${CXXFLAGS="-g"}
+ else
+ : ${CXXFLAGS="-O2"}
+ fi
+ ])
CXXFLAGS="$CXXFLAGS -Wall"
AC_PROG_INSTALL

View file

@ -0,0 +1,12 @@
diff -up rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp.gcc43 rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp
--- rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp.gcc43 2005-04-10 01:00:43.000000000 +0200
+++ rss-glx_0.8.2.p/reallyslick/cpp_src/skyrocket_sound.cpp 2008-12-16 16:09:40.000000000 +0100
@@ -24,6 +24,7 @@
#include <AL/al.h>
#include <AL/alut.h>
+#include <cstdlib>
#include <list>
#include "loadTexture.h"
diff -up rss-glx_0.8.2.p/reallyslick/Implicit/impSurface.cpp.gcc43 rss-glx_0.8.2.p/reallyslick/Implicit/impSurface.cpp

View file

@ -1,32 +0,0 @@
diff -up rss-glx_0.9.0.p/configure.in.optflags rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0.p/configure.in.optflags 2009-08-17 15:28:29.717199402 +0200
+++ rss-glx_0.9.0.p/configure.in 2009-08-17 15:32:02.830167905 +0200
@@ -11,24 +11,28 @@ AM_PROG_CC_C_O
AC_PROG_CC_C99
AC_C_BIGENDIAN
+if test "x$CFLAGS" = x; then
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"])
+fi
if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Wall"
fi
AC_PROG_CXX
+if test "x$CXXFLAGS" = x; then
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"])
+fi
if test "x$GXX" = xyes; then
CXXFLAGS="$CXXFLAGS -Wall"
fi

View file

@ -1,82 +0,0 @@
diff -urBNw rss-glx_0.9.1/ChangeLog rss-glx_0.9.1.p/ChangeLog
--- rss-glx_0.9.1/ChangeLog 2010-01-05 03:57:27.000000000 +0100
+++ rss-glx_0.9.1.p/ChangeLog 2010-01-18 12:38:23.000000000 +0100
@@ -1,3 +1,7 @@
+****************************** Version 0.9.1.p ********************************
+
+ Removed matrixview
+
******************************* Version 0.9.1 *********************************
Added port of Pixel City, originally by Shamus Young,
diff -urBNw rss-glx_0.9.1/configure.in rss-glx_0.9.1.p/configure.in
--- rss-glx_0.9.1/configure.in 2010-01-05 03:59:13.000000000 +0100
+++ rss-glx_0.9.1.p/configure.in 2010-01-18 12:38:41.000000000 +0100
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(src/driver.c)
-AM_INIT_AUTOMAKE(rss-glx,0.9.0)
+AM_INIT_AUTOMAKE(rss-glx,0.9.0.p)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
diff -urBNw rss-glx_0.9.1/README.xscreensaver rss-glx_0.9.1.p/README.xscreensaver
--- rss-glx_0.9.1/README.xscreensaver 2010-01-05 03:38:14.000000000 +0100
+++ rss-glx_0.9.1.p/README.xscreensaver 2010-01-18 12:47:02.000000000 +0100
@@ -28,7 +28,6 @@
GL: "BioF" biof --root \n\
GL: "BusySpheres" busyspheres --root \n\
GL: "SpirographX" spirographx --root \n\
- GL: "MatrixView" matrixview --root \n\
GL: "Lorenz" lorenz --root \n\
GL: "Drempels" drempels --root \n\
GL: "Feedback" feedback --root \n\
diff -urBNw rss-glx_0.9.1/src/Makefile.am rss-glx_0.9.1.p/src/Makefile.am
--- rss-glx_0.9.1/src/Makefile.am 2010-01-04 01:44:04.000000000 +0100
+++ rss-glx_0.9.1.p/src/Makefile.am 2010-01-18 12:47:58.000000000 +0100
@@ -3,7 +3,7 @@
INCLUDES = -I$(top_srcdir)/src
AM_LDFLAGS = @GLEW@
-bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz matrixview pixelcity plasma skyrocket solarwinds spirographx sundancer2
+bin_PROGRAMS = biof busyspheres colorfire cyclone drempels euphoria feedback fieldlines flocks flux helios hufo_smoke hufo_tunnel hyperspace lattice lorenz pixelcity plasma skyrocket solarwinds spirographx sundancer2
biof_SOURCES = driver.c biof.c
busyspheres_SOURCES = driver.c busyspheres.c
@@ -33,9 +33,6 @@
lattice_LDADD = @BZIP2@
lorenz_SOURCES = driver.c lorenz.cpp
lorenz_LDADD = -LrsMath -lrsMath
-matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
-matrixview_CFLAGS = @Wand_CFLAGS@
-matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
pixelcity_SOURCES = driver.c
pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
@@ -75,9 +72,6 @@
lattice_textures.c: stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex
./stringify lattice_textures/brasstex lattice_textures/chrometex lattice_textures/circuittex lattice_textures/crystex lattice_textures/doughtex lattice_textures/ghostlytex lattice_textures/indtex1 lattice_textures/indtex2 lattice_textures/shinytex > lattice_textures.c
-matrixview_textures.c: stringify matrixview_textures/cfont matrixview_textures/cpics
- ./stringify matrixview_textures/cfont matrixview_textures/cpics > matrixview_textures.c
-
skyrocket_textures.cpp: stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5
./stringify skyrocket_textures/cloudmap skyrocket_textures/earthnearmap skyrocket_textures/earthfarmap skyrocket_textures/earthlightmap skyrocket_textures/moontint skyrocket_textures/moonalpha skyrocket_textures/presmoke1 skyrocket_textures/presmoke2 skyrocket_textures/presmoke3 skyrocket_textures/presmoke4 skyrocket_textures/presmoke5 > skyrocket_textures.cpp
@@ -115,4 +109,4 @@
skyrocket_LDADD = @BZIP2@ -LrsMath -lrsMath
endif
-CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c matrixview_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
+CLEANFILES = colorfire_textures.cpp euphoria_textures.c hufo_tunnel_textures.cpp lattice_textures.c skyrocket_textures.cpp skyrocket_boomsound.cpp skyrocket_launchsound.cpp skyrocket_nukesound.cpp skyrocket_poppersound.cpp skyrocket_sucksound.cpp skyrocket_whistlesound.cpp spheremap.cpp nebulamap.cpp
diff -urBNw rss-glx_0.9.1/utils/rss-glx_install.pl rss-glx_0.9.1.p/utils/rss-glx_install.pl
--- rss-glx_0.9.1/utils/rss-glx_install.pl 2010-01-05 03:38:40.000000000 +0100
+++ rss-glx_0.9.1.p/utils/rss-glx_install.pl 2010-01-18 12:48:17.000000000 +0100
@@ -26,7 +26,6 @@
$screensavers->{'biof'} = ' GL: "BioF" biof --root \\n\\';
$screensavers->{'busyspheres'} = ' GL: "BusySpheres" busyspheres --root \\n\\';
$screensavers->{'spirographx'} = ' GL: "SpirographX" spirographx --root \\n\\';
-$screensavers->{'matrixview'} = ' GL: "MatrixView" matrixview --root \\n\\';
$screensavers->{'lorenz'} = ' GL: "Lorenz" lorenz --root \\n\\';
$screensavers->{'drempels'} = ' GL: "Drempels" drempels --root \\n\\';
$screensavers->{'feedback'} = ' GL: "Feedback" feedback --root \\n\\';

View file

@ -1,12 +0,0 @@
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_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

View file

@ -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);
}

View file

@ -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 <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@

View file

@ -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 <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 {

View file

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

View file

@ -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\

View file

@ -3,7 +3,7 @@
MV_FILES="matrixview.1 matrixview.c matrixview.desktop matrixview_textures matrixview_textures.h matrixview.xml"
mv_files=
for i in $MV_FILES; do
mv_files="$mv_files src/$i"
mv_files="$mv_files other_src/$i"
done
usage() {

View file

@ -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\

View file

@ -1,54 +1,68 @@
%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
Version: 0.8.2%{patchext}
Release: 1%{?dist}
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:
# Source0: http://downloads.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
# Source0: http://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
Source0: rss-glx_%{version}.tar.bz2
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
Source3: rss-glx-0.8.2-0.8.2.p.diff
Patch0: rss-glx-0.8.2.p-flags.patch
Patch1: rss-glx-0.8.2.p-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: glew-devel
BuildRequires: quesoglc-devel
BuildRequires: ImageMagick-devel >= 6.4
%if %{with matrixview}
BuildRequires: ImageMagick-devel >= 6.2.5.4
%endif
%if %{with modular_x}
BuildRequires: libICE-devel
BuildRequires: libSM-devel
@ -62,9 +76,12 @@ BuildRequires: freealut-devel
BuildRequires: gawk
BuildRequires: sed
%if 0%{?fedora} >= 33
Obsoletes: %{name}-gnome-screensaver < 0.9.1.p-43
%endif
## the following deps are needed for autoreconf after applying patches
# no translations -> no gettext needed
#BuildRequires: gettext
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%description
A port of the Really Slick Screensavers to GLX. Provides several visually
@ -76,6 +93,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 +101,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 +111,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 +151,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 +167,124 @@ Build settings:
%else
- without modular xscreensaver support
%endif
EOF
%autosetup -p1 -n rss-glx_%{version}
%build
%configure \
--with-configdir=%{xssconfigdir} \
--program-prefix=rss-glx-
%make_build
%install
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
mkdir -p %{buildroot}%{xssbindir}
mkdir -p %{buildroot}%{xssexthacksconfdir}
%if %{with matrixview}
install -m 0644 "%SOURCE4" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
%if %{with kde4}
- with KDE4 support in: %kdessconfigdir
%else
install -m 0644 "%SOURCE5" %{buildroot}%{xssexthacksconfdir}/rss-glx.conf
- with KDE3 support in: %kdessconfigdir
%endif
cd %buildroot/%{_bindir}/
for file in rss-glx*; do
ln -snf "%{_bindir}/${file}" "%{buildroot}%{xssbindir}/${file}"
EOF
%setup -q -n rss-glx_%{version}
%patch0 -p1 -b .flags
%patch1 -p1 -b .gcc43
# work around BZ #189928
for f in `find . -type l` ; do
cp -p ${f} ${f}_
unlink ${f}
mv ${f}_ $f
done
cd %buildroot/%{xssconfigdir}/
for file in *.xml; do
mv -f ${file} rss-glx-${file}
done
%build
autoreconf -i
%configure \
--with-configdir=%{xssconfigdir} \
--with-kdessconfigdir=%{kdessconfigdir} \
--program-prefix=rss-glx-
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 %{buildroot}%{_bindir}/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§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.
Euphoria§euphoria§Psychedelic shapes.
Fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
Flocks§flocks§Flocks of birds.
Flux§flux§If you know anything about strange attractors, you might recognize the patterns created by this screensaver.
Helios§helios§Throw together some attraction/repulsion particle effects and some smooth implicit surfaces and this is what you get.
Hufo's Smoke§hufo_smoke§Smoke effect.
Hufo's Tunnel§hufo_tunnel§Inside a tunnel.
Hyperspace§hyperspace§Hyperspace.
Lattice§lattice§Fly through an endless world of linked rings.
%if %{with matrixview}
MatrixView§matrixview§The Matrix.
%endif
Plasma§plasma§Probably the second most psychedelic screensaver in existence.
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
%clean
rm -rf %buildroot
%if %{with modular_xss}
%post xscreensaver
@ -157,243 +299,35 @@ fi
%endif
%files
%doc ChangeLog COPYING INSTALL
%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.1-0.9.1.p.diff
%defattr(-, root, root)
%doc ChangeLog COPYING INSTALL README
%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.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 <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
* Tue Jan 10 2017 Orion Poplawski <orion@cora.nwra.com> - 0.9.1.p-28
- Rebuild for glew 2.0.0
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1.p-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jan 19 2016 Nils Philippsen <nils@redhat.com>
- use %%global instead of %%define
* Thu Jan 14 2016 Adam Jackson <ajax@redhat.com> - 0.9.1.p-26
- Rebuild for glew 1.13
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue Apr 28 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.9.1.p-24
- F-22+: Obsoletes -kde subpackage
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Apr 02 2014 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-20
- fix date in changelog
* Tue Apr 01 2014 josef radinger <cheese@nosuchhost.net> - 0.9.1.p-19
- rename xml-files (#744862)
* Mon Nov 18 2013 Dave Airlie <airlied@redhat.com> - 0.9.1.p-18
- rebuilt for GLEW 1.10
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> - 0.9.1.p-16
- Rebuild for broken deps in rawhide
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> - 0.9.1.p-14
- Rebuild for glew 1.9.0
* Wed Aug 01 2012 Adam Jackson <ajax@redhat.com> - 0.9.1.p-13
- -Rebuild for new glew
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1.p-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Apr 13 2012 Tom Callawau <spot@fedoraproject.org> - 0.9.1.p-11
- rebuild for new ImageMagick
* Tue Jan 10 2012 Nils Philippsen <nils@redhat.com> - 0.9.1.p-10
- rebuild for gcc 4.7
* Mon Jul 04 2011 Nils Philippsen <nils@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0.9.1.p-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Mon Oct 11 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-6
- fix silent skyrocket desktop filename (#617531)
* Wed Sep 29 2010 jkeating - 0.9.1.p-5
- Rebuilt for gcc bug 634757
* Wed Sep 15 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-4
- rebuild for new ImageMagick
* Sun Apr 11 2010 Caolán McNamara <caolanm@redhat.com> 0.9.1.p-3
- Resolves: rhbz#564845 Fix ImplicitDSOLinking
* Tue Jan 26 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-2
- add autoreconf patch, the optflags patch isn't worth much without it
(#558561)
* Mon Jan 18 2010 Nils Philippsen <nils@redhat.com> 0.9.1.p-1
- version 0.9.1.p
- remove autofoo patch
- add BR: quesoglc-devel for new pixelcity hack
- bump BR: ImageMagick-devel >= 6.4
* Tue Sep 01 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-3
- don't ship prefixed rss-glx-rss-glx_install.pl
* Tue Aug 18 2009 Nils Philippsen <nils@redhat.com>
- explain autofoo patch
* Mon Aug 17 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-2
- don't rebuild autofoo files
* Mon Aug 17 2009 Nils Philippsen <nils@redhat.com> 0.9.0.p-1
- version 0.9.0.p
- build with GLEW
- don't distribute README
- replace flags by optflags patch
- remove obsolete gcc-4.3 patch
- remove symlinked source files workaround (#189928)
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2.p-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2.p-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Dec 22 2008 Nils Philippsen <nils@redhat.com> 0.8.2.p-1
- use autoreconf to avoid using non-matching ltmain.sh
@ -415,7 +349,7 @@ fi
- -kde: drop Requires: kdebase (kdeartwork dep is enough)
- fix %%kdessconfigdir for kde4
* Thu Jan 31 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.8.1.p-18
* Fri Jan 31 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.8.1.p-18
- Fix build with gcc43
* Mon Nov 05 2007 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-17
@ -441,10 +375,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
@ -461,7 +395,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

View file

@ -1,2 +1 @@
bc420d230634fe8d3bbc79dc6a3c6678 rss-glx_0.9.1.p.tar.bz2
86fdbdf7e06b184c70c1280c5a030021 rss-glx-0.9.1.p-6-autoreconf.patch.bz2
f5c04adbb538a6d74ce50ef091428021 rss-glx_0.8.2.p.tar.bz2