Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
1f1b39fd2b | ||
|
1f9e13f7a9 | ||
|
ff12150960 | ||
|
|
681d201bb7 | ||
|
|
a3d7bd6f72 | ||
|
|
8b1cb19aaa | ||
|
ad868a7bb7 |
12 changed files with 208 additions and 271 deletions
|
|
@ -1 +0,0 @@
|
|||
rss-glx_0.8.1.p.tar.bz2
|
||||
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
rss-glx_0.9.0.p.tar.bz2
|
||||
rss-glx-0.9.0-autofoo.patch.bz2
|
||||
21
Makefile
21
Makefile
|
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: rss-glx
|
||||
# $Id$
|
||||
NAME := rss-glx
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
diff -ur rss-glx_0.8.1/ChangeLog rss-glx_0.8.1.p/ChangeLog
|
||||
--- rss-glx_0.8.1/ChangeLog 2006-02-25 23:02:11.000000000 +0100
|
||||
+++ rss-glx_0.8.1.p/ChangeLog 2006-03-10 15:25:10.000000000 +0100
|
||||
@@ -1,3 +1,7 @@
|
||||
+****************************** Version 0.8.1.p ********************************
|
||||
+
|
||||
+ Removed matrixview
|
||||
+
|
||||
******************************* Version 0.8.1 *********************************
|
||||
|
||||
Pulled in vroot.h patch from Ari Pollak's Debian package.
|
||||
diff -ur rss-glx_0.8.1/configure.in rss-glx_0.8.1.p/configure.in
|
||||
--- rss-glx_0.8.1/configure.in 2006-02-25 22:10:54.000000000 +0100
|
||||
+++ rss-glx_0.8.1.p/configure.in 2006-03-10 15:38:37.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.1.p)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
# Checks for programs.
|
||||
@@ -177,9 +177,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.1/other_src/Makefile.am rss-glx_0.8.1.p/other_src/Makefile.am
|
||||
--- rss-glx_0.8.1/other_src/Makefile.am 2006-02-25 22:14:53.000000000 +0100
|
||||
+++ rss-glx_0.8.1.p/other_src/Makefile.am 2006-03-10 15:21:57.000000000 +0100
|
||||
@@ -1,35 +1,20 @@
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
|
||||
|
||||
-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.1/README rss-glx_0.8.1.p/README
|
||||
--- rss-glx_0.8.1/README 2006-02-25 22:47:58.000000000 +0100
|
||||
+++ rss-glx_0.8.1.p/README 2006-03-10 15:38:44.000000000 +0100
|
||||
@@ -1,6 +1,4 @@
|
||||
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)
|
||||
diff -ur rss-glx_0.8.1/README.xscreensaver rss-glx_0.8.1.p/README.xscreensaver
|
||||
--- rss-glx_0.8.1/README.xscreensaver 2005-04-10 04:16:42.000000000 +0200
|
||||
+++ rss-glx_0.8.1.p/README.xscreensaver 2006-03-10 15:25:26.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.1/utils/rss-glx_install.pl rss-glx_0.8.1.p/utils/rss-glx_install.pl
|
||||
--- rss-glx_0.8.1/utils/rss-glx_install.pl 2005-04-10 04:09:41.000000000 +0200
|
||||
+++ rss-glx_0.8.1.p/utils/rss-glx_install.pl 2006-03-10 15:24:13.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>;
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
--- rss-glx_0.8.1.p/configure.in.flags 2006-06-02 11:38:10.000000000 +0200
|
||||
+++ rss-glx_0.8.1.p/configure.in 2006-06-02 12:29:35.000000000 +0200
|
||||
@@ -7,17 +7,27 @@
|
||||
AC_PROG_AWK
|
||||
|
||||
AC_PROG_CC
|
||||
-CFLAGS=-g
|
||||
AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
|
||||
[build with debugging information default=yes])],
|
||||
- [test "$enableval" = "no" && CFLAGS="-O2"])
|
||||
+ [
|
||||
+ if test "$enableval" = "no"; then
|
||||
+ : ${CFLAGS="-O2"}
|
||||
+ else
|
||||
+ : ${CFLAGS="-g"}
|
||||
+ fi
|
||||
+ ])
|
||||
CFLAGS="$CFLAGS -Wall"
|
||||
|
||||
AC_PROG_CXX
|
||||
-CXXFLAGS=-g
|
||||
AC_ARG_ENABLE([debug], [AC_HELP_STRING([--enable-debug],
|
||||
[build with debugging information default=yes])],
|
||||
- [test "$enableval" = "no" && CXXFLAGS="-O2"])
|
||||
+ [
|
||||
+ if test "$enableval" = "no"; then
|
||||
+ : ${CXXFLAGS="-O2"}
|
||||
+ else
|
||||
+ : ${CXXFLAGS="-g"}
|
||||
+ fi
|
||||
+ ])
|
||||
CXXFLAGS="$CXXFLAGS -Wall"
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
--- rss-glx_0.8.1.p/configure.in.freealut 2006-03-10 15:38:37.000000000 +0100
|
||||
+++ rss-glx_0.8.1.p/configure.in 2006-03-28 17:38:02.000000000 +0200
|
||||
@@ -114,14 +114,30 @@
|
||||
if test "x$ac_cv_header_AL_alut_h" = "xyes" ; then
|
||||
# Check for OpenAL library
|
||||
AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
|
||||
+ alut_libs_sav="$LIBS"
|
||||
+ if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
|
||||
+ echo "... checking with separate -lalut";
|
||||
+ unset ac_cv_lib_openal_alutInit
|
||||
+ LIBS="$LIBS -lalut"
|
||||
+ AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
|
||||
+ fi
|
||||
+ LIBS="$alut_libs_sav"
|
||||
|
||||
if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
|
||||
- libs_sav=$LIBS
|
||||
+ libs_sav="$LIBS"
|
||||
LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS -L/usr/local/lib"
|
||||
|
||||
echo "Hrm, maybe -lopenal is in /usr/local/lib";
|
||||
unset ac_cv_lib_openal_alutInit
|
||||
AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, -lopenal) AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
|
||||
+ alut_libs_sav="$LIBS"
|
||||
+ if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
|
||||
+ echo "... checking with separate -lalut";
|
||||
+ unset ac_cv_lib_openal_alutInit
|
||||
+ LIBS="$LIBS -lalut"
|
||||
+ AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
|
||||
+ fi
|
||||
+ LIBS="$alut_libs_sav"
|
||||
|
||||
if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
|
||||
# For FreeBSD -current
|
||||
@@ -132,6 +148,12 @@
|
||||
|
||||
unset ac_cv_lib_openal_alutInit
|
||||
AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
|
||||
+ if test "x$ac_cv_lib_openal_alutInit" = "xno" ; then
|
||||
+ echo "... checking with separate -lalut";
|
||||
+ unset ac_cv_lib_openal_alutInit
|
||||
+ LIBS="$LIBS -lalut"
|
||||
+ AC_CHECK_LIB([openal], [alutInit], AC_SUBST(OPENAL, "-lopenal -lalut -lc_r") AC_DEFINE([HAVE_OPENAL], [], [OpenAL is available for use.]))
|
||||
+ fi
|
||||
|
||||
LIBS=$libs_cr_sav
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -upNr rss-glx_0.8.1.p.orign/reallyslick/cpp_src/skyrocket_sound.cpp rss-glx_0.8.1.p/reallyslick/cpp_src/skyrocket_sound.cpp
|
||||
--- rss-glx_0.8.1.p.orign/reallyslick/cpp_src/skyrocket_sound.cpp 2005-04-10 01:00:43.000000000 +0200
|
||||
+++ rss-glx_0.8.1.p/reallyslick/cpp_src/skyrocket_sound.cpp 2008-01-04 14:36:38.000000000 +0100
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <AL/al.h>
|
||||
#include <AL/alut.h>
|
||||
|
||||
+#include <cstdlib>
|
||||
#include <list>
|
||||
|
||||
#include "loadTexture.h"
|
||||
diff -upNr rss-glx_0.8.1.p.orign/reallyslick/Implicit/impSurface.cpp rss-glx_0.8.1.p/reallyslick/Implicit/impSurface.cpp
|
||||
--- rss-glx_0.8.1.p.orign/reallyslick/Implicit/impSurface.cpp 2005-04-09 22:13:51.000000000 +0200
|
||||
+++ rss-glx_0.8.1.p/reallyslick/Implicit/impSurface.cpp 2008-01-04 14:37:07.000000000 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <Implicit/impSurface.h>
|
||||
#include <math.h>
|
||||
#include <iostream>
|
||||
+#include <cstring>
|
||||
|
||||
|
||||
|
||||
91
rss-glx-0.9.0-0.9.0.p.diff
Normal file
91
rss-glx-0.9.0-0.9.0.p.diff
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
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\\';
|
||||
32
rss-glx-0.9.0.p-optflags.patch
Normal file
32
rss-glx-0.9.0.p-optflags.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
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
|
||||
|
|
@ -87,17 +87,16 @@ set -x
|
|||
for i in $mv_files; do
|
||||
rm -r "$i" || exit 4
|
||||
done
|
||||
set +x
|
||||
|
||||
echo "Applying diff file."
|
||||
patch -p1 < "$diff_file" || exit 5
|
||||
cat "$diff_file" | patch -p1 || exit 5
|
||||
set +x
|
||||
|
||||
|
||||
echo 'Regenerating auto* files:'
|
||||
set -x
|
||||
aclocal || exit 6
|
||||
automake || exit 7
|
||||
autoconf || exit 8
|
||||
rm -f config.guess config.sub ltmain.sh || :
|
||||
autoreconf -i || exit 6
|
||||
rm -rf autom4te.cache || :
|
||||
set +x
|
||||
|
||||
|
|
|
|||
111
rss-glx.spec
111
rss-glx.spec
|
|
@ -43,27 +43,28 @@
|
|||
|
||||
Summary: Really Slick Screensavers
|
||||
Name: rss-glx
|
||||
Version: 0.8.1%{patchext}
|
||||
Release: 20%{?dist}
|
||||
Version: 0.9.0%{patchext}
|
||||
Release: 3%{?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.1-0.8.1.p.diff
|
||||
Patch0: rss-glx-0.8.1-freealut.patch
|
||||
Patch1: rss-glx-0.8.1-flags.patch
|
||||
Patch2: rss-glx-0.8.1-gcc43-buildfix.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
|
||||
# don't run autoreconf when building
|
||||
Patch1: rss-glx-0.9.0-autofoo.patch.bz2
|
||||
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
|
||||
|
|
@ -73,10 +74,7 @@ BuildRequires: libXt-devel
|
|||
BuildRequires: xorg-x11-devel
|
||||
%endif
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: openal-devel
|
||||
BuildRequires: freealut-devel
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: libtool
|
||||
BuildRequires: gawk
|
||||
BuildRequires: sed
|
||||
|
||||
|
|
@ -172,19 +170,10 @@ Build settings:
|
|||
|
||||
EOF
|
||||
%setup -q -n rss-glx_%{version}
|
||||
%patch0 -p1 -b .freealut
|
||||
%patch1 -p1 -b .flags
|
||||
%patch2 -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
|
||||
%patch1 -p1 -b .autofoo
|
||||
|
||||
%build
|
||||
autoconf
|
||||
%configure \
|
||||
--with-configdir=%{xssconfigdir} \
|
||||
--with-kdessconfigdir=%{kdessconfigdir} \
|
||||
|
|
@ -203,7 +192,6 @@ generate_fix_desktop_files_links () {
|
|||
cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
|
||||
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=${name}
|
||||
Comment=${desc}
|
||||
TryExec=${trycmd}
|
||||
|
|
@ -218,7 +206,23 @@ EOF
|
|||
# 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 { print; }}' < "${origtrycmd}.desktop" | sed 's@^Exec=\(.*\)'"$origtrycmd"'\(.*\)$@Exec=\1'"$trycmd"'\2@g' > "${trycmd}.desktop"
|
||||
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
|
||||
|
|
@ -234,7 +238,8 @@ EOF
|
|||
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
|
||||
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}
|
||||
|
|
@ -246,19 +251,22 @@ BioF§biof§This is an attempt to recreate some of the work of William Latham.
|
|||
Busy Spheres§busyspheres§Spheres made of dancing particles.
|
||||
Colorfire§colorfire§Burning colors.
|
||||
Cyclone§cyclone§A cyclone made of particles.
|
||||
Drempels§drempels§A hallucinatory desktop enhancer.
|
||||
Euphoria§euphoria§Psychedelic shapes.
|
||||
Feedback§feedback§Stirring colors with a jiggling warp.
|
||||
Fieldlines§fieldlines§A simulation of the electric field lines between charged particles.
|
||||
Flocks§flocks§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.
|
||||
|
|
@ -283,8 +291,8 @@ fi
|
|||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc ChangeLog COPYING INSTALL README
|
||||
%doc README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.1-0.8.1.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}/*/*
|
||||
|
||||
|
|
@ -311,6 +319,41 @@ fi
|
|||
%{kdessconfigdir}/*.desktop
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* Wed Dec 17 2008 Nils Philippsen <nils@redhat.com>
|
||||
- correct KDE desktop files so that they work with KDE 4.1
|
||||
- remove encoding lines from desktop files as they're deprecated
|
||||
|
||||
* Tue Dec 16 2008 Nils Philippsen <nils@redhat.com>
|
||||
- version 0.8.2.p
|
||||
- remove obsolete freealut patch
|
||||
- update flags, gcc43 patches
|
||||
|
||||
* Thu May 29 2008 Nils Philippsen <nphilipp@redhat.com> 0.8.1.p-20
|
||||
- use %%bcond, %%with macros for consistency
|
||||
- don't use quotes around %%fedora macro to make it work with Fedora 10
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
17870ad88d3a61ace94c04cb7677ddbf rss-glx_0.8.1.p.tar.bz2
|
||||
95f9c42e1172b65fa9d8c182500a0944 rss-glx_0.9.0.p.tar.bz2
|
||||
aaa6755b6ddc04a6597fac6ed1984339 rss-glx-0.9.0-autofoo.patch.bz2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue