Update to 0.8.2

	o Start removing the fusion name from plugins.

5 files changed, 448 insertions, 8 deletions

diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index a199dcfb4312..1e18be47f843 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	compiz
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	x11-wm
+MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
 MAINTAINER=	rnoland@FreeBSD.org
 COMMENT=	Compiz Composite/Window Manager
@@ -18,8 +18,8 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 XORG_CAT=	app
 GNU_CONFIGURE=	yes
-#USE_BZIP2=	yes
-USE_TGZ=	yes
+USE_BZIP2=	yes
+#USE_TGZ=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GL=		glu
@@ -32,6 +32,7 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-annotate.schemas \
 		compiz-blur.schemas \
 		compiz-clone.schemas \
+		compiz-commands.schemas \
 		compiz-core.schemas \
 		compiz-cube.schemas \
 		compiz-dbus.schemas \
@@ -40,6 +41,7 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-fs.schemas \
 		compiz-gconf.schemas \
 		compiz-glib.schemas \
+		compiz-gnomecompat.schemas \
 		compiz-ini.schemas \
 		compiz-inotify.schemas \
 		compiz-kconfig.schemas \
@@ -71,9 +73,19 @@ OPTIONS=	RSVG "Enable librsvg2 support" on \
 		FUSEFS "Enable fusefs support" off \
 		KDE "Enable KDE support" off
 
