From: Hanno Boeck Date: Sat, 6 Jan 2007 21:56:19 +0000 (+0000) Subject: compiz bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=39a0df604a0d141e8edc0d89d3a927acc2a9e3da;p=gentoo.git compiz bump Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog index 57c91a68ed80..6c06cd0c126c 100644 --- a/x11-wm/compiz/ChangeLog +++ b/x11-wm/compiz/ChangeLog @@ -1,6 +1,12 @@ # 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.10 2006/11/29 23:20:52 hanno Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.11 2007/01/06 21:56:19 hanno Exp $ + +*compiz-0.3.6 (06 Jan 2007) + + 06 Jan 2007; Hanno Boeck +files/0.3.6/compiz-start, + +compiz-0.3.6.ebuild: + Version bump, now with kde-decorator. 29 Nov 2006; Hanno Boeck +files/compiz-start, compiz-0.3.4.ebuild: diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index a6e0066c1b5b..235f4c6aa556 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1 f710dcfbd6274ff7bed3f264d284a4dcecb27254 SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4 +MD5 68a063607644539218be79330a4e332f files/0.3.6/compiz-start 1122 +RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 files/0.3.6/compiz-start 1122 +SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4 files/0.3.6/compiz-start 1122 AUX 06-glfinish.patch 492 RMD160 fed138881ec79179a3d5eb67be35b88e221808d0 SHA1 0416dda22d05c400ade46f9d1c633daf3aa3abea SHA256 4ff47e2d079045637ef5a5b27d577d0d16ce40e7e8fec79280d916233af67db3 MD5 3a049b520d0557dc6d7644e909be00b3 files/06-glfinish.patch 492 RMD160 fed138881ec79179a3d5eb67be35b88e221808d0 files/06-glfinish.patch 492 @@ -22,14 +26,19 @@ 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 +DIST compiz-0.3.6.tar.bz2 722782 RMD160 d379ae44b474cba8f179bb1ab2ecb0181228a0aa SHA1 5deca0d7a426aef4d2a854b7efbf6ff44c7752f8 SHA256 efe2f38908bb5f44d45924fd6319dcf8c08203150022a9bfd4a183505ebeec7c EBUILD compiz-0.3.4.ebuild 1125 RMD160 671155e17ce2abeb619ab8f1e319d155690532d3 SHA1 ced95fcb3f7d0c47e22e44c45f50934b67e9dba6 SHA256 374ca71c6223b108347fb5814eebc17f20c20217a334ac658d23b88cbacf39ef MD5 cbbf81d9b8bba4a4513312e394fe5f1b compiz-0.3.4.ebuild 1125 RMD160 671155e17ce2abeb619ab8f1e319d155690532d3 compiz-0.3.4.ebuild 1125 SHA256 374ca71c6223b108347fb5814eebc17f20c20217a334ac658d23b88cbacf39ef compiz-0.3.4.ebuild 1125 -MISC ChangeLog 1820 RMD160 e9a14c5acec8b77e73ccc4a54902381534997aab SHA1 f7ab87c0016636045a7d36d8a95a0fde265bd980 SHA256 22de30e0743d86de600e62f3c665d61b8aa8b0d988128b04c0d4926ae520930b -MD5 9c20cab4077266640b9d36bc3d896ce3 ChangeLog 1820 -RMD160 e9a14c5acec8b77e73ccc4a54902381534997aab ChangeLog 1820 -SHA256 22de30e0743d86de600e62f3c665d61b8aa8b0d988128b04c0d4926ae520930b ChangeLog 1820 +EBUILD compiz-0.3.6.ebuild 1276 RMD160 a8d40fbf4a5b160a745998b1545ec356afff5a6f SHA1 91dc404e78aa6f7834d8792bd26cfc72990d537e SHA256 74b7e6fe27be3a7cdea6c49c348fea503713d749f234203b05c40c7fd8c02065 +MD5 d8add376899c082e9159be93fec7cdb8 compiz-0.3.6.ebuild 1276 +RMD160 a8d40fbf4a5b160a745998b1545ec356afff5a6f compiz-0.3.6.ebuild 1276 +SHA256 74b7e6fe27be3a7cdea6c49c348fea503713d749f234203b05c40c7fd8c02065 compiz-0.3.6.ebuild 1276 +MISC ChangeLog 1987 RMD160 c97a6543ac0e4bd0045d436eeeb3e06187defe1a SHA1 2bf83710298b065f21cb14e741495626537b2706 SHA256 a8520a2d9dd6841370f468cc3325583cbe4c13a0a8088c0e4ef2dba0fc411fdc +MD5 521ddcb7f13ef1726108003cf247709d ChangeLog 1987 +RMD160 c97a6543ac0e4bd0045d436eeeb3e06187defe1a ChangeLog 1987 +SHA256 a8520a2d9dd6841370f468cc3325583cbe4c13a0a8088c0e4ef2dba0fc411fdc ChangeLog 1987 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217 @@ -37,10 +46,13 @@ SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 metadata MD5 39bb5484a36aa7dc38ac6370b9a3a920 files/digest-compiz-0.3.4 241 RMD160 80a8cca69939eb89020b453cc4ba83eacf26edb1 files/digest-compiz-0.3.4 241 SHA256 414b8501cbe2a3868716eda4a93a36608164f76e3ef209ce8ac3fdd8b14d44cb files/digest-compiz-0.3.4 241 +MD5 5087d28568481a02eab1bf001b71f435 files/digest-compiz-0.3.6 241 +RMD160 064c54877c495b7270fbaf7b6db42fd8e9962b25 files/digest-compiz-0.3.6 241 +SHA256 da82c2219df78a55dad99067c75d5ccd01fcee1a58187ec611d1ecade9c2e3f6 files/digest-compiz-0.3.6 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFkW/Or2QksT29OyARAsO5AKCAuGYiKdu9NVKloaNIusHXmoEmjgCfeozb -X9Dp8BzGdDOQE8cmeVG3PuM= -=zrrs +iD8DBQFFoBrxr2QksT29OyARAg1SAJ0c0h8s6iADYWchoXii30Ey4ZvMcgCdHICH +WLqCzYxyvjxFze1mJVpToFs= +=hyuz -----END PGP SIGNATURE----- diff --git a/x11-wm/compiz/compiz-0.3.6.ebuild b/x11-wm/compiz/compiz-0.3.6.ebuild new file mode 100644 index 000000000000..52d6b22d42b4 --- /dev/null +++ b/x11-wm/compiz/compiz-0.3.6.ebuild @@ -0,0 +1,50 @@ +# 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.3.6.ebuild,v 1.1 2007/01/06 21:56:19 hanno Exp $ + +inherit eutils gnome2 + +DESCRIPTION="compiz 3D composite- and windowmanager" +HOMEPAGE="http://www.go-compiz.org/" +SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.bz2" +LICENSE="X11" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="dbus gnome kde svg" + +DEPEND=">=media-libs/mesa-6.5.1-r1 + >=media-libs/glitz-0.5.6 + >=x11-base/xorg-server-1.1.1-r1 + x11-libs/libXdamage + x11-libs/libXrandr + x11-libs/libXcomposite + x11-libs/libXinerama + media-libs/libpng + >=x11-libs/gtk+-2.0 + gnome? ( >=x11-libs/libwnck-2.16.1 + >=gnome-base/control-center-2.16.1 ) + svg? ( gnome-base/librsvg ) + dbus? ( sys-apps/dbus + >dev-libs/glib-2 ) + kde? ( kde-base/kdelibs )" + +src_compile() { + econf --with-default-plugins \ + --enable-gtk \ + `use_enable gnome` \ + `use_enable gnome metacity` \ + `use_enable gnome gconf` \ + `use_enable kde` \ + `use_enable svg librsvg` \ + `use_enable dbus` \ + `use_enable dbus dbus-glib` || die + + emake || die +} + +src_install() { + dobin ${FILESDIR}/compiz-{aiglx,xgl,nvidia} + dobin ${FILESDIR}/${PV}/compiz-start + + gnome2_src_install +} diff --git a/x11-wm/compiz/files/0.3.6/compiz-start b/x11-wm/compiz/files/0.3.6/compiz-start new file mode 100755 index 000000000000..161068bdf537 --- /dev/null +++ b/x11-wm/compiz/files/0.3.6/compiz-start @@ -0,0 +1,41 @@ +# 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) + +if [ ! -x /usr/bin/glxinfo ]; then + echo "glxinfo not found, please install mesa-progs." + exit -1 +fi + +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" + +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 +fi + +if [ ! -z $KDE_FULL_SESSION ] && [ -x /usr/bin/kde-window-decorator ]; then + echo Using KDE decorator + kde-window-decorator --replace & +else + echo Using GTK decorator + gtk-window-decorator --replace & +fi + +compiz $COMPIZ_OPTIONS gconf move resize minimize place decoration wobbly fade cube rotate scale switcher zoom dbus diff --git a/x11-wm/compiz/files/digest-compiz-0.3.6 b/x11-wm/compiz/files/digest-compiz-0.3.6 new file mode 100644 index 000000000000..75dbdf0e6c9f --- /dev/null +++ b/x11-wm/compiz/files/digest-compiz-0.3.6 @@ -0,0 +1,3 @@ +MD5 260b03fc9ae62ff1ad4e8c5e92d56180 compiz-0.3.6.tar.bz2 722782 +RMD160 d379ae44b474cba8f179bb1ab2ecb0181228a0aa compiz-0.3.6.tar.bz2 722782 +SHA256 efe2f38908bb5f44d45924fd6319dcf8c08203150022a9bfd4a183505ebeec7c compiz-0.3.6.tar.bz2 722782