debian/compiz-core.manpages | 1
debian/compiz-manager | 407
----------
debian/compiz.1 | 94
+-
debian/compiz.real.1 | 86
--
debian/copyright | 19
debian/patches/015_optional-fbo.patch | 26
debian/patches/compiz-debian-paths.patch | 19
debian/patches/compiz-manager-nvidia-settings-optional.patch | 13
debian/patches/series | 23
debian/patches/ubuntu/010-disable-child-window-clipping.patch | 16
debian/patches/ubuntu/013-add-cursor-theme-support.patch | 22
debian/patches/ubuntu/014-fix-gtk-window-decorator-no-argb-crash.patch | 12
debian/patches/ubuntu/014_fix-no-border-window-shadow.patch | 21
debian/patches/ubuntu/015_draw_dock_shadows_on_desktop.patch | 82
++
debian/patches/ubuntu/016_call_glxwaitx_before_drawing.patch | 13
debian/patches/ubuntu/017_always_unredirect_screensaver_on_nvidia.patch | 28
debian/patches/ubuntu/018_use_metacity_settings.patch | 8
debian/patches/ubuntu/020_fix_focus.patch | 81
+
debian/patches/ubuntu/028_compiz_manager_blacklist | 22
debian/patches/ubuntu/029_compiz_manager_decoration.patch | 23
debian/patches/ubuntu/029_compiz_manager_nvidia_settings.patch | 15
debian/patches/ubuntu/029_default_options | 77
-
debian/patches/ubuntu/030_compiz_manager_multi_display | 32
debian/patches/ubuntu/030_from_git_crash_fix_multiscreen.patch | 45
+
debian/patches/ubuntu/031_compiz_manager_extra_blacklist_support | 17
debian/patches/ubuntu/031_from_git_fix_gnome_keybindings.patch | 43
+
debian/patches/ubuntu/032_compiz_manager_add_gnomecompat | 25
debian/patches/ubuntu/033_compiz_manager_xdg_dirs | 23
debian/patches/ubuntu/035_ignore_workspaces | 8
debian/patches/ubuntu/037_fullscreen_stacking_fixes.patch | 8
debian/patches/ubuntu/042-compiz-manager-default-plugin | 11
debian/patches/ubuntu/046_compiz_manager_second_screen.patch | 37
debian/patches/ubuntu/049-damage-report-non-empty.patch | 16
debian/patches/ubuntu/050_stacking.patch | 8
debian/patches/ubuntu/060_move_checks_to_compiz.patch | 265
++++++
debian/patches/ubuntu/061_KWD_stubs.patch | 13
debian/patches/ubuntu/099-autogen.patch | 8
debian/patches/ubuntu/series | 18
debian/patches/whitelist-fglrx.patch | 13
debian/rules | 2
40 files changed, 798 insertions(+), 902 deletions(-)
New commits:
commit 67da748b0c88ac3325e7a60017df6dad8fd9c1ce
Author: Sean Finney <sean...@debian.org>
Date: Wed Feb 3 00:45:38 2010 +0100
Transition from compiz-manager to compiz binary for /usr/bin/compiz
The -manager script is no more. It was not very actively maintained
upstream and the compiz binary has taken over most of the same checks,
making the script obsolete.
diff --git a/debian/compiz-core.manpages b/debian/compiz-core.manpages
index 7c36f96..8ddd72e 100644
--- a/debian/compiz-core.manpages
+++ b/debian/compiz-core.manpages
@@ -1,2 +1 @@
-debian/compiz.real.1
debian/compiz.1
diff --git a/debian/compiz-manager b/debian/compiz-manager
deleted file mode 100644
index 91605c0..0000000
--- a/debian/compiz-manager
+++ /dev/null
@@ -1,407 +0,0 @@
-#!/bin/sh
-# Compiz Manager wrapper script
-#
-# Copyright (c) 2007 Kristian Lyngstøl <krist...@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) <trev...@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="/usr/local/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/local/lib/compiz/"
-GLXINFO="/usr/bin/glxinfo"
-KWIN="/usr/bin/kwin"
-METACITY="/usr/bin/metacity"
-XFWM="/usr/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="/usr/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 /etc/xdg/compiz/compiz-manager && .
/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/debian/compiz.1 b/debian/compiz.1
index 90a2648..ccc6cf0 100644
--- a/debian/compiz.1
+++ b/debian/compiz.1
@@ -1,4 +1,4 @@
-.TH COMPIZ 1 "September 29, 2006"
+.TH COMPIZ 1 "July 13, 2007"
.SH NAME
compiz \- OpenGL window and compositing manager
@@ -8,25 +8,79 @@ compiz \- OpenGL window and compositing manager
.RI [ options ]
.RI [ plugins ]
.SH DESCRIPTION
-\fBcompiz\fR is a wrapper around the real \fBcompiz.real\fR binary that
-automatically sets up everything needed to properly run compiz on a Debian
-system.
-
-In order to use the X server's accelerated indirect rendering (AIGLX)
-capabilities, the wrapper will call \fBcompiz.real\fR with the necessary
-command-line arguments.
-
-If the package \fBcompiz-gtk\fR is installed, the wrapper will automatically
-start the \fBgtk-window-decorator\fR.
+.B compiz
+is a compositing window-manager using OpenGL for rendering.
-The wrapper will also check if the \fBcompiz-plugins\fR package has been
-installed and load the \fBgconf\fR plugin which will in turn load the standard
-set of plugins.
+.SH OPTIONS
+.TP
+.BI "\-\-display " DISPLAY
+Manage the display called
+.I DISPLAY
+instead of the name obtained from the
+.I $DISPLAY
+environment variable.
+.TP
+.BI "\-\-bg\-image " IMAGE
+Use
+.I IMAGE
+as background image.
+.TP
+.BI "\-\-refresh\-rate " RATE
+Set the default refresh rate.
+.TP
+.BI \-\-fast\-filter
+Use a fast texture filter.
+.TP
+.BI \-\-indirect\-rendering
+Force an indirect rendering context. Use this when running compiz on AIGLX.
+.TP
+.BI \-\-loose\-binding
+Disable strict binding of textures. This may improve performance in some
+situations (running on XGL). As opposed to strict binding, however, this isn't
+guaranteed to work. Use with care.
+.TP
+.BI \-\-replace
+Replace any existing window managers on the given X display.
+.TP
+.BI \-\-sm\-disable
+Disable the session management.
+.TP
+.BI "\-\-sm\-client\-id " ID
+Use the given
+.I ID
+as the client ID for session management.
+.TP
+.BI \-\-no\-detection
+Disable output screen detection.
+.TP
+.BI \-\-no\-fbo
+Disable the use of FBOs (frame buffer objects). This can be useful to work
+around drivers with broken FBO implementations.
+.TP
+.BI \-\-ignore\-desktop\-hints
+Do not use desktop hints (number of desktops, current desktop) as left by the
+previous window manager.
+.TP
+.BI \-\-only\-current\-screen
+Manage only the screen defined by
+.I $DISPLAY
+(or given by the
+.I \-\-display
+option) and leave all other screens alone.
+.TP
+.BI \-\-use\-root\-window
+Use the root window instead of the composite overlay window for drawing.
+.TP
+.BI \-\-version
+Show the
+.B compiz
+version string.
+.TP
+.BI \-\-help
+Show a summary of the command-line options.
.SH AUTHOR
-The compiz wrapper was written by Thierry Reding <thie...@gilfi.de> for the
-Debian project (but may be used by others).
-
-.SH "SEE ALSO"
-.BR compiz.real(1)
-
+compiz was written by David Reveman <dav...@novell.com> and others.
+.PP
+This manual page was written by Thierry Reding <thie...@gilfi.de>,
+for the Debian project (but may be used by others).
diff --git a/debian/compiz.real.1 b/debian/compiz.real.1
deleted file mode 100644
index 87bc8e6..0000000
--- a/debian/compiz.real.1
+++ /dev/null
@@ -1,86 +0,0 @@
-.TH COMPIZ 1 "July 13, 2007"
-
-.SH NAME
-compiz.real \- OpenGL window and compositing manager
-
-.SH SYNOPSIS
-.B compiz.real
-.RI [ options ]
-.RI [ plugins ]
-.SH DESCRIPTION
-.B compiz
-is a compositing window-manager using OpenGL for rendering.
-
-.SH OPTIONS
-.TP
-.BI "\-\-display " DISPLAY
-Manage the display called
-.I DISPLAY
-instead of the name obtained from the
-.I $DISPLAY
-environment variable.
-.TP
-.BI "\-\-bg\-image " IMAGE
-Use
-.I IMAGE
-as background image.
-.TP
-.BI "\-\-refresh\-rate " RATE
-Set the default refresh rate.
-.TP
-.BI \-\-fast\-filter
-Use a fast texture filter.
-.TP
-.BI \-\-indirect\-rendering
-Force an indirect rendering context. Use this when running compiz on AIGLX.
-.TP
-.BI \-\-loose\-binding
-Disable strict binding of textures. This may improve performance in some
-situations (running on XGL). As opposed to strict binding, however, this isn't
-guaranteed to work. Use with care.
-.TP
-.BI \-\-replace
-Replace any existing window managers on the given X display.
-.TP
-.BI \-\-sm\-disable
-Disable the session management.
-.TP
-.BI "\-\-sm\-client\-id " ID
-Use the given
-.I ID
-as the client ID for session management.
-.TP
-.BI \-\-no\-detection
-Disable output screen detection.
-.TP
-.BI \-\-no\-fbo
-Disable the use of FBOs (frame buffer objects). This can be useful to work
-around drivers with broken FBO implementations.
-.TP
-.BI \-\-ignore\-desktop\-hints
-Do not use desktop hints (number of desktops, current desktop) as left by the
-previous window manager.
-.TP
-.BI \-\-only\-current\-screen
-Manage only the screen defined by
-.I $DISPLAY
-(or given by the
-.I \-\-display
-option) and leave all other screens alone.
-.TP
-.BI \-\-use\-root\-window
-Use the root window instead of the composite overlay window for drawing.
-.TP
-.BI \-\-version
-Show the
-.B compiz
-version string.
-.TP
-.BI \-\-help
-Show a summary of the command-line options.
-
-.SH AUTHOR
-compiz was written by David Reveman <dav...@novell.com> and others.
-.PP
-This manual page was written by Thierry Reding <thie...@gilfi.de>,
-for the Debian project (but may be used by others).
diff --git a/debian/copyright b/debian/copyright
index 143fb5b..1f79614 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -110,25 +110,6 @@ The 'plane' plugin was written by Søren Sandmann
<sandm...@redhat.com>:
* Author: Søren Sandmann <sandm...@redhat.com>
*/
-The 'compiz-manager' script used as /usr/bin/compiz is by Kristian Lyngstol:
-
- # Copyright (c) 2007 Kristian Lyngstøl <krist...@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
-
------------------------------------------------------------------------------
-- Translations: --
-------------------
diff --git a/debian/rules b/debian/rules
index 13e0c6f..04de8ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,8 +100,6 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) DESTDIR=$(DESTDIR) install
- mv $(DESTDIR)/usr/bin/compiz $(DESTDIR)/usr/bin/compiz.real
- $(INSTALL) --mode 0755 debian/compiz-manager $(DESTDIR)/usr/bin/compiz
# remove unneeded .la files
find $(DESTDIR)/usr/lib -type f -name '*.la' | xargs rm -f
commit f7bc9de52fa7799330f42bbc798d09b2d983ba5e
Author: Sean Finney <sean...@debian.org>
Date: Wed Feb 3 00:44:07 2010 +0100
Remove all patches to the embedded compiz-manager script
We will follow suit with ubuntu here now that the compiz binary
is basically self sufficient, and thus these patches are no longer
necessary.
diff --git a/debian/patches/compiz-debian-paths.patch
b/debian/patches/compiz-debian-paths.patch
deleted file mode 100644
index 3229ada..0000000
--- a/debian/patches/compiz-debian-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 0-compiz.orig/debian/compiz-manager
-+++ 0-compiz/debian/compiz-manager
-@@ -27,13 +27,13 @@
- #
-
-
--COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
--PLUGIN_PATH="/usr/local/lib/compiz/"
-+COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
-+PLUGIN_PATH="/usr/lib/compiz/"
- GLXINFO="/usr/bin/glxinfo"
- KWIN="/usr/bin/kwin"
- METACITY="/usr/bin/metacity"
- XFWM="/usr/bin/xfwm"
--COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
-+COMPIZ_NAME="compiz.real" # Final name for compiz (compiz.real)
-
- # For Xgl LD_PRELOAD
- LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
diff --git a/debian/patches/compiz-manager-nvidia-settings-optional.patch
b/debian/patches/compiz-manager-nvidia-settings-optional.patch
deleted file mode 100644
index 3e1c2a7..0000000
--- a/debian/patches/compiz-manager-nvidia-settings-optional.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 0-compiz.orig/debian/compiz-manager
-+++ 0-compiz/debian/compiz-manager
-@@ -206,6 +206,10 @@ check_xgl()
- # Check if the nVidia card has enough video ram to make sense
- check_nvidia_memory()
- {
-+ if ! which $NVIDIA_SETTINGS >/dev/null 2>&1; then
-+ verbose "No $NVIDIA_SETTINGS program available to determine
VideoRam."
-+ return 0
-+ fi
- 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";
diff --git a/debian/patches/series b/debian/patches/series
index a6024a2..28f517f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
012_snap-by-default.patch
014_fix-no-border-window-shadow.patch
015_optional-fbo.patch
-compiz-manager-nvidia-settings-optional.patch
-whitelist-fglrx.patch
-compiz-debian-paths.patch
# the following patches are imported from the ubuntu compiz packages
# this one changes the abi, not sure if we need it...
#ubuntu/010-disable-child-window-clipping.patch
diff --git a/debian/patches/whitelist-fglrx.patch
b/debian/patches/whitelist-fglrx.patch
deleted file mode 100644
index eea2abb..0000000
--- a/debian/patches/whitelist-fglrx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-whitelist the fglrx driver too
-see #495539
---- 0-compiz.orig/debian/compiz-manager
-+++ 0-compiz/debian/compiz-manager
-@@ -59,7 +59,7 @@ fi
- FALLBACKWM_OPTIONS="--replace $@"
-
- # Driver whitelist
--WHITELIST="nvidia intel ati radeon i810"
-+WHITELIST="fglrx nvidia intel ati radeon i810"
-
- # blacklist based on the pci ids
- # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
commit 02590fb5027540af6e657891c98e63d9dd9f1ae7
Author: Sean Finney <sean...@debian.org>
Date: Wed Feb 3 00:33:57 2010 +0100
Fix fuzz in two quilt patches
diff --git a/debian/patches/015_optional-fbo.patch
b/debian/patches/015_optional-fbo.patch
index 213c7b0..0cba4f5 100644
--- a/debian/patches/015_optional-fbo.patch
+++ b/debian/patches/015_optional-fbo.patch
@@ -1,16 +1,16 @@
---- 0-compiz.orig/include/compiz-core.h
-+++ 0-compiz/include/compiz-core.h
+--- compiz.orig/include/compiz-core.h
++++ compiz/include/compiz-core.h
@@ -219,6 +219,7 @@ extern Bool useCow;
extern Bool noDetection;
extern Bool useDesktopHints;
extern Bool onlyCurrentScreen;
+extern Bool noFBO;
- extern int defaultRefreshRate;
- extern char *defaultTextureFilter;
---- 0-compiz.orig/src/main.c
-+++ 0-compiz/src/main.c
-@@ -63,6 +63,7 @@ Bool strictBinding = TRUE;
+ extern char **initialPlugins;
+ extern int nInitialPlugins;
+--- compiz.orig/src/main.c
++++ compiz/src/main.c
+@@ -66,6 +66,7 @@ Bool strictBinding = TRUE;
Bool noDetection = FALSE;
Bool useDesktopHints = FALSE;
Bool onlyCurrentScreen = FALSE;
@@ -18,7 +18,7 @@
static Bool debugOutput = FALSE;
#ifdef USE_COW
-@@ -84,6 +85,7 @@ usage (void)
+@@ -87,6 +88,7 @@ usage (void)
"[--keep-desktop-hints] "
"[--loose-binding] "
"[--replace]\n "
@@ -26,7 +26,7 @@
"[--sm-disable] "
"[--sm-client-id ID] "
"[--only-current-screen]\n "
-@@ -343,6 +345,10 @@ main (int argc, char **argv)
+@@ -346,6 +348,10 @@ main (int argc, char **argv)
{
onlyCurrentScreen = TRUE;
}
@@ -37,10 +37,10 @@
#ifdef USE_COW
else if (!strcmp (argv[i], "--use-root-window"))
---- 0-compiz.orig/src/screen.c
-+++ 0-compiz/src/screen.c
-@@ -2063,7 +2063,7 @@ addScreen (CompDisplay *display,
- }
+--- compiz.orig/src/screen.c
++++ compiz/src/screen.c
+@@ -2183,7 +2183,7 @@ addScreen (CompDisplay *display,
+ s->generateMipmap = NULL;
s->fbo = 0;
- if (strstr (glExtensions, "GL_EXT_framebuffer_object"))
diff --git a/debian/patches/ubuntu/061_KWD_stubs.patch
b/debian/patches/ubuntu/061_KWD_stubs.patch
index 833473d..e006438 100644
--- a/debian/patches/ubuntu/061_KWD_stubs.patch
+++ b/debian/patches/ubuntu/061_KWD_stubs.patch
@@ -10,4 +10,4 @@ index 40a5076..4422a15 100644
+class Window: public QObject, public KDecorationBridge {
Q_OBJECT public:
- enum Type
+ enum Type
commit 259bb6f50a94b14274574c483454537f1388cb18
Author: Sean Finney <sean...@debian.org>
Date: Wed Feb 3 00:21:34 2010 +0100
Update ubuntu patch 013-add-cursor-theme-support.patch to cleanly apply
The ubuntu patch modifies metadata/core.xml.in, but it should be
found at metadata/core.xml.in.in.
diff --git a/debian/patches/ubuntu/013-add-cursor-theme-support.patch
b/debian/patches/ubuntu/013-add-cursor-theme-support.patch
index c5cad0b..677b4b3 100644
--- a/debian/patches/ubuntu/013-add-cursor-theme-support.patch
+++ b/debian/patches/ubuntu/013-add-cursor-theme-support.patch
@@ -1,8 +1,6 @@
-Index: compiz-0.8.4/configure.ac
-===================================================================
---- compiz-0.8.4.orig/configure.ac 2009-11-01 11:14:09.517249667 -0600
-+++ compiz-0.8.4/configure.ac 2009-11-01 11:14:28.704773780 -0600
-@@ -123,6 +123,7 @@
+--- compiz.orig/configure.ac
++++ compiz/configure.ac
+@@ -123,6 +123,7 @@ COMPIZ_REQUIRES="xcomposite \
xdamage \
xrandr \
xinerama \
@@ -10,10 +8,8 @@ Index: compiz-0.8.4/configure.ac
ice \
sm \
libxml-2.0 \
-Index: compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c
-===================================================================
---- compiz-0.8.4.orig/gtk/window-decorator/gtk-window-decorator.c
2009-11-01 11:14:09.517249667 -0600
-+++ compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c 2009-11-01
11:14:28.704773780 -0600
+--- compiz.orig/gtk/window-decorator/gtk-window-decorator.c
++++ compiz/gtk/window-decorator/gtk-window-decorator.c
@@ -30,6 +30,7 @@
#include <X11/cursorfont.h>
#include <X11/extensions/Xrender.h>
@@ -51,7 +47,7 @@ Index:
compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c
#define DBUS_DEST "org.freedesktop.compiz"
#define DBUS_PATH "/org/freedesktop/compiz/decoration/allscreens"
#define DBUS_INTERFACE "org.freedesktop.compiz"
-@@ -6491,6 +6507,44 @@
+@@ -6491,6 +6507,44 @@ button_layout_changed (GConfClient *clie
return FALSE;
}
@@ -96,7 +92,7 @@ Index:
compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c
static void
value_changed (GConfClient *client,
const gchar *key,
-@@ -6569,6 +6623,11 @@
+@@ -6569,6 +6623,11 @@ value_changed (GConfClient *client,
if (theme_opacity_changed (client))
changed = TRUE;
}
@@ -108,7 +104,7 @@ Index:
compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c
if (changed)
decorations_changed (data);
-@@ -6732,6 +6791,11 @@
+@@ -6732,6 +6791,11 @@ init_settings (WnckScreen *screen)
NULL);
gconf_client_add_dir (gconf,
@@ -120,7 +116,7 @@ Index:
compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c
COMPIZ_GCONF_DIR1,
GCONF_CLIENT_PRELOAD_ONELEVEL,
NULL);
-@@ -6740,6 +6804,9 @@
+@@ -6740,6 +6804,9 @@ init_settings (WnckScreen *screen)
"value_changed",
G_CALLBACK (value_changed),
screen);
@@ -130,10 +126,8 @@ Index:
compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c
#elif USE_DBUS_GLIB
DBusConnection *connection;
DBusMessage *reply;
-Index: compiz-0.8.4/metadata/core.xml.in
-===================================================================
---- compiz-0.8.4.orig/metadata/core.xml.in 2009-11-01 11:14:09.487250184
-0600
-+++ compiz-0.8.4/metadata/core.xml.in 2009-11-01 11:14:28.704773780 -0600
+--- compiz.orig/metadata/core.xml.in.in
++++ compiz/metadata/core.xml.in.in
@@ -35,6 +35,18 @@
<min>0</min>
<max>10000</max>
@@ -153,10 +147,8 @@ Index: compiz-0.8.4/metadata/core.xml.in
<option name="ping_delay" type="int">
<_short>Ping Delay</_short>
<_long>Interval between ping messages</_long>
-Index: compiz-0.8.4/src/display.c
-===================================================================
---- compiz-0.8.4.orig/src/display.c 2009-11-01 11:14:13.267249390 -0600
-+++ compiz-0.8.4/src/display.c 2009-11-01 11:14:28.704773780 -0600
+--- compiz.orig/src/display.c
++++ compiz/src/display.c
@@ -41,6 +41,8 @@
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/Xrandr.h>
@@ -166,7 +158,7 @@ Index: compiz-0.8.4/src/display.c
#include <compiz-core.h>
-@@ -474,6 +476,32 @@
+@@ -474,6 +476,32 @@ shade (CompDisplay *d,
return TRUE;
}
@@ -199,7 +191,7 @@ Index: compiz-0.8.4/src/display.c
const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] =
{
{ "abi", "int", 0, 0, 0 },
{ "active_plugins", "list", "<type>string</type>", 0, 0 },
-@@ -510,7 +538,9 @@
+@@ -510,7 +538,9 @@ const CompMetadataOptionInfo coreDisplay
{ "toggle_window_shaded_key", "key", 0, shade, 0 },
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
