summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2007-05-03 02:49:26 +0000
committerHanno Böck <hanno@gentoo.org>2007-05-03 02:49:26 +0000
commit6535bb0aa0b16a9f8d59f61de2dc4f9b50854894 (patch)
tree649cc205769a92fcaa003319e84005bc9896e082 /x11-wm/compiz
parentRemove mangled file so it can be re-added properly (diff)
downloadgentoo-2-6535bb0aa0b16a9f8d59f61de2dc4f9b50854894.tar.gz
gentoo-2-6535bb0aa0b16a9f8d59f61de2dc4f9b50854894.tar.bz2
gentoo-2-6535bb0aa0b16a9f8d59f61de2dc4f9b50854894.zip
compiz minor fixes
(Portage version: 2.1.2.5)
Diffstat (limited to 'x11-wm/compiz')
-rw-r--r--x11-wm/compiz/ChangeLog6
-rw-r--r--x11-wm/compiz/compiz-0.5.0.ebuild5
-rwxr-xr-xx11-wm/compiz/files/compiz-start6
3 files changed, 13 insertions, 4 deletions
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index f4bcc225c753..eddc05783234 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/compiz
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.15 2007/04/24 01:51:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.16 2007/05/03 02:49:26 hanno Exp $
+
+ 03 May 2007; Hanno Boeck <hanno@gentoo.org> files/compiz-start,
+ compiz-0.5.0.ebuild:
+ Fix some minor issues (gconf schema installation, more deps).
*compiz-0.5.0 (24 Apr 2007)
diff --git a/x11-wm/compiz/compiz-0.5.0.ebuild b/x11-wm/compiz/compiz-0.5.0.ebuild
index eca8d7550045..a19ba1dd776f 100644
--- a/x11-wm/compiz/compiz-0.5.0.ebuild
+++ b/x11-wm/compiz/compiz-0.5.0.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.5.0.ebuild,v 1.1 2007/04/24 01:51:02 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.5.0.ebuild,v 1.2 2007/05/03 02:49:26 hanno Exp $
+
+inherit gnome2
DESCRIPTION="3D composite- and windowmanager"
HOMEPAGE="http://www.compiz.org/"
@@ -19,6 +21,7 @@ DEPEND=">=media-libs/mesa-6.5.1-r1
x11-libs/libXinerama
media-libs/libpng
>=x11-libs/gtk+-2.0
+ x11-libs/pango
x11-libs/startup-notification
gnome-base/gconf
gnome? ( >=x11-libs/libwnck-2.16.1
diff --git a/x11-wm/compiz/files/compiz-start b/x11-wm/compiz/files/compiz-start
index 8eaf0161a7f1..3edd7a9c2989 100755
--- a/x11-wm/compiz/files/compiz-start
+++ b/x11-wm/compiz/files/compiz-start
@@ -1,3 +1,5 @@
+#!/bin/sh
+
# compiz-start script
#
# hacky autodetection of neccessary options for XGL/AIGLX/NVIDIA
@@ -16,13 +18,13 @@ COMPIZ_OPTIONS="--replace --use-cow"
if [ $GLX_WITH_DIRECT -eq 3 ]; then
if [ $GLX_RENDER -eq 0 ]; then
echo NVIDIA detected
- export __GL_YIELD="NOTHING"
+ __GL_YIELT="NOTHING; export __GL_YIELD
else
echo XGL detected
fi
elif [ $GLX_WITH_INDIRECT -eq 3 ]; then
echo AIGLX detected
- export LIBGL_ALWAYS_INDIRECT=1
+ LIBGL_ALWAYS_INDIRECT=1; export LIBGL_ALWAYS_INDIRECT
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --strict-binding"
fi