Hello community,
here is the log from the commit of package compiz-manager for openSUSE:Factory
checked in at Mon Nov 23 15:01:28 CET 2009.
--------
--- compiz-manager/compiz-manager.changes 2009-10-07 09:07:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes 2009-11-22 19:01:04.000000000 +0100
@@ -1,0 +2,15 @@
+Mon Nov 16 11:54:45 CET 2009 - dimstar@opensuse.org
+
+- Update to version 0.6.0
+- Drop patches:
+ + NOMAd
+ + cleanup (merged)
+ + blacklisting of drivers (a lot of work happened)
+- Clean spec file using spec-cleaner
+- bug-469785-disable-loose-binding.diff has been updated to be in
+ sync with upstream. Patch taken from upstream commit 06ca70.
+- Add compiz-manager-setup.patch to integrate compiz-manager in
+ the openSUSE eco system.
+- Fix lint errors (desktop file, empty build section added)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
compiz-manager-0.0.1_git080201.tar.bz2
compiz-manager-blacklist-865G.patch
compiz-manager-blacklist-ati-and-radeon.patch
compiz-manager-cleanup.patch
compiz-manager-cm-dry.patch
compiz-manager-fallbackwm.patch
compiz-manager-NOMAD.diff
New:
----
compiz-manager-0.6.0.tar.bz2
compiz-manager-setup.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz-manager.spec ++++++
--- /var/tmp/diff_new_pack.Y0ykQJ/_old 2009-11-23 15:00:37.000000000 +0100
+++ /var/tmp/diff_new_pack.Y0ykQJ/_new 2009-11-23 15:00:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package compiz-manager (Version 0.0.1_git080201 )
+# spec file for package compiz-manager (Version 0.6.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,30 +18,26 @@
Name: compiz-manager
-Url: http://opencompositing.org
+Version: 0.6.0
+Release: 1
License: GPL v2 or later
-Group: System/X11/Utilities
-PreReq: %fillup_prereq
-Requires: compiz
-Version: 0.0.1_git080201
-Release: 59
Summary: A wrapper script to launch Compiz with proper options
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Url: http://opencompositing.org
+Group: System/X11/Utilities
Source: %name-%version.tar.bz2
Source2: Compiz.desktop
-Patch: compiz-manager-cleanup.patch
-# PATCH-FIX-OPENSUSE compiz-manager-blacklist-ati-and-radeon.patch rodrigo@novell.com -- Remove ATI and RADEON cards from WHITELIST
-Patch1: compiz-manager-blacklist-ati-and-radeon.patch
-Patch2: compiz-manager-NOMAD.diff
-Patch3: compiz-manager-fallbackwm.patch
-# PATCH-FIX-UPSTREAM compiz-manager-cm-dry.patch bnc#407729 rodrigo@novell.com
-Patch4: compiz-manager-cm-dry.patch
-# PATCH-FIX-OPENSUSE compiz-manager-blacklist-865G.patch mmeeks@novell.com -- Remove Intel 865G till upstream mesa get fixed
-Patch5: compiz-manager-blacklist-865G.patch
+# PATCH-FEATURE-OPENSUSE compiz-manager-setup.patch dimstar@opensuse.org -- Configure compiz-manager to fit the openSUSE ecosystem.
+Patch0: compiz-manager-setup.patch
# PATCH-FIX-UPSTREAM compiz-manager-detect-multiple-graphic-cards.patch bnc#440273 rodrigo@novell.com -- Detect more than 1 graphic card
Patch6: compiz-manager-detect-multiple-graphic-cards.patch
+# PATCH-FIx-UPSTREAM dimstar@opensuse.org bnc#469785 -- Compiz not redrawing properly with nVidia hardware, taken from upstream commit 06ca70.
Patch7: bug-469785-disable-loose-binding.diff
+# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch8: compiz-manager-avoid-sw-rast-bug-479060.diff
+PreReq: %fillup_prereq
+Requires: compiz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: update-desktop-files
BuildArch: noarch
%description
@@ -50,29 +46,21 @@
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.
-
-
-Authors:
---------
- Kristian Lyngst�l
-
%prep
-%setup -q -n %{name}-%{version}
-%patch -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
+%setup -q
+%patch0 -p1
%patch6 -p0
-%patch7 -p0
+%patch7 -p1
%patch8 -p0
+%build
+
%install
-%__install -d -m 755 %{buildroot}/%{_bindir}
-%__install -d -m 755 %{buildroot}/%{_datadir}/compiz-manager
-%__install -m 755 compiz-manager %{buildroot}/%{_bindir}
-%__install -m 755 %{_sourcedir}/Compiz.desktop %{buildroot}/%{_datadir}/compiz-manager/
+%__install -d -m 755 %{buildroot}%{_bindir}
+%__install -d -m 755 %{buildroot}%{_datadir}/compiz-manager
+%__install -m 755 compiz-manager %{buildroot}%{_bindir}
+%__install -m 644 %{S:2} %{buildroot}%{_datadir}/compiz-manager/
+%suse_update_desktop_file %{buildroot}%{_datadir}/compiz-manager/Compiz.desktop
%clean
%__rm -rf %{buildroot}
++++++ bug-469785-disable-loose-binding.diff ++++++
--- /var/tmp/diff_new_pack.Y0ykQJ/_old 2009-11-23 15:00:37.000000000 +0100
+++ /var/tmp/diff_new_pack.Y0ykQJ/_new 2009-11-23 15:00:37.000000000 +0100
@@ -1,20 +1,29 @@
-diff -u ../compiz-manager-0.0.1_git080201/compiz-manager ./compiz-manager
---- ../compiz-manager-0.0.1_git080201/compiz-manager 2008-03-13 09:16:12.000000000 -0400
-+++ ./compiz-manager 2009-02-24 09:55:51.000000000 -0500
-@@ -332,11 +332,11 @@
- if [ "x$INDIRECT" = "xyes" ]; then
+From 06ca70fc7f823e232eec8834451cbfde081fb09f Mon Sep 17 00:00:00 2001
+From: Kristian Lyngstol
+Date: Sat, 27 Oct 2007 16:00:35 +0000
+Subject: Don't use --loose-binding on nVidia with INDIRECT=yes
+
+---
+diff --git a/compiz-manager b/compiz-manager
+index aca97a3..f19c969 100755
+--- a/compiz-manager
++++ b/compiz-manager
+@@ -302,11 +302,13 @@ build_env()
+
+ build_args()
+ {
+- if [ $INDIRECT = "yes" ]; then
++ if [ "x$INDIRECT" = "xyes" ]; then
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
fi
-- if check_nvidia; then
-- if [ "x$INDIRECT" != "xyes" ]; then
-- COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
-- fi
-- fi
-+# if check_nvidia; then
-+# if [ "x$INDIRECT" != "xyes" ]; then
-+# COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
-+# fi
-+# fi
+ if check_nvidia; then
+- COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
++ if [ "x$INDIRECT" != "xyes" ]; then
++ COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
++ fi
+ fi
}
- ####################
+--
+cgit v0.8.2
+
++++++ compiz-manager-0.0.1_git080201.tar.bz2 -> compiz-manager-0.6.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compiz-manager-0.0.1_git080201/compiz-manager new/compiz-manager-0.6.0/compiz-manager
--- old/compiz-manager-0.0.1_git080201/compiz-manager 2008-03-13 14:16:12.000000000 +0100
+++ new/compiz-manager-0.6.0/compiz-manager 2007-10-15 21:10:06.000000000 +0200
@@ -25,30 +25,18 @@
# 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.
#
-ARCH=`arch`
-if [ $ARCH == "x86_64" ]; then
- LIB=lib64
-else
- LIB=lib
-fi
-BIN_PATH=`which compiz` # For window decorators and compiz
-if [ x$BIN_PATH = "x/usr/bin/compiz" ] ; then
- COMPIZ_BIN_PATH="/usr/bin/"
- PLUGIN_PATH="/usr/$LIB/compiz/"
-else
- COMPIZ_BIN_PATH="/usr/local/bin"
- PLUGIN_PATH="/usr/local/$LIB/compiz/"
-fi
+
+COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
+PLUGIN_PATH="/usr/local/lib/compiz/"
GLXINFO="/usr/bin/glxinfo"
-KWIN=`which kwin`
+KWIN="/usr/bin/kwin"
METACITY="/usr/bin/metacity"
COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
-FUSION_ICON=`which fusion-icon`
# For Xgl LD_PRELOAD
-LIBGL_NVIDIA=""
-LIBGL_FGLRX=""
+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
@@ -57,18 +45,13 @@
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/+"
-
-if [ $DESKTOP_SESSION == "kde" ]; then
- FALLBACKWM="${KWIN}"
-else
- FALLBACKWM="${METACITY}"
-fi
+XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+"
+FALLBACKWM="${METACITY}"
FALLBACKWM_OPTIONS="--replace $@"
# Driver whitelist
-WHITELIST="nvidia intel ati radeon i810 fglrx"
+WHITELIST="nvidia intel ati radeon i810"
# blacklist based on the pci ids
# See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
@@ -110,11 +93,6 @@
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
@@ -143,7 +121,7 @@
check_fbconfig()
{
verbose "Checking for FBConfig: "
- if [ "x$INDIRECT" = "xyes" ]; then
+ if [ "$INDIRECT" = "yes" ]; then
$GLXINFO -i | grep -q GLX.*fbconfig
FB=$?
else
@@ -271,15 +249,10 @@
return 0
fi
for DRV in ${WHITELIST}; do
- if egrep -q "Loading .*${DRV}_drv\.so" $LOG &&
- ! egrep -q "Unloading .*${DRV}_drv\.so" $LOG;
+ if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
+ ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
then
- if [ x"$DRV" = x"nvidia" -o x"$DRV" = x"fglrx" ]; then
- COMPIZ_OPTIONS="$COMPIZ_OPTIONS --no-libgl-fallback"
- LIBGL_ALWAYS_INDIRECT=1
- LD_LIBRARY_PATH=/usr/X11R6/lib
- fi
- return 0
+ return 0
fi
done
verbose "No whitelisted driver found\n"
@@ -289,14 +262,14 @@
# check pciid blacklist
have_blacklisted_pciid()
{
- OUTPUT=$(/sbin/lspci -n)
+ 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=$(/sbin/lspci -vn | grep -i VGA)
+ OUTPUT=$(lspci -vn | grep -i VGA)
verbose "Detected PCI ID for VGA: $OUTPUT\n"
return 1
}
@@ -329,13 +302,11 @@
build_args()
{
- if [ "x$INDIRECT" = "xyes" ]; then
+ if [ $INDIRECT = "yes" ]; then
COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
fi
if check_nvidia; then
- if [ "x$INDIRECT" != "xyes" ]; then
- COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
- fi
+ COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
fi
}
@@ -396,33 +367,17 @@
build_env
build_args
-if [ "x$CM_DRY" = "xyes" ]; then
- verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n"
- exit 0;
-fi
-
-if [ -f $HOME/.config/compiz/disable-compiz ]; then
- abort_with_fallback_wm
-fi
-
# start the gtk-window-decorator if present
if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
- verbose "Starting emerald\n"
- pgrep emerald || ${COMPIZ_BIN_PATH}emerald --replace &
+ 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"
- pgrep gtk-window-decorator || ${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
- FALLBACKWM="${METACITY}"
+ ${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"
- pgrep kde-window-decorator || ${COMPIZ_BIN_PATH}kde-window-decorator --replace &
+ ${COMPIZ_BIN_PATH}kde-window-decorator --replace &
FALLBACKWM="${KWIN}"
-elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ x$KDE_SESSION_VERSION = x"4" ]; then
- pgrep kde4-window-decorator || ${COMPIZ_BIN_PATH}kde4-window-decorator --replace &
-fi
-
-if [ x$FUSION_ICON = "x/usr/bin/fusion-icon" ] ; then
- pgrep fusion-icon || ${FUSION_ICON} -n &
fi
${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
++++++ compiz-manager-setup.patch ++++++
Index: compiz-manager-0.6.0/compiz-manager
===================================================================
--- compiz-manager-0.6.0.orig/compiz-manager
+++ compiz-manager-0.6.0/compiz-manager
@@ -25,11 +25,18 @@
# 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.
#
+ARCH=`arch`
+if [ $ARCH == "x86_64" ]; then
+ LIB=lib64
+else
+ LIB=lib
+fi
+PREFIX=$(dirname $(dirname $(which compiz)))
-COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/local/lib/compiz/"
-GLXINFO="/usr/bin/glxinfo"
+COMPIZ_BIN_PATH="${PREFIX}/bin/" # For window decorators and compiz
+PLUGIN_PATH="${PREFIX}/${LIB}/compiz/"
+GLXINFO=$(which glxinfo)
KWIN="/usr/bin/kwin"
METACITY="/usr/bin/metacity"
COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org