rpms/rss-glx/F-10 rss-glx-0.8.2-0.8.2.p.diff, NONE, 1.1 rss-glx-0.8.2.p-flags.patch, NONE, 1.1 rss-glx-0.8.2.p-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rss-glx-rm-matrixview.sh, 1.1, 1.2 rss-glx.spec, 1.27, 1.28 sources, 1.2, 1.3 rss-glx-0.8.1-0.8.1.p.diff, 1.1, NONE rss-glx-0.8.1-flags.patch, 1.1, NONE rss-glx-0.8.1-freealut.patch, 1.1, NONE rss-glx-0.8.1-gcc43-buildfix.patch, 1.1, NONE
Nils Philippsen
nphilipp at fedoraproject.org
Mon Dec 22 16:52:30 UTC 2008
Author: nphilipp
Update of /cvs/pkgs/rpms/rss-glx/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26215
Modified Files:
.cvsignore rss-glx-rm-matrixview.sh rss-glx.spec sources
Added 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
Removed Files:
rss-glx-0.8.1-0.8.1.p.diff rss-glx-0.8.1-flags.patch
rss-glx-0.8.1-freealut.patch
rss-glx-0.8.1-gcc43-buildfix.patch
Log Message:
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
rss-glx-0.8.2-0.8.2.p.diff:
--- NEW FILE rss-glx-0.8.2-0.8.2.p.diff ---
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>;
rss-glx-0.8.2.p-flags.patch:
--- NEW FILE rss-glx-0.8.2.p-flags.patch ---
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
rss-glx-0.8.2.p-gcc43.patch:
--- NEW FILE rss-glx-0.8.2.p-gcc43.patch ---
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 May 2006 10:53:54 -0000 1.2
+++ .cvsignore 22 Dec 2008 16:51:59 -0000 1.3
@@ -1 +1 @@
-rss-glx_0.8.1.p.tar.bz2
+rss-glx_0.8.2.p.tar.bz2
Index: rss-glx-rm-matrixview.sh
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/rss-glx-rm-matrixview.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rss-glx-rm-matrixview.sh 29 May 2006 10:53:54 -0000 1.1
+++ rss-glx-rm-matrixview.sh 22 Dec 2008 16:51:59 -0000 1.2
@@ -87,17 +87,16 @@
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
Index: rss-glx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/rss-glx.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rss-glx.spec 29 May 2008 09:55:19 -0000 1.27
+++ rss-glx.spec 22 Dec 2008 16:51:59 -0000 1.28
@@ -43,8 +43,8 @@
Summary: Really Slick Screensavers
Name: rss-glx
-Version: 0.8.1%{patchext}
-Release: 20%{?dist}
+Version: 0.8.2%{patchext}
+Release: 1%{?dist}
License: GPLv2
Group: Amusements/Graphics
URL: http://rss-glx.sourceforge.net/
@@ -54,10 +54,9 @@
Source0: rss-glx_%{version}.tar.bz2
Source1: README.fedora
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.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
@@ -73,13 +72,17 @@
BuildRequires: xorg-x11-devel
%endif
BuildRequires: bzip2-devel
-BuildRequires: openal-devel
BuildRequires: freealut-devel
-BuildRequires: autoconf
-BuildRequires: libtool
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.
@@ -172,9 +175,8 @@
EOF
%setup -q -n rss-glx_%{version}
-%patch0 -p1 -b .freealut
-%patch1 -p1 -b .flags
-%patch2 -p1 -b .gcc43
+%patch0 -p1 -b .flags
+%patch1 -p1 -b .gcc43
# work around BZ #189928
for f in `find . -type l` ; do
@@ -184,7 +186,7 @@
done
%build
-autoconf
+autoreconf -i
%configure \
--with-configdir=%{xssconfigdir} \
--with-kdessconfigdir=%{kdessconfigdir} \
@@ -203,7 +205,6 @@
cat << EOF > %{buildroot}%{_gssconfigdir}/${cmd}.desktop
[Desktop Entry]
-Encoding=UTF-8
Name=${name}
Comment=${desc}
TryExec=${trycmd}
@@ -218,7 +219,23 @@
# 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 at 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 at g' > "${trycmd}.desktop"
rm -f "${origtrycmd}.desktop"
fi
popd >& /dev/null
@@ -284,7 +301,7 @@
%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 README.fedora rss-glx-rm-matrixview.sh rss-glx-0.8.2-0.8.2.p.diff
%{_bindir}/*
%{_mandir}/*/*
@@ -311,6 +328,18 @@
%{kdessconfigdir}/*.desktop
%changelog
+* Mon Dec 22 2008 Nils Philippsen <nils at redhat.com> 0.8.2.p-1
+- use autoreconf to avoid using non-matching ltmain.sh
+
+* Wed Dec 17 2008 Nils Philippsen <nils at 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 at redhat.com>
+- version 0.8.2.p
+- remove obsolete freealut patch
+- update flags, gcc43 patches
+
* Thu May 29 2008 Nils Philippsen <nphilipp at 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rss-glx/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 May 2006 10:53:54 -0000 1.2
+++ sources 22 Dec 2008 16:51:59 -0000 1.3
@@ -1 +1 @@
-17870ad88d3a61ace94c04cb7677ddbf rss-glx_0.8.1.p.tar.bz2
+f5c04adbb538a6d74ce50ef091428021 rss-glx_0.8.2.p.tar.bz2
--- rss-glx-0.8.1-0.8.1.p.diff DELETED ---
--- rss-glx-0.8.1-flags.patch DELETED ---
--- rss-glx-0.8.1-freealut.patch DELETED ---
--- rss-glx-0.8.1-gcc43-buildfix.patch DELETED ---
More information about the fedora-extras-commits
mailing list