rpms/rss-glx/devel rss-glx-0.9.0-0.9.0.p.diff, NONE, 1.1 rss-glx-0.9.0.p-optflags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rss-glx-rm-matrixview.sh, 1.5, 1.6 rss-glx.spec, 1.31, 1.32 sources, 1.6, 1.7 rss-glx-0.8.2-0.8.2.p.diff, 1.1, NONE rss-glx-0.8.2.p-flags.patch, 1.1, NONE rss-glx-0.8.2.p-gcc43.patch, 1.1, NONE
Nils Philippsen
nphilipp at fedoraproject.org
Mon Aug 17 15:09:38 UTC 2009
- Previous message: rpms/sunbird/devel .cvsignore,1.12,1.13 sources,1.12,1.13
- Next message: rpms/unbound/devel .cvsignore, 1.8, 1.9 sources, 1.12, 1.13 unbound.spec, 1.31, 1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nphilipp
Update of /cvs/pkgs/rpms/rss-glx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1242
Modified Files:
.cvsignore rss-glx-rm-matrixview.sh rss-glx.spec sources
Added Files:
rss-glx-0.9.0-0.9.0.p.diff rss-glx-0.9.0.p-optflags.patch
Removed Files:
rss-glx-0.8.2-0.8.2.p.diff rss-glx-0.8.2.p-flags.patch
rss-glx-0.8.2.p-gcc43.patch
Log Message:
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)
rss-glx-0.9.0-0.9.0.p.diff:
ChangeLog | 4 ++++
README | 1 -
README.xscreensaver | 1 -
configure.in | 2 +-
src/Makefile.am | 10 ++--------
utils/rss-glx_install.pl | 1 -
6 files changed, 7 insertions(+), 12 deletions(-)
--- NEW FILE rss-glx-0.9.0-0.9.0.p.diff ---
diff -urBNw rss-glx_0.9.0/ChangeLog rss-glx_0.9.0.p/ChangeLog
--- rss-glx_0.9.0/ChangeLog 2009-05-17 01:03:38.000000000 +0200
+++ rss-glx_0.9.0.p/ChangeLog 2009-08-17 14:58:18.273168054 +0200
@@ -1,3 +1,7 @@
+****************************** Version 0.9.0.p ********************************
+
+ Removed matrixview
+
******************************* Version 0.9.0 *********************************
Added port of drempels, originally by Ryan M. Geiss,
diff -urBNw rss-glx_0.9.0/configure.in rss-glx_0.9.0.p/configure.in
--- rss-glx_0.9.0/configure.in 2009-05-19 17:12:01.000000000 +0200
+++ rss-glx_0.9.0.p/configure.in 2009-08-17 15:00:57.538167383 +0200
@@ -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.0/README rss-glx_0.9.0.p/README
--- rss-glx_0.9.0/README 2008-08-31 04:38:42.000000000 +0200
+++ rss-glx_0.9.0.p/README 2009-08-17 15:04:45.620179698 +0200
@@ -3,5 +3,4 @@
(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 -urBNw rss-glx_0.9.0/README.xscreensaver rss-glx_0.9.0.p/README.xscreensaver
--- rss-glx_0.9.0/README.xscreensaver 2009-04-13 20:30:58.000000000 +0200
+++ rss-glx_0.9.0.p/README.xscreensaver 2009-08-17 15:04:55.724168053 +0200
@@ -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\
-- End Here --
diff -urBNw rss-glx_0.9.0/src/Makefile.am rss-glx_0.9.0.p/src/Makefile.am
--- rss-glx_0.9.0/src/Makefile.am 2009-05-19 02:13:52.000000000 +0200
+++ rss-glx_0.9.0.p/src/Makefile.am 2009-08-17 15:03:54.259165189 +0200
@@ -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 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 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
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
@@ -73,9 +70,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
@@ -113,4 +107,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.0/utils/rss-glx_install.pl rss-glx_0.9.0.p/utils/rss-glx_install.pl
--- rss-glx_0.9.0/utils/rss-glx_install.pl 2009-05-19 16:36:29.000000000 +0200
+++ rss-glx_0.9.0.p/utils/rss-glx_install.pl 2009-08-17 15:05:08.531419223 +0200
@@ -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\\';
rss-glx-0.9.0.p-optflags.patch:
configure.in | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE rss-glx-0.9.0.p-optflags.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 17 Dec 2008 16:36:54 -0000 1.3
+++ .cvsignore 17 Aug 2009 15:09:38 -0000 1.4
@@ -1 +1 @@
-rss-glx_0.8.2.p.tar.bz2
+rss-glx_0.9.0.p.tar.bz2
Index: rss-glx-rm-matrixview.sh
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx-rm-matrixview.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rss-glx-rm-matrixview.sh 18 Dec 2008 11:05:02 -0000 1.5
+++ rss-glx-rm-matrixview.sh 17 Aug 2009 15:09:38 -0000 1.6
@@ -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 other_src/$i"
+ mv_files="$mv_files src/$i"
done
usage() {
Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/rss-glx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- rss-glx.spec 27 Jul 2009 03:16:13 -0000 1.31
+++ rss-glx.spec 17 Aug 2009 15:09:38 -0000 1.32
@@ -43,26 +43,26 @@
Summary: Really Slick Screensavers
Name: rss-glx
-Version: 0.8.2%{patchext}
-Release: 3%{?dist}
+Version: 0.9.0%{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://dl.sourceforge.net/sourceforge/rss-glx/rss-glx_%{version}.tar.bz2
+# Source0: http://downloads.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.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
+Source3: rss-glx-0.9.0-0.9.0.p.diff
+# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
+Patch0: rss-glx-0.9.0.p-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-%if %{with matrixview}
+BuildRequires: glew-devel
BuildRequires: ImageMagick-devel >= 6.2.5.4
-%endif
%if %{with modular_x}
BuildRequires: libICE-devel
BuildRequires: libSM-devel
@@ -175,15 +175,7 @@ Build settings:
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
+%patch0 -p1 -b .optflags
%build
autoreconf -i
@@ -263,19 +255,22 @@ BioF§biof§This is an attempt to recrea
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§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.
+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§Hyperspace.
+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
-Plasma§plasma§Probably the second most psychedelic screensaver in existence.
+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.
@@ -300,8 +295,8 @@ fi
%files
%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
+%doc ChangeLog COPYING INSTALL
+%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.9.0-0.9.0.p.diff
%{_bindir}/*
%{_mandir}/*/*
@@ -328,6 +323,14 @@ fi
%{kdessconfigdir}/*.desktop
%changelog
+* Mon Aug 17 2009 Nils Philippsen <nils at 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 at lists.fedoraproject.org> - 0.8.2.p-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 18 Dec 2008 11:05:02 -0000 1.6
+++ sources 17 Aug 2009 15:09:38 -0000 1.7
@@ -1 +1 @@
-f5c04adbb538a6d74ce50ef091428021 rss-glx_0.8.2.p.tar.bz2
+95f9c42e1172b65fa9d8c182500a0944 rss-glx_0.9.0.p.tar.bz2
--- rss-glx-0.8.2-0.8.2.p.diff DELETED ---
--- rss-glx-0.8.2.p-flags.patch DELETED ---
--- rss-glx-0.8.2.p-gcc43.patch DELETED ---
- Previous message: rpms/sunbird/devel .cvsignore,1.12,1.13 sources,1.12,1.13
- Next message: rpms/unbound/devel .cvsignore, 1.8, 1.9 sources, 1.12, 1.13 unbound.spec, 1.31, 1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list