[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: New OpenGL screensavers
From:       Neil Stevens <neil () qualityassistant ! com>
Date:       2002-06-29 20:46:03
[Download RAW message or body]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Saturday June 29, 2002 12:41, Karl Robillard wrote:
> Terence Welsh recently GPLed the source for his Windows screensavers.
> His website is http://www.reallyslick.com/.
>
> So far I've ported Flux & Euphoria to KDE.
> You can download the source at http://outguard.sf.net/arc/slick.tgz (but
> only for a while).
>
> Please check them out for any problems.  Then lets get them into the
> kdeartwork module.

Look good to me, compiled fine, and look interesting.  I say put them in. 
:-)

Though, trying to fix the Makefile exposed to me a problem - adding GL 
savers requires configure.in.in changes.  Attached is a patch to fix that 
for the future.  Any objections to me committing?

- -- 
Neil Stevens - neil@qualityassistant.com
"I always cheer up immensely if an attack is particularly wounding
because I think, well, if they attack one personally, it means they
have not a single political argument left." - Margaret Thatcher
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE9HhyLf7mnligQOmERAr1FAJ9MUli126K3iTrjWIGxfRQulT08DACggVst
UOQQO2UgO00+snrNn64zA+c=
=0MYj
-----END PGP SIGNATURE-----

["screensaver-gl-fix" (text/x-diff)]

Index: configure.in.in
===================================================================
RCS file: /home/kde/kdeartwork/kscreensaver/configure.in.in,v
retrieving revision 1.6
diff -u -r1.6 configure.in.in
--- configure.in.in	2002/03/02 17:39:55	1.6
+++ configure.in.in	2002/06/29 20:41:21
@@ -31,15 +31,15 @@
 
 AC_HAVE_GL([
 
+MORE_XSAVERS="$(GL_XSAVERS)"
+
 if test "$ac_cv_kde_qt_has_opengl" = "yes"; then
-  GL_XSAVERS="kmorph3d.kss kspace.kss kpipes.kss"
-  GL_KSAVERS="kfountain.kss kwave.kss kgravity.kss"
-  GL_DESKTOP_FILES="KGravity.desktop KWave.desktop KFountain.desktop"
+  MORE_KSAVERS="$(GL_KSAVERS)"
+  MORE_DESKTOP_FILES="$(GL_DESKTOP_FILES)"
 else
   dnl remove those that need -enable-opengl in Qt
-  GL_XSAVERS="kmorph3d.kss kspace.kss kpipes.kss"
-  GL_KSAVERS=""
-  GL_DESKTOP_FILES=""
+  MORE_KSAVERS=""
+  MORE_DESKTOP_FILES=""
 fi
 
 ac_save_CPPFLAGS="$CPPFLAGS"
@@ -47,11 +47,12 @@
 AC_CHECK_HEADERS(GL/xmesa.h GL/glut.h memory.h)
 CPPFLAGS="$ac_save_CPPFLAGS"
 ],
-GL_XSAVERS=""
-GL_KSAVERS="")
-AC_SUBST(GL_KSAVERS)
-AC_SUBST(GL_XSAVERS)
-AC_SUBST(GL_DESKTOP_FILES)
+MORE_XSAVERS=""
+MORE_KSAVERS=""
+MORE_DESKTOP_FILES="")
+AC_SUBST(MORE_XSAVERS)
+AC_SUBST(MORE_KSAVERS)
+AC_SUBST(MORE_DESKTOP_FILES)
 
 
 AC_CHECK_FUNCS(gettimeofday)
Index: kdesavers/Makefile.am
===================================================================
RCS file: /home/kde/kdeartwork/kscreensaver/kdesavers/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- kdesavers/Makefile.am	2002/03/02 17:39:55	1.23
+++ kdesavers/Makefile.am	2002/06/29 20:41:21
@@ -8,9 +8,12 @@
 LDFLAGS = $(all_libraries) $(KDE_RPATH)
 LDADD = $(LIB_KDEUI) -lkscreensaver -lm $(GLLIB)
 
+GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss
+GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop
+
 bin_PROGRAMS = kbanner.kss kpolygon.kss kslideshow.kss \
                 klines.kss klorenz.kss kblob.kss kvm.kss kmatrix.kss \
-                kscience.kss  $(GL_KSAVERS)
+                kscience.kss  $(MORE_KSAVERS)
 
 EXTRA_PROGRAMS = kfountain.kss kwave.kss kgravity.kss
 
@@ -49,7 +52,7 @@
 desktop_DATA = KBanner.desktop KPolygon.desktop \
                 KSlideshow.desktop KLines-saver.desktop KLorenz.desktop \
                 KBlob.desktop KVm.desktop KMatrix.desktop KScience.desktop\
-		$(GL_DESKTOP_FILES)
+		$(MORE_DESKTOP_FILES)
 
 desktopdir = $(kde_appsdir)/System/ScreenSavers
 
Index: xsavers/Makefile.am
===================================================================
RCS file: /home/kde/kdeartwork/kscreensaver/xsavers/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- xsavers/Makefile.am	2001/10/05 12:30:00	1.3
+++ xsavers/Makefile.am	2002/06/29 20:41:21
@@ -8,8 +8,10 @@
 LDFLAGS = $(all_libraries) $(KDE_RPATH)
 LDADD = $(LIB_KDEUI) -lm
 
+GL_XSAVERS=kmorph3d.kss kspace.kss kpipes.kss
+
 bin_PROGRAMS = kswarm.kss krock.kss \
-	kpyro.kss $(GL_XSAVERS) kbouboule.kss kslidescreen.kss
+	kpyro.kss $(MORE_XSAVERS) kbouboule.kss kslidescreen.kss
 
 EXTRA_PROGRAMS = kmorph3d.kss kspace.kss kpipes.kss
 

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[prev in list] [next in list] [prev in thread] [next in thread]