add generic start script to compiz (could replace compiz-xgl/aiglx/nvidia if it works...

Package-Manager: portage-2.1.2_rc2-r3

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index c72774f5addef7788e38061af735c842b7612769..57c91a68ed807d1b822b0abafe19c40764afa4ab 100644 (file)
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.9 2006/11/26 15:56:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.10 2006/11/29 23:20:52 hanno Exp $
+
+  29 Nov 2006; Hanno Boeck <hanno@gentoo.org> +files/compiz-start,
+  compiz-0.3.4.ebuild:
+  Add generic compiz start script.
 
   26 Nov 2006; Hanno Boeck <hanno@gentoo.org> compiz-0.3.4.ebuild:
   Add dependency to libXinerama.

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 3d2e2ec4768e588298eb39471f7d914fb92b922f..d42535ffe4f92271896d5826d7eeaeaa29413540 100644 (file)
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -13,19 +13,23 @@ AUX compiz-nvidia 232 RMD160 700811329f0145e5dd0c01f7dbe21fd5c7ec4e38 SHA1 a6ec2
 MD5 8cce4a808336400a802f62e5cc89027d files/compiz-nvidia 232
 RMD160 700811329f0145e5dd0c01f7dbe21fd5c7ec4e38 files/compiz-nvidia 232
 SHA256 71c7878ea80ec71626b0e3a328d31794b87d2840e96b9b608ee81fbb81835496 files/compiz-nvidia 232
+AUX compiz-start 909 RMD160 a99885c199476db43a40991a388d5c592e711cc3 SHA1 9fd990cc148dcdf9d052d47844a7cc8d1cc2d09f SHA256 0887e9637c23e5afc17fb7904f17edd660e21aff24d2e7cd31d05689805f71ad
+MD5 a041a40b7e28bc1e491ba1bbcca65fff files/compiz-start 909
+RMD160 a99885c199476db43a40991a388d5c592e711cc3 files/compiz-start 909
+SHA256 0887e9637c23e5afc17fb7904f17edd660e21aff24d2e7cd31d05689805f71ad files/compiz-start 909
 AUX compiz-xgl 244 RMD160 d5975cc2ea3a346c063ef3dcebb190f57cce8406 SHA1 a04d4be33ac9702a42a24d8c0cb5d604f14a50fc SHA256 7a93c7be6831b337165e2284e9f3340c0380fb3c5566ea73cc384f6e9489a680
 MD5 6f47d17281e98c559bc25532912a1dc5 files/compiz-xgl 244
 RMD160 d5975cc2ea3a346c063ef3dcebb190f57cce8406 files/compiz-xgl 244
 SHA256 7a93c7be6831b337165e2284e9f3340c0380fb3c5566ea73cc384f6e9489a680 files/compiz-xgl 244
 DIST compiz-0.3.4.tar.bz2 684356 RMD160 042197358b380ba97bd7a82d102750083697980b SHA1 0ef8e775baf06b5a19a3044e3bff36972c12b91f SHA256 8fa4c7921d952185d0d1be964ddc7cb32a7c6916e7ed4e236e950a881e790d80
-EBUILD compiz-0.3.4.ebuild 1123 RMD160 f9756b927ff55c4aec948bcd53a889e2017f5da8 SHA1 a9235c93c67678712b3842bd7c2b41ad645a1fb9 SHA256 deb548c05205102351123665367abb91b8481c682f8a472cffe1536cb6c79a63
-MD5 a0215e85367be8e4749671be99b04b1b compiz-0.3.4.ebuild 1123
-RMD160 f9756b927ff55c4aec948bcd53a889e2017f5da8 compiz-0.3.4.ebuild 1123
-SHA256 deb548c05205102351123665367abb91b8481c682f8a472cffe1536cb6c79a63 compiz-0.3.4.ebuild 1123
-MISC ChangeLog 1693 RMD160 fd6ff672df5c508cd4ce68c0bb434dcb0e59899b SHA1 d05b86f83e4b1039fdc50d05a858fc3d110290cd SHA256 edb7ab1dd592f5cf84d78d8b58c21964d77e1368cb5ed231bce6f14626702615
-MD5 c579ea019139a228e940a15f981afb94 ChangeLog 1693
-RMD160 fd6ff672df5c508cd4ce68c0bb434dcb0e59899b ChangeLog 1693
-SHA256 edb7ab1dd592f5cf84d78d8b58c21964d77e1368cb5ed231bce6f14626702615 ChangeLog 1693
+EBUILD compiz-0.3.4.ebuild 1129 RMD160 1ee35cba967e96c57fa5f7b2306c6b4fa2053e4e SHA1 4cf4ecac21ee9a5662292b989c3bfab3086f8106 SHA256 f0d5dddcc0a3bd87d3b8a21a44a895391efc6cbb32597a8ddb986bd1e4cb27d2
+MD5 a705e4380a3f9fbd6a9dec78f7e5b8e7 compiz-0.3.4.ebuild 1129
+RMD160 1ee35cba967e96c57fa5f7b2306c6b4fa2053e4e compiz-0.3.4.ebuild 1129
+SHA256 f0d5dddcc0a3bd87d3b8a21a44a895391efc6cbb32597a8ddb986bd1e4cb27d2 compiz-0.3.4.ebuild 1129
+MISC ChangeLog 1820 RMD160 e9a14c5acec8b77e73ccc4a54902381534997aab SHA1 f7ab87c0016636045a7d36d8a95a0fde265bd980 SHA256 22de30e0743d86de600e62f3c665d61b8aa8b0d988128b04c0d4926ae520930b
+MD5 9c20cab4077266640b9d36bc3d896ce3 ChangeLog 1820
+RMD160 e9a14c5acec8b77e73ccc4a54902381534997aab ChangeLog 1820
+SHA256 22de30e0743d86de600e62f3c665d61b8aa8b0d988128b04c0d4926ae520930b ChangeLog 1820
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -36,7 +40,7 @@ SHA256 414b8501cbe2a3868716eda4a93a36608164f76e3ef209ce8ac3fdd8b14d44cb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFabtZr2QksT29OyARAk1TAJ9GCGMIQ88GaaI5iuu7w7TKHL+YFwCeNN+F
-rIUQr4VFUmtKYjwIcJ3Rzp4=
-=Y1LX
+iD8DBQFFbhXCr2QksT29OyARAsaOAKCCVN7kkFnNemrCgcW5LOoeDW42ogCfb+L4
+0W3WxhtLStLIai+pTKYu/sc=
+=rc0E
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/compiz/compiz-0.3.4.ebuild b/x11-wm/compiz/compiz-0.3.4.ebuild
index 338ceb5185050332e88c4bb98d19d8a74208d48f..7e5fd2ccf85baefa93a478cfa988134d1da66a35 100644 (file)
--- a/x11-wm/compiz/compiz-0.3.4.ebuild
+++ b/x11-wm/compiz/compiz-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.3.4.ebuild,v 1.2 2006/11/26 15:56:21 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.3.4.ebuild,v 1.3 2006/11/29 23:20:52 hanno Exp $
 
 inherit eutils gnome2
 
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-       dobin ${FILESDIR}/compiz-{aiglx,xgl,nvidia}
+       dobin ${FILESDIR}/compiz-{aiglx,xgl,nvidia,start}
 
        gnome2_src_install
 }

