Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
9e1b8f2c09 | ||
|
09aaee90d4 | ||
|
|
127f9b4f0f | ||
|
a9f846aa93 | ||
|
|
6a73e288d4 | ||
|
|
d935022fe6 | ||
|
|
071ad8764f | ||
|
|
acc0031283 | ||
|
a780794595 |
11 changed files with 349 additions and 211 deletions
|
|
@ -1 +0,0 @@
|
|||
rss-glx_0.8.2.p.tar.bz2
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
rss-glx_0.9.1.p.tar.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,108 +0,0 @@
|
|||
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>;
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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
|
||||
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
|
||||
82
rss-glx-0.9.1-0.9.1.p.diff
Normal file
82
rss-glx-0.9.1-0.9.1.p.diff
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
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\\';
|
||||
177
rss-glx-0.9.1.p-autoreconf.patch
Normal file
177
rss-glx-0.9.1.p-autoreconf.patch
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
diff -up rss-glx_0.9.1.p/configure.autoreconf rss-glx_0.9.1.p/configure
|
||||
--- rss-glx_0.9.1.p/configure.autoreconf 2010-01-18 12:52:02.000000000 +0100
|
||||
+++ rss-glx_0.9.1.p/configure 2010-01-26 16:19:16.475525018 +0100
|
||||
@@ -5362,6 +5362,7 @@ $as_echo "$as_me: error: unknown endiann
|
||||
esac
|
||||
|
||||
|
||||
+if test "x$CFLAGS" = x; then
|
||||
if test "x$GCC" = xyes; then
|
||||
CFLAGS="-O2"
|
||||
fi
|
||||
@@ -5370,6 +5371,7 @@ if test "${enable_debug+set}" = set; the
|
||||
enableval=$enable_debug; test "$enableval" = "yes" && CFLAGS="-g"
|
||||
fi
|
||||
|
||||
+fi
|
||||
if test "x$GCC" = xyes; then
|
||||
CFLAGS="$CFLAGS -Wall"
|
||||
fi
|
||||
@@ -5874,6 +5876,7 @@ fi
|
||||
|
||||
|
||||
|
||||
+if test "x$CXXFLAGS" = x; then
|
||||
if test "x$GXX" = xyes; then
|
||||
CXXFLAGS="-O2"
|
||||
fi
|
||||
@@ -5882,6 +5885,7 @@ if test "${enable_debug+set}" = set; the
|
||||
enableval=$enable_debug; test "$enableval" = "yes" && CXXFLAGS="-g"
|
||||
fi
|
||||
|
||||
+fi
|
||||
if test "x$GXX" = xyes; then
|
||||
CXXFLAGS="$CXXFLAGS -Wall"
|
||||
fi
|
||||
@@ -6578,13 +6582,13 @@ if test "${lt_cv_nm_interface+set}" = se
|
||||
else
|
||||
lt_cv_nm_interface="BSD nm"
|
||||
echo "int some_variable = 0;" > conftest.$ac_ext
|
||||
- (eval echo "\"\$as_me:6581: $ac_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:6585: $ac_compile\"" >&5)
|
||||
(eval "$ac_compile" 2>conftest.err)
|
||||
cat conftest.err >&5
|
||||
- (eval echo "\"\$as_me:6584: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
+ (eval echo "\"\$as_me:6588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
||||
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
||||
cat conftest.err >&5
|
||||
- (eval echo "\"\$as_me:6587: output\"" >&5)
|
||||
+ (eval echo "\"\$as_me:6591: output\"" >&5)
|
||||
cat conftest.out >&5
|
||||
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
||||
lt_cv_nm_interface="MS dumpbin"
|
||||
@@ -7789,7 +7793,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
- echo '#line 7792 "configure"' > conftest.$ac_ext
|
||||
+ echo '#line 7796 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@@ -9862,11 +9866,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:9865: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:9869: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
- echo "$as_me:9869: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:9873: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -10201,11 +10205,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:10204: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:10208: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
- echo "$as_me:10208: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:10212: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -10306,11 +10310,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:10309: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
- echo "$as_me:10313: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:10317: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -10361,11 +10365,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:10364: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:10368: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
- echo "$as_me:10368: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:10372: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -13164,7 +13168,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
-#line 13167 "configure"
|
||||
+#line 13171 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -13260,7 +13264,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
-#line 13263 "configure"
|
||||
+#line 13267 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@@ -15280,11 +15284,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:15283: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:15287: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
- echo "$as_me:15287: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:15291: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@@ -15379,11 +15383,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:15382: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:15386: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
- echo "$as_me:15386: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:15390: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@@ -15431,11 +15435,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
- (eval echo "\"\$as_me:15434: $lt_compile\"" >&5)
|
||||
+ (eval echo "\"\$as_me:15438: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
- echo "$as_me:15438: \$? = $ac_status" >&5
|
||||
+ echo "$as_me:15442: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
90
rss-glx.spec
90
rss-glx.spec
|
|
@ -43,26 +43,28 @@
|
|||
|
||||
Summary: Really Slick Screensavers
|
||||
Name: rss-glx
|
||||
Version: 0.8.2%{patchext}
|
||||
Version: 0.9.1%{patchext}
|
||||
Release: 2%{?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.1-0.9.1.p.diff
|
||||
# https://sourceforge.net/tracker/?func=detail&aid=2839037&group_id=67131&atid=517003
|
||||
Patch0: rss-glx-0.9.0.p-optflags.patch
|
||||
Patch1: rss-glx-0.9.1.p-autoreconf.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
BuildRequires: libGL-devel
|
||||
BuildRequires: libGLU-devel
|
||||
%if %{with matrixview}
|
||||
BuildRequires: ImageMagick-devel >= 6.2.5.4
|
||||
%endif
|
||||
BuildRequires: glew-devel
|
||||
BuildRequires: quesoglc-devel
|
||||
BuildRequires: ImageMagick-devel >= 6.4
|
||||
%if %{with modular_x}
|
||||
BuildRequires: libICE-devel
|
||||
BuildRequires: libSM-devel
|
||||
|
|
@ -76,13 +78,6 @@ BuildRequires: freealut-devel
|
|||
BuildRequires: gawk
|
||||
BuildRequires: sed
|
||||
|
||||
## 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
|
||||
impressive and graphically intensive screensavers.
|
||||
|
|
@ -175,18 +170,10 @@ 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
|
||||
%patch1 -p1 -b .autoreconf
|
||||
|
||||
%build
|
||||
autoreconf -i
|
||||
%configure \
|
||||
--with-configdir=%{xssconfigdir} \
|
||||
--with-kdessconfigdir=%{kdessconfigdir} \
|
||||
|
|
@ -251,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}
|
||||
|
|
@ -263,19 +251,23 @@ 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.
|
||||
Pixel City§pixelcity§Procedural city fly through.
|
||||
Plasma§plasma§Oozing plasma.
|
||||
Skyrocket (silent)§skyrocket -v 0§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. Silent version.
|
||||
Skyrocket§skyrocket§The most full-blown fireworks screensaver ever. It has bright lights, smoke trails, clouds that are illuminated by the explosions, sound effects, and plenty of other eye candy. With sound.
|
||||
Solarwinds§solarwinds§This is a very mesmerizing particle effects saver.
|
||||
|
|
@ -300,8 +292,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.1-0.9.1.p.diff
|
||||
%{_bindir}/*
|
||||
%{_mandir}/*/*
|
||||
|
||||
|
|
@ -328,6 +320,36 @@ fi
|
|||
%{kdessconfigdir}/*.desktop
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
f5c04adbb538a6d74ce50ef091428021 rss-glx_0.8.2.p.tar.bz2
|
||||
bc420d230634fe8d3bbc79dc6a3c6678 rss-glx_0.9.1.p.tar.bz2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue