diff options
| -rw-r--r-- | x11-misc/rss-glx/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r1 | 3 | ||||
| -rw-r--r-- | x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch | 53 | ||||
| -rw-r--r-- | x11-misc/rss-glx/rss-glx-0.8.1-r1.ebuild | 148 |
4 files changed, 212 insertions, 1 deletions
diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog index ac5a0ff7f62f..e9c56f494c7c 100644 --- a/x11-misc/rss-glx/ChangeLog +++ b/x11-misc/rss-glx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/rss-glx # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.43 2006/07/01 20:50:07 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.44 2006/07/03 10:09:10 nelchael Exp $ + +*rss-glx-0.8.1-r1 (03 Jul 2006) + + 03 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> + -files/rss-glx-0.8.1-gentoo.patch, +files/rss-glx-0.8.1-r1-gentoo.patch, + -rss-glx-0.8.1.ebuild, +rss-glx-0.8.1-r1.ebuild: + Added back patch to install .desktop files correctly. See bug #138900. *rss-glx-0.8.1 (01 Jul 2006) diff --git a/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r1 b/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r1 new file mode 100644 index 000000000000..415a06809df0 --- /dev/null +++ b/x11-misc/rss-glx/files/digest-rss-glx-0.8.1-r1 @@ -0,0 +1,3 @@ +MD5 a2bdf0e10ee4e89c8975f313c5c0ba6f rss-glx_0.8.1.tar.bz2 5248755 +RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e rss-glx_0.8.1.tar.bz2 5248755 +SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb rss-glx_0.8.1.tar.bz2 5248755 diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch new file mode 100644 index 000000000000..22a42fd1cbe2 --- /dev/null +++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch @@ -0,0 +1,53 @@ +diff -Nru rss-glx_0.8.1.vanilla/configure.in rss-glx_0.8.1/configure.in +--- rss-glx_0.8.1.vanilla/configure.in 2006-07-03 11:52:22.000000000 +0200 ++++ rss-glx_0.8.1/configure.in 2006-07-03 11:52:39.000000000 +0200 +@@ -7,14 +7,12 @@ + 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"]) + 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"]) +diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.am rss-glx_0.8.1/reallyslick/cpp_src/Makefile.am +--- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.am 2006-07-03 11:52:22.000000000 +0200 ++++ rss-glx_0.8.1/reallyslick/cpp_src/Makefile.am 2006-07-03 11:54:30.000000000 +0200 +@@ -19,7 +19,7 @@ + dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml + endif + +-if INSTALL_XSCREENSAVER_CONFIG_FILES ++if INSTALL_KDE_CONFIG_FILES + dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop + endif + +diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.in rss-glx_0.8.1/reallyslick/cpp_src/Makefile.in +--- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/Makefile.in 2006-07-03 11:52:22.000000000 +0200 ++++ rss-glx_0.8.1/reallyslick/cpp_src/Makefile.in 2006-07-03 11:53:59.000000000 +0200 +@@ -281,7 +281,7 @@ + skyrocket_SOURCES = driver.cpp 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.cpp solarwinds.cpp rsDefines.h rsRand.h + @INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_config_DATA = cyclone.xml fieldlines.xml flocks.xml flux.xml helios.xml hyperspace.xml plasma.xml skyrocket.xml solarwinds.xml +-@INSTALL_XSCREENSAVER_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop ++@INSTALL_KDE_CONFIG_FILES_TRUE@dist_kdessconfig_DATA = cyclone.desktop fieldlines.desktop flocks.desktop flux.desktop helios.desktop hyperspace.desktop plasma.desktop skyrocket.desktop solarwinds.desktop + man_MANS = cyclone.1 fieldlines.1 flocks.1 flux.1 helios.1 plasma.1 skyrocket.1 solarwinds.1 + EXTRA_DIST = $(man_MANS) + stringify_LDADD = @BZIP2@ +diff -Nru rss-glx_0.8.1.vanilla/reallyslick/cpp_src/skyrocket.cpp rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp +--- rss-glx_0.8.1.vanilla/reallyslick/cpp_src/skyrocket.cpp 2006-07-03 11:52:22.000000000 +0200 ++++ rss-glx_0.8.1/reallyslick/cpp_src/skyrocket.cpp 2006-07-03 11:52:39.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <GL/gl.h> + #include <GL/glu.h> + ++#include <cassert> + #include <list> + + #include "driver.h" diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r1.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r1.ebuild new file mode 100644 index 000000000000..4bbddd72edc1 --- /dev/null +++ b/x11-misc/rss-glx/rss-glx-0.8.1-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.1-r1.ebuild,v 1.1 2006/07/03 10:09:10 nelchael Exp $ + +inherit flag-o-matic eutils + +MY_P=${PN}_${PV} +S=${WORKDIR}/${MY_P} +DESCRIPTION="Really Slick Screensavers using OpenGL for XScreenSaver" +HOMEPAGE="http://rss-glx.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="kde sse 3dnow openal xscreensaver" + +RDEPEND="|| ( x11-libs/libXt virtual/x11 )" +DEPEND="${RDEPEND} + virtual/opengl + >=media-gfx/imagemagick-5.5.7 + kde? ( || ( kde-base/kdeartwork-kscreensaver kde-base/kdeartwork ) ) + !kde? ( >=x11-misc/xscreensaver-4.22-r2 ) + xscreensaver? ( >=x11-misc/xscreensaver-4.22-r2 ) + openal? ( media-libs/openal )" + +pkg_setup() { + if use kde && use xscreensaver ; then + if ! built_with_use kde-base/kdeartwork-kscreensaver xscreensaver && \ + ! built_with_use kde-base/kdeartwork xscreensaver ; then + eerror "rss-glx wont work nicely with kde unless you emerge" + eerror "kde-base/kdeartwork or kde-base/kdeartwork-kscreensaver" + eerror "with USE=xscreensaver." + eerror "See http://bugs.gentoo.org/show_bug.cgi?id=88212" + die "Please re-emerge your KDE with USE=xscreensaver" + fi + fi +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PF}-gentoo.patch + cp ${FILESDIR}/jwz-vroot.h ${S}/include/vroot.h +} + +src_compile() { + filter-flags -fPIC + + local myconf + + myconf="${myconf} --bindir=/usr/lib/misc/xscreensaver" \ + myconf="${myconf} --with-configdir=/usr/share/xscreensaver/config/" \ + + if use kde; then + find . -name '*.desktop' -exec \ + sed -i \ + -e 's:Exec=kxsrun \(.*\):Exec=kxsrun \1:g' \ + -e 's:Exec=kxsconfig \(.*\):Exec=kxsconfig \1:g' \ + '{}' \ + \; \ + || die "couldnt sed desktop files" + myconf="${myconf} --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers" + fi + + # Hardenable SIMD extensions on amd64 + if use amd64 ; then + myconf="${myconf} --enable-sse --enable-3dnow" + elif use x86 ; then + myconf="${myconf} $(use_enable sse) $(use_enable 3dnow)" + fi + + econf \ + $(use_enable openal sound) \ + ${myconf} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR=${D} install || die "install failed" + dodoc README README.xscreensaver + + # symlink to satisfy kde's kxs* + use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config +} + +pkg_postinst() { + local XSCREENSAVER_CONF="${ROOT}/etc/X11/app-defaults/XScreenSaver" + + if [ -f ${XSCREENSAVER_CONF} ]; then + einfo "Adding Really Slick Screensavers to XScreenSaver" + sed -e '/*programs:/a\ + GL: \"Cyclone\" cyclone --root \\n\\\ + GL: \"Euphoria\" euphoria --root \\n\\\ + GL: \"Fieldlines\" fieldlines --root \\n\\\ + GL: \"Flocks\" flocks --root \\n\\\ + GL: \"Flux\" flux --root \\n\\\ + GL: \"Helios\" helios --root \\n\\\ + GL: \"Hyperspace\" hyperspace --root \\n\\\ + GL: \"Lattice\" lattice --root \\n\\\ + GL: \"Plasma\" plasma --root \\n\\\ + GL: \"Skyrocket\" skyrocket --root \\n\\\ + GL: \"Solarwinds\" solarwinds --root \\n\\\ + GL: \"Colorfire\" colorfire --root \\n\\\ + GL: \"Hufos Smoke\" hufo_smoke --root \\n\\\ + GL: \"Hufos Tunnel\" hufo_tunnel --root \\n\\\ + GL: \"Sundancer2\" sundancer2 --root \\n\\\ + GL: \"BioF\" biof --root \\n\\\ + GL: \"MatrixView\" matrixview --root \\n\\\ + GL: \"Spirographx\" spirographx --root \\n\\\ + GL: \"BusySpheres\" busyspheres --root \\n\\' \ + -i ${XSCREENSAVER_CONF} + + else + einfo "Unable to add these to XScreenSaver configuration" + einfo "This should not happen. Please file a bug" + fi +} + +pkg_postrm() { + local XSCREENSAVER_CONF="${ROOT}/etc/X11/app-defaults/XScreenSaver" + + has_version x11-misc/rss-glx && return 0 + if [ -f ${XSCREENSAVER_CONF} ]; then + einfo "Removing Really Slick Screensavers from XScreenSaver configuration." + sed \ + -e '/\"Cyclone\" cyclone/d' \ + -e '/\"Euphoria\" euphoria/d' \ + -e '/\"Fieldlines\" fieldlines/d' \ + -e '/\"Flocks\" flocks/d' \ + -e '/\"Flux\" flux/d' \ + -e '/\"Helios\" helios/d' \ + -e '/\"Hyperspace\" hyperspace/d' \ + -e '/\"Lattice\" lattice/d' \ + -e '/\"Plasma\" plasma/d' \ + -e '/\"Skyrocket\" skyrocket/d' \ + -e '/\"Solarwinds\" solarwinds/d' \ + -e '/\"Colorfire\" colorfire/d' \ + -e '/\"Hufos Smoke\" hufo_smoke/d' \ + -e '/\"Hufos Tunnel\" hufo_tunnel/d' \ + -e '/\"Sundancer2\" sundancer2/d' \ + -e '/\"BioF\" biof/d' \ + -e '/\"MatrixView\" matrixview/d' \ + -e '/\"Spirographx\" spirographx/d' \ + -e '/\"BusySpheres\" busyspheres/d' \ + -i ${XSCREENSAVER_CONF} + fi +} |