diff --git a/x11-wm/compiz/files/compiz-start b/x11-wm/compiz/files/compiz-start
new file mode 100755 (executable)
index 0000000..70373de
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-start
@@ -0,0 +1,30 @@
+# compiz-start script
+#
+# hacky autodetection of neccessary options for XGL/AIGLX/NVIDIA
+#
+# Hanno Boeck, http://www.hboeck.de/
+#
+# Licensed under the same conditions as compiz itself (MIT or GPL)
+
+GLX_WITH_DIRECT=`glxinfo|grep -c GLX_EXT_texture_from_pixmap`
+GLX_WITH_INDIRECT=`LIBGL_ALWAYS_INDIRECT=1 glxinfo|grep -c GLX_EXT_texture_from_pixmap`
+GLX_RENDER=`glxinfo|grep -c "OpenGL renderer string: Mesa GLX Indirect"`
+
+
+COMPIZ_OPTIONS="--replace --use-cow"
+
+if [ $GLX_WITH_DIRECT -eq 3 ]; then
+       if [ $GLX_RENDER -eq 0 ]; then
+               echo NVIDA detected
+               export __GL_YIELD="NOTHING" 
+       else
+               echo XGL detected
+       fi
+elif [ $GLX_WITH_INDIRECT -eq 3 ]; then
+       echo AIGLX detected
+       export LIBGL_ALWAYS_INDIRECT=1
+       COMPIZ_OPTIONS="$COMPIZ_OPTIONS --strict-binding"
+fi
+
+gtk-window-decorator --replace &
+compiz $COMPIZ_OPTIONS gconf move resize minimize place decoration wobbly fade cube rotate scale switcher zoom dbus