Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at Fri May 28 18:44:09 CEST 2010. -------- --- compiz-manager/compiz-manager.changes 2010-05-04 01:34:15.000000000 +0200 +++ compiz-manager/compiz-manager.changes 2010-05-26 12:06:26.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 26 09:30:53 UTC 2010 - dimstar@opensuse.org + +- Integrate default config logic into compiz-manager-setup.patch. + If the user does not yet have a Default.ini, we'll drop a + default in his configuration. +- In case the user runs a gnome-session, we append gnomecompat to + the list of expected plugins (bnc#607847) +- the mandatory plugin list was reduced minimal list (bnc#607092) + +------------------------------------------------------------------- @@ -4 +14 @@ -- Require: uti-linux to ensure we have "which". Almost everything +- Require: util-linux to ensure we have "which". Almost everything calling whatdependson for head-i586 New: ---- config.skel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -19,13 +19,14 @@ Name: compiz-manager Version: 0.6.0 -Release: 5 +Release: 6 License: GPLv2+ Summary: A wrapper script to launch Compiz with proper options Url: http://opencompositing.org Group: System/X11/Utilities Source: %name-%version.tar.bz2 Source2: Compiz.desktop +Source3: config.skel # 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 @@ -70,6 +71,7 @@ %__install -d -m 755 %{buildroot}%{_datadir}/compiz-manager %__install -m 755 compiz-manager %{buildroot}%{_bindir} %__install -m 644 %{S:2} %{buildroot}%{_datadir}/compiz-manager/ +%__install -m 644 %{S:3} %{buildroot}%{_datadir}/compiz-manager/ %suse_update_desktop_file %{buildroot}%{_datadir}/compiz-manager/Compiz.desktop %clean ++++++ bug-469785-disable-loose-binding.diff ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -4,11 +4,11 @@ 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() +Index: compiz-manager-0.6.0/compiz-manager +=================================================================== +--- compiz-manager-0.6.0.orig/compiz-manager ++++ compiz-manager-0.6.0/compiz-manager +@@ -317,11 +317,13 @@ build_env() build_args() { @@ -24,6 +24,3 @@ fi } --- -cgit v0.8.2 - ++++++ compiz-manager-avoid-sw-rast-bug-479060.diff ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -1,6 +1,8 @@ ---- compiz-manager 2008-12-03 07:20:56.000000000 -0500 -+++ compiz-manager 2009-03-16 11:07:06.000000000 -0400 -@@ -186,6 +186,19 @@ +Index: compiz-manager +=================================================================== +--- compiz-manager.orig ++++ compiz-manager +@@ -177,6 +177,19 @@ check_tfp() fi } @@ -20,7 +22,7 @@ # Check wether the composite extension is present check_composite() { -@@ -388,7 +401,7 @@ +@@ -360,7 +373,7 @@ if ! check_xgl; then fi # check if we have the required bits to run compiz and if not, # fallback ++++++ compiz-manager-bnc564536.patch ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -1,6 +1,8 @@ ---- /usr/bin/compiz-manager 2009-11-25 17:12:41.000000000 +0100 -+++ compiz-manager 2009-12-16 10:32:08.000000000 +0100 -@@ -53,7 +53,7 @@ +Index: compiz-manager +=================================================================== +--- compiz-manager.orig ++++ compiz-manager +@@ -53,7 +53,7 @@ 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 @@ -9,7 +11,7 @@ FALLBACKWM="xterm" if [ x"$KDE_FULL_SESSION" = x"true" ]; then FALLBACKWM="${KWIN}"; -@@ -297,14 +297,14 @@ +@@ -303,14 +303,14 @@ running_under_whitelisted_driver() # check pciid blacklist have_blacklisted_pciid() { ++++++ compiz-manager-detect-multiple-graphic-cards.patch ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- compiz-manager.orig +++ compiz-manager -@@ -259,13 +259,15 @@ check_texture_size() +@@ -237,13 +237,15 @@ 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]*//') ++++++ compiz-manager-dry_run.patch ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -6,11 +6,11 @@ Uses an environmental variable to avoid dealing with pushing and popping arguments to compiz. --- -diff --git a/compiz-manager b/compiz-manager -index f19c969..81bcdd3 100755 ---- a/compiz-manager -+++ b/compiz-manager -@@ -92,6 +92,11 @@ abort_with_fallback_wm() +Index: compiz-manager-0.6.0/compiz-manager +=================================================================== +--- compiz-manager-0.6.0.orig/compiz-manager ++++ compiz-manager-0.6.0/compiz-manager +@@ -105,6 +105,11 @@ abort_with_fallback_wm() verbose "SKIP_CHECKS is yes, so continuing despite problems.\n" return 0; fi @@ -22,7 +22,7 @@ verbose "aborting and using fallback: $FALLBACKWM \n" -@@ -369,6 +374,10 @@ fi +@@ -397,6 +402,10 @@ fi build_env build_args @@ -33,5 +33,3 @@ # start the gtk-window-decorator if present if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then verbose "Starting emerald\n" --- -cgit v0.8.2 ++++++ compiz-manager-setup.patch ++++++ --- /var/tmp/diff_new_pack.BqJLRr/_old 2010-05-28 18:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqJLRr/_new 2010-05-28 18:43:10.000000000 +0200 @@ -6,32 +6,49 @@ # 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" +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) -@@ -62,7 +69,7 @@ BLACKLIST_PCIIDS="$T" +@@ -62,9 +69,15 @@ BLACKLIST_PCIIDS="$T" unset T COMPIZ_OPTIONS="--ignore-desktop-hints --replace" -COMPIZ_PLUGINS="" -+COMPIZ_PLUGINS="core png cube rotate decoration move minimize resize switcher wobbly" ++# Those are bare minimum plugins. anything else might want to be enabled / disabled by users. ++COMPIZ_PLUGINS="core decoration move minimize resize" ENV="" ++#If the user does not yet have a populated Default.ini, we'll drop a default in his config folder ++if [ ! -s "$HOME/.config/compiz/compizconfig-1/Default.ini" ]; then ++ install -D "/usr/share/compiz-manager/config.skel" "$HOME/.config/compiz/compizconfig-1/Default.ini" ++fi ++ # Use emerald by default if it exist + USE_EMERALD="yes" + +@@ -380,5 +393,10 @@ elif [ -x ${COMPIZ_BIN_PATH}kde-window-d + FALLBACKWM="${KWIN}" + fi + ++# In case we are in a gnome session, we always want gnomecompat plugin loaded (session registering, key bindings) ++if [ -f ${PLUGIN_PATH}libgnomecompat.so ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ] ; then ++ COMPIZ_PLUGINS="$COMPIZ_PLUGINS gnomecompat" ++fi ++ + ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS + ++++++ config.skel ++++++ [core] as_active_plugins = core;png;cube;rotate;decoration;move;minimize;resize;switcher;wobbly;ccp;shift;workarounds;imgjpeg;put;gnomecompat;glib;session;regex;splash;wallpaper;expo; [workarounds] as_qt_fix = true as_notification_daemon_fix = true as_firefox_menu_fix = true as_legacy_fullscreen = true as_convert_urgency = true [shift] as_terminate_button = Disabled ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org