Version bump. Many bugfixes, 2 new plugins, Ported KDE4 window decorator to KDE 4.3. Fix bug #286431 thanks to Evert

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 165 insertions, 4 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index d8e05737dc59..e07d47c5ddce 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.44 2009/08/29 12:28:11 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.45 2009/10/15 16:30:11 mrpouet Exp $
+
+*compiz-0.8.4 (15 Oct 2009)
+
+  15 Oct 2009; Romain Perier <mrpouet@gentoo.org>
+  +compiz-0.8.4.ebuild, files/compiz-manager:
+  Version bump. Many bugfixes, 2 new plugins, Ported KDE4 window decorator
+  to KDE 4.3. Fix bug #286431 thanks to Evert.
 
 *compiz-0.8.2-r3 (29 Aug 2009)
 
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 6239b66c9a37..3d7194e86459 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -2,10 +2,12 @@ AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1
 AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
 AUX compiz-0.7.8-framesvg.patch 3119 RMD160 315aeb6b97db26af1bc48a2fb66228b402a07823 SHA1 5706c35119691c7b466e4c3b6dc39dd5a463cddf SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21
 AUX compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch 1118 RMD160 cc6920723b29f89da29c7ca5df89770cf70d94a8 SHA1 5b0e790e0a0cc304b2510de53dee7648e0ca67c1 SHA256 071a9a8032a21cd560cb68eb172b2557bb997cffc750ba8212c2fd88443d9519
-AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
+AUX compiz-manager 9835 RMD160 0c579ebd41c22b4f33edb2d2d5b1e41ac30720ac SHA1 ff39aa8abf43e42895aec6696c3659773f927fd2 SHA256 e387ff9f01b84c572f31643316ed2ce2eacd11a92488e745ebcfd659945c6f1d
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
 DIST compiz-0.8.2.tar.gz 1751448 RMD160 e8bd6e6acd61d585451f1ecfc9fb9658e3faccec SHA1 e3e8022f488ab039d7a0d42400b67ebad063c1b9 SHA256 8ef19e2282c4df048f80a4c0cf61dcd2e92b17b2e2436f77372ccc13745dd5c7
+DIST compiz-0.8.4.tar.gz 1755741 RMD160 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63 SHA1 244ac823818209e44944d74df42d8986ec31d9dd SHA256 22b1f06a458f8eefc9ef511f78a55887fcd456e0fe5bb7574eefcf624146ecf6
 EBUILD compiz-0.8.2-r3.ebuild 3558 RMD160 4bdf0e1aad78e59b0d21188a1ac7c6c10cc64645 SHA1 b76b612ad9ca5a2861da7621aa8fbb60226f1fed SHA256 230f4425c493499607f305f12de205ebdf6e40d5df8c2714a306457c6ec72b3f
-MISC ChangeLog 7943 RMD160 dddde3b8b6cbe7445e938ca8c4cbe06231891b9e SHA1 8966a9ecf04a5c70c92958ea0ec9de5a6c02cd95 SHA256 e01af95e1f1bb728819edb6b3b91b15a084d8131d871f10e6c0e4a1f198ca034
+EBUILD compiz-0.8.4.ebuild 3596 RMD160 7b70902c870cad9fb16dd9ec1d5086a02d673c2c SHA1 d8d50d1da6f622c1ab9ffa35ebf6ecad06c14880 SHA256 d0c0dc230f7b350c627aeaa8bd0c56de66e2b88fe88e6b6a3371890499cc4c83
+MISC ChangeLog 8191 RMD160 2db1209448077a9644a3852ea7ff657cc6e07acf SHA1 808f7aa891f0df7ab75931337eccdb609799b700 SHA256 14cc6de74198bbaa75b1e898dfb37be7d6ebd8ef607e9676d9ffc628d21ceb0a
 MISC metadata.xml 502 RMD160 47964a1d3a920c089bfcf53140e4d6b432a6f040 SHA1 6ff05c98cd83c51b7912202b6c6f22541887f2ad SHA256 71c24630bf257ef8a7a0afe406963c43908aa8aeebb19046991927275289bdf6
diff --git a/x11-wm/compiz/compiz-0.8.4.ebuild b/x11-wm/compiz/compiz-0.8.4.ebuild
new file mode 100644
index 000000000000..4fee4e87f024
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.8.4.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4.ebuild,v 1.1 2009/10/15 16:30:11 mrpouet Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="3D composite and windowmanager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+cairo dbus fuse gnome gtk kde kde3 +svg"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/libpng
+	>=media-libs/mesa-6.5.1-r1
+	>=x11-base/xorg-server-1.1.1-r1
+	x11-libs/libX11[xcb]
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libXrender-0.8.4
+	>=x11-libs/startup-notification-0.7
+	cairo? (
+			x11-libs/cairo[X]
+	)
+	dbus? ( >=sys-apps/dbus-1.0 )
+	fuse? ( sys-fs/fuse )
+	gnome? (
+		>=gnome-base/gnome-control-center-2.16.1:2
+		gnome-base/gnome-desktop
+		gnome-base/gconf:2
+	)
+	gtk? (
+		>=x11-libs/gtk+-2.8.0:2
+		>=x11-libs/libwnck-2.18.3
+		x11-libs/pango
+	)
+	kde? (
+		|| (
+			>=kde-base/kwin-4.2.0
+			kde-base/kwin:live
+		)
+	)
+	kde3? (
+		|| ( kde-base/kwin:3.5
+			kde-base/kdebase:3.5
+		)
+		dev-libs/dbus-qt3-old
+	)
+	svg? (
+		>=gnome-base/librsvg-2.14.0:2
+		>=x11-libs/cairo-1.0
+	)
+"
+
+RDEPEND="${DEPEND}
+	x11-apps/mesa-progs
+	x11-apps/xvinfo"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig
+	x11-proto/damageproto
+	x11-proto/xineramaproto"
+
+src_prepare() {
+
+	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+
+	# Missing gconf flags, fix bug #282807
+	epatch "${FILESDIR}"/${PN}-0.8.2-gtk-gnome-missing-gconf-flags.patch
+
+	if ! use gnome; then
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-dependency-tracking \
+		--disable-gnome-keybindings \
+		--enable-librsvg \
+		--with-default-plugins \
+		$(use_enable cairo annotate) \
+		$(use_enable dbus) \
+		$(use_enable dbus dbus-glib) \
+		$(use_enable fuse) \
+		$(use_enable gnome) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome metacity) \
+		$(use_enable gtk) \
+		$(use_enable kde kde4) \
+		$(use_enable kde3 kde)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Install compiz-manager
+	dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
+
+	# Add the full-path to lspci
+	sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
+
+	# Fix the hardcoded lib paths
+	sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
+
+	# Create gentoo's config file
+	dodir /etc/xdg/compiz || die "dodir failed"
+
+	cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
+	COMPIZ_BIN_PATH="/usr/bin/"
+	PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
+	LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
+	LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
+	KWIN="$(type -p kwin)"
+	METACITY="$(type -p metacity)"
+	SKIP_CHECKS="yes"
+	EOF
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	insinto "/usr/share/applications"
+	doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gnome && gnome2_gconf_install
+
+	ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
+	ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
+}
+
+pkg_prerm() {
+	use gnome && gnome2_gconf_uninstall
+}
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
index 3fbae21c0080..74d45da2590e 100644
--- a/x11-wm/compiz/files/compiz-manager
+++ b/x11-wm/compiz/files/compiz-manager
@@ -222,7 +222,7 @@ check_nvidia()
 # Check if the max texture size is large enough compared to the resolution
 check_texture_size()
 {
-	TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
+	TEXTURE_LIMIT=$(glxinfo -l | grep -m1 GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g')
 	RESOLUTION=$(xdpyinfo  | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//')
 	VRES=$(echo $RESOLUTION | sed 's/.*x//')
 	HRES=$(echo $RESOLUTION | sed 's/x.*//')