+SUB_FILES=		compiz-manager
+DESKTOP_ENTRIES=	"Compiz Manager" \
+			"A wrapper script for starting compiz" \
+			"" \
+			"compiz-manager" \
+			"Application;Core;" \
+			false
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
 
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_RSVG)
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
index 92cf2e918e27..39f18386df8b 100644
--- a/x11-wm/compiz/distinfo
+++ b/x11-wm/compiz/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/compiz-0.7.8.tar.gz) = e99977d9170a7bd5d571004eed038428
-SHA256 (xorg/app/compiz-0.7.8.tar.gz) = b46f52b776cc78e85357a07688d04b36ec19c65eadeaf6f6cfcca7b8515e6503
-SIZE (xorg/app/compiz-0.7.8.tar.gz) = 1463748
+MD5 (xorg/app/compiz-0.8.2.tar.bz2) = c161975eb0fe8deac7be8d99408a80fc
+SHA256 (xorg/app/compiz-0.8.2.tar.bz2) = f526050f0e0b81dda5a7fc5f28c0b7fd879a77a2676f7303b10dbdda9dc3b0a8
+SIZE (xorg/app/compiz-0.8.2.tar.bz2) = 1086003
diff --git a/x11-wm/compiz/files/compiz-manager.in b/x11-wm/compiz/files/compiz-manager.in
new file mode 100644
index 000000000000..adfd309d3830
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-manager.in
@@ -0,0 +1,407 @@
+#!/bin/sh
+# Compiz Manager wrapper script
+# 
+# Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+#
+# Contributions by: Treviño (3v1n0) <trevi55@gmail.com>, Ubuntu Packages
+#
+# Much of this code is based on Beryl code, also licensed under the GPL.
+# This script will detect what options we need to pass to compiz to get it
+# started, and start a default plugin and possibly window decorator.
+# 
+
+
+COMPIZ_BIN_PATH="%%LOCALBASE%%/bin/" # For window decorators and compiz
+PLUGIN_PATH="%%LOCALBASE%%/lib/compiz/" 
+GLXINFO="%%LOCALBASE%%/bin/glxinfo"
+KWIN="%%LOCALBASE%%/bin/kwin"
+METACITY="%%LOCALBASE%%/bin/metacity"
+XFWM="%%LOCALBASE%%/bin/xfwm"
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
+
+# For Xgl LD_PRELOAD
+LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
+LIBGL_FGLRX="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
+
+# Minimum amount of memory (in kilo bytes) that nVidia cards need
+# to be allowed to start
+# Set to 262144 to require 256MB
+NVIDIA_MEMORY="65536" # 64MB
+NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
+
+# For detecting what driver is in use, the + is for one or more /'s
+XORG_DRIVER_PATH="%%LOCALBASE%%/lib/xorg/modules/drivers/+"
+FALLBACKWM="xterm"
+if [ x"$KDE_FULL_SESSION" = x"true" ]; then 
+        FALLBACKWM="${KWIN}";
+elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then 
+        FALLBACKWM="${METACITY}"
+elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then 
+        FALLBACKWM="${XFWM}"
+fi
+
+FALLBACKWM_OPTIONS="--replace $@"
+
+# Driver whitelist
+WHITELIST="nvidia intel ati radeon i810"
+
+# blacklist based on the pci ids 
+# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
+T="   1002:5954 1002:5854 1002:5955" # ati rs480
+T="$T 1002:4153" # ATI Rv350
+T="$T 8086:2982 8086:2992 8086:29a2 8086:2a02 8086:2a12"  # intel 965
+BLACKLIST_PCIIDS="$T"
+unset T
+
+COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
+COMPIZ_PLUGINS=""
+ENV=""
+
+# Use emerald by default if it exist
+USE_EMERALD="yes"
+
+# No indirect by default
+INDIRECT="no"
+
+# Default X.org log if xset q doesn't reveal it
+XORG_DEFAULT_LOG="/var/log/Xorg.0.log"
+
+# Set to yes to enable verbose
+VERBOSE="yes"
+
+# Echos the arguments if verbose
+verbose()
+{
+	if [ "x$VERBOSE" = "xyes" ]; then
+		printf "$*"
+	fi
+}
+
+# abort script and run fallback windowmanager
+abort_with_fallback_wm()
+{
+	if [ "x$SKIP_CHECKS" = "xyes" ]; then
+		verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
+		return 0;
+	fi
+	
+	if [ "x$CM_DRY" = "xyes" ]; then
+		verbose "Dry run failed: Problems detected with 3D support.'n"
+		exit 1;
+	fi
+
+	verbose "aborting and using fallback: $FALLBACKWM \n"
+
+	if [ -x $FALLBACKWM ]; then
+		exec $FALLBACKWM $FALLBACKWM_OPTIONS
+	else
+		printf "no $FALLBACKWM found, exiting\n"
+		exit 1
+	fi
+}
+
+# Check for non power of two texture support
+check_npot_texture()
+{
+	verbose "Checking for non power of two support: "
+	if glxinfo 2> /dev/null | egrep -q '(GL_ARB_texture_non_power_of_two|GL_NV_texture_rectangle|GL_EXT_texture_rectangle|GL_ARB_texture_rectangle)' ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "Not present. \n"
+		return 1;
+	fi
+
+}
+
+# Check for presence of FBConfig
+check_fbconfig()
+{
+	verbose "Checking for FBConfig: "
+	if [ "$INDIRECT" = "yes" ]; then
+		$GLXINFO -i | grep -q GLX.*fbconfig 
+		FB=$?
+	else
+		$GLXINFO | grep -q GLX.*fbconfig 
+		FB=$?
+	fi
+
+	if [ $FB = "0" ]; then
+		unset FB
+		verbose "present. \n"
+		return 0;
+	else
+		unset FB
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+
+# Check for TFP
+check_tfp()
+{
+	verbose "Checking for texture_from_pixmap: "
+	if [ $($GLXINFO 2>/dev/null | grep -c GLX_EXT_texture_from_pixmap) -gt 2 ] ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		if [ "$INDIRECT" = "yes" ]; then
+			unset LIBGL_ALWAYS_INDIRECT
+			INDIRECT="no"
+			return 1;
+		else
+			verbose "Trying again with indirect rendering:\n";
+			INDIRECT="yes"
+			export LIBGL_ALWAYS_INDIRECT=1
+			check_tfp;
+			return $?
+		fi
+	fi
+}
+
+# Check wether the composite extension is present
+check_composite()
+{
+	verbose "Checking for Composite extension: "
+	if xdpyinfo -queryExtensions | grep -q Composite ; then
+		verbose "present. \n";
+		return 0;
+	else
+		verbose "not present. \n";
+		return 1;
+	fi
+}
+
+# Detects if Xgl is running
+check_xgl()
+{
+	verbose "Checking for Xgl: "
+	if xvinfo | grep -q Xgl ; then
+		verbose "present. \n"
+		return 0;
+	else
+		verbose "not present. \n"
+		return 1;
+	fi
+}
+
+# Check if the nVidia card has enough video ram to make sense
+check_nvidia_memory()
+{
+	MEM=$(${NVIDIA_SETTINGS} -q VideoRam | egrep Attribute\ \'VideoRam\'\ .*: | cut -d: -f3 | sed 's/[^0-9]//g')
+	if [ $MEM -lt $NVIDIA_MEMORY ]; then
+		verbose "Less than ${NVIDIA_MEMORY}kb of memory and nVidia";
+		return 1;
+	fi
+	return 0;
+}
+
+# Check for existence if NV-GLX
+check_nvidia()
+{
+	if [ ! -z $NVIDIA_INTERNAL_TEST ]; then
+		return $NVIDIA_INTERNAL_TEST;
+	fi
+	verbose "Checking for nVidia: "
+	if xdpyinfo | grep -q NV-GLX ; then
+		verbose "present. \n"
+		NVIDIA_INTERNAL_TEST=0
+		return 0;
+	else
+		verbose "not present. \n"
+		NVIDIA_INTERNAL_TEST=1
+		return 1;
+	fi
+}
+
+# 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')
+	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.*//')
+	verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): ";
+	if [ $VRES -gt $TEXTURE_LIMIT ] || [ $HRES -gt $TEXTURE_LIMIT ]; then
+		verbose "Failed.\n"
+		return 1;
+	fi
+	verbose "Passed.\n"
+	return 0
+}
+
+# check driver whitelist
+running_under_whitelisted_driver()
+{
+	LOG=$(xset q|grep "Log file"|awk '{print $3}')
+	if [ "$LOG" = "" ]; then
+	    verbose "xset q doesn't reveal the location of the log file. Using fallback $XORG_DEFAULT_LOG \n"
+	    LOG=$XORG_DEFAULT_LOG;
+	fi
+	if [ -z "$LOG" ];then
+		verbose "AIEEEEH, no Log file found \n"
+		verbose "$(xset q) \n"
+	return 0
+	fi
+	for DRV in ${WHITELIST}; do
+		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
+		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
+		then
+			return 0
+		fi
+	done
+	verbose "No whitelisted driver found\n"
+	return 1
+}
+
+# check pciid blacklist
+have_blacklisted_pciid()
+{
+#	OUTPUT=$(lspci -n)
+#	for ID in ${BLACKLIST_PCIIDS}; do
+#		if echo "$OUTPUT" | egrep -q "$ID"; then
+#			verbose "Blacklisted PCIID '$ID' found \n"
+#			return 0
+#		fi
+#	done
+#	OUTPUT=$(lspci -vn | grep -i VGA)
+#	verbose "Detected PCI ID for VGA: $OUTPUT\n"
+	return 1
+}
+
+build_env()
+{
+	if check_nvidia; then
+		ENV="__GL_YIELD=NOTHING "
+	fi
+	if [ "$INDIRECT" = "yes" ]; then
+		ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
+	fi
+	if check_xgl; then
+		if [ -f ${LIBGL_NVIDIA} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}"
+			verbose "Enabling Xgl with nVidia drivers...\n"
+		fi
+		if [ -f ${LIBGL_FGLRX} ]; then
+			ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}"
+			verbose "Enabling Xgl with fglrx ATi drivers...\n"
+		fi
+	fi
+
+	ENV="$ENV FROM_WRAPPER=yes"
+
+	if [ -n "$ENV" ]; then
+		export $ENV
+	fi
+}
+
+build_args()
+{
+	if [ "x$INDIRECT" = "xyes" ]; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
+	fi
+	if [ ! -z "$DESKTOP_AUTOSTART_ID" ]; then
+		COMPIZ_OPTIONS="$COMPIZ_OPTIONS --sm-client-id $DESKTOP_AUTOSTART_ID"
+	fi
+	if check_nvidia; then
+		if [ "x$INDIRECT" != "xyes" ]; then
+			COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
+		fi
+	fi
+}
+
+####################
+# Execution begins here.
+
+# Read configuration from XDG paths
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+	test -f %%LOCALBASE%%/etc/xdg/compiz/compiz-manager && . %%LOCALBASE%%/etc/xdg/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager
+fi
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+	test -f $HOME/.config/compiz/compiz-manager && . $HOME/.config/compiz/compiz-manager
+else
+	test -f $XDG_CONFIG_HOME/compiz/compiz-manager && .  $XDG_CONFIG_HOME/compiz/compiz-manager
+fi
+
+# Don't use compiz when running the failsafe session
+if [ "x$GNOME_DESKTOP_SESSION_ID" = "xFailsafe" ]; then
+	abort_with_fallback_wm
+fi
+
+if [ "x$LIBGL_ALWAYS_INDIRECT" = "x1" ]; then
+	INDIRECT="yes";
+fi
+
+# if we run under Xgl, we can skip some tests here
+if ! check_xgl; then
+	# if vesa or vga are in use, do not even try glxinfo (LP#119341)
+	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
+		abort_with_fallback_wm
+	fi
+	# check if we have the required bits to run compiz and if not, 
+	# fallback
+	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
+		abort_with_fallback_wm
+	fi
+
+	if check_nvidia && ! check_nvidia_memory; then
+		abort_with_fallback_wm
+	fi
+
+	if ! check_fbconfig; then
+		abort_with_fallback_wm
+	fi
+fi
+
+# load the ccp plugin if present and fallback to plain gconf if not
+if [ -f ${PLUGIN_PATH}libccp.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS ccp"
+elif [ -f ${PLUGIN_PATH}libgconf.so ]; then
+	COMPIZ_PLUGINS="$COMPIZ_PLUGINS glib gconf"
+fi
+
+# get environment
+build_env
+build_args
+
+if [ "x$CM_DRY" = "xyes" ]; then
+	verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n"
+	verbose "Execute: ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS \n"
+	exit 0;
+fi
+# start the gtk-window-decorator if present
+if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
+	verbose "Starting emerald\n"
+	${COMPIZ_BIN_PATH}emerald --replace &
+elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
+	verbose "Starting gtk-window-decorator\n"
+	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
+elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
+	verbose "Starting kde-window-decorator\n"
+	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
+	FALLBACKWM="${KWIN}"
+fi
+
+${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
+
diff --git a/x11-wm/compiz/pkg-message b/x11-wm/compiz/pkg-message
new file mode 100644
index 000000000000..fb8bce93719d
--- /dev/null
+++ b/x11-wm/compiz/pkg-message
@@ -0,0 +1,10 @@
+This port has installed compiz-manager which is a wrapper to start
+compiz.
+
+If you are using gnome, you can use the configuration editor to set the
+value of:
+
+desktop->gnome->session->required_components->windowmanager = compiz-manager
+
+This will enable compiz as your default window manager.
+
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index 5e53703c1dd0..0a0e7cf0e353 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/compiz
+bin/compiz-manager
 %%GTK%%bin/gtk-window-decorator
 %%KDE%%bin/kde-window-decorator
 include/compiz/compiz.h
@@ -18,6 +19,9 @@ lib/compiz/libblur.so
 lib/compiz/libclone.a
 lib/compiz/libclone.la
 lib/compiz/libclone.so
+lib/compiz/libcommands.a
+lib/compiz/libcommands.la
+lib/compiz/libcommands.so
 lib/compiz/libcube.a
 lib/compiz/libcube.la
 lib/compiz/libcube.so
@@ -39,6 +43,9 @@ lib/compiz/libgconf.so
 lib/compiz/libglib.a
 lib/compiz/libglib.la
 lib/compiz/libglib.so
+lib/compiz/libgnomecompat.a
+lib/compiz/libgnomecompat.la
+lib/compiz/libgnomecompat.so
 lib/compiz/libini.a
 lib/compiz/libini.la
 lib/compiz/libini.so
@@ -102,6 +109,7 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/annotate.xml
 %%DATADIR%%/blur.xml
 %%DATADIR%%/clone.xml
+%%DATADIR%%/commands.xml
 %%DATADIR%%/core.xml
 %%DATADIR%%/cube.xml
 %%DATADIR%%/dbus.xml
@@ -111,6 +119,7 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/fs.xml
 %%DATADIR%%/gconf.xml
 %%DATADIR%%/glib.xml
+%%DATADIR%%/gnomecompat.xml
 %%DATADIR%%/icon.png
 %%DATADIR%%/ini.xml
 %%DATADIR%%/inotify.xml
@@ -133,7 +142,7 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/wobbly.xml
 %%DATADIR%%/zoom.xml
 %%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
-%%GNOME%%share/gnome/wm-properties/compiz.desktop
+%%GNOME%%share/gnome/wm-properties/compiz-wm.desktop
 %%GNOME%%share/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 %%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml
 %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
@@ -141,6 +150,7 @@ libdata/pkgconfig/libdecoration.pc
 %%GNOME%%window-manager-settings/libcompiz.la
 %%GNOME%%window-manager-settings/libcompiz.so
 %%GNOME%%@cwd
+share/applications/compiz.desktop
 share/locale/af/LC_MESSAGES/compiz.mo
 share/locale/ar/LC_MESSAGES/compiz.mo
 share/locale/bg/LC_MESSAGES/compiz.mo
@@ -197,6 +207,7 @@ share/locale/xh/LC_MESSAGES/compiz.mo
 share/locale/zh_CN/LC_MESSAGES/compiz.mo
 share/locale/zh_TW/LC_MESSAGES/compiz.mo
 share/locale/zu/LC_MESSAGES/compiz.mo
+@dirrmtry share/applications
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
 @dirrmtry share/locale/lo/LC_MESSAGES