Hello community,
here is the log from the commit of package compiz
checked in at Sun May 21 01:46:58 CEST 2006.
--------
--- compiz/compiz.changes 2006-05-17 19:47:52.000000000 +0200
+++ compiz/compiz.changes 2006-05-19 22:59:39.000000000 +0200
@@ -1,0 +2,15 @@
+Fri May 19 22:52:28 CEST 2006 - danw@suse.de
+
+- Patch compiz.schemas to turn off wobbly windows (bnc 176429)
+- Update gnome-xgl-settings tarball, supporting new xgl-hardware-list
+ format
+- Fix Mesa build to use $RPM_OPT_FLAGS
+
+-------------------------------------------------------------------
+Fri May 19 17:26:25 CEST 2006 - dreveman@suse.de
+
+- Session management fix. (bnc #176746)
+- Fix focus option in wobbly plugin.
+- Allow use of larger window icons in switcher. (bnc #177044)
+
+-------------------------------------------------------------------
New:
----
compiz-wobbly-off.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.X9if1R/_old 2006-05-21 01:42:47.000000000 +0200
+++ /var/tmp/diff_new_pack.X9if1R/_new 2006-05-21 01:42:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package compiz (Version cvs_060517)
+# spec file for package compiz (Version cvs_060519)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,10 +15,10 @@
License: X11/MIT, GPL
Group: System/GUI/Other
PreReq: %fillup_prereq
-Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck
+Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060519
Autoreqprov: on
-Version: cvs_060517
-Release: 2
+Version: cvs_060519
+Release: 1
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
@@ -30,6 +30,7 @@
Patch: Mesa-6.4.1-x86_64-fixes-1.patch
Patch1: Mesa-configs.diff
Patch2: compiz-audible-bell-off.patch
+Patch3: compiz-wobbly-off.patch
%description
Compiz is an OpenGL compositing manager that use
@@ -51,6 +52,7 @@
patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-6.4.1-x86_64-fixes-1.patch
patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff
patch -d compiz-0.0.10 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch
+patch -d compiz-0.0.10 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch
%build
PREFIX=/usr
@@ -62,20 +64,20 @@
pushd Mesa || exit 1
%ifarch %ix86
ln -snf linux-indirect-x86-static configs/current
-cd src && make ARCH_FLAGS="-fno-strict-aliasing" || exit 1
+cd src && make ARCH_FLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" || exit 1
%endif
%ifarch x86_64
ln -snf linux-indirect-x86-64-static configs/current
-cd src && make ARCH_FLAGS="-fno-strict-aliasing" || exit 1
+cd src && make ARCH_FLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" || exit 1
%endif
%ifarch ppc
ln -snf linux-indirect-ppc-static configs/current
-cd src && make ARCH_FLAGS="-fno-strict-aliasing" || exit 1
+cd src && make ARCH_FLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" || exit 1
%endif
%ifnarch ppc x86_64 %ix86
#make linux-dri-static EXTRA_LIB_PATH=-L/usr/X11R6/%_lib LIB_DIR=\$\(TOP\)/%_lib ARCH_FLAGS="-fno-strict-aliasing" || exit 1
ln -snf linux-indirect-static configs/current
-cd src && make EXTRA_LIB_PATH=-L/usr/X11R6/%_lib LIB_DIR=\$\(TOP\)/%_lib ARCH_FLAGS="-fno-strict-aliasing" || exit 1
+cd src && make EXTRA_LIB_PATH=-L/usr/X11R6/%_lib LIB_DIR=\$\(TOP\)/%_lib ARCH_FLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" || exit 1
%endif
popd
#
@@ -136,6 +138,15 @@
/etc/opt/gnome/gconf/schemas/compiz.schemas
%changelog -n compiz
+* Fri May 19 2006 - danw@suse.de
+- Patch compiz.schemas to turn off wobbly windows (bnc 176429)
+- Update gnome-xgl-settings tarball, supporting new xgl-hardware-list
+ format
+- Fix Mesa build to use $RPM_OPT_FLAGS
+* Fri May 19 2006 - dreveman@suse.de
+- Session management fix. (bnc #176746)
+- Fix focus option in wobbly plugin.
+- Allow use of larger window icons in switcher. (bnc #177044)
* Wed May 17 2006 - joeshaw@suse.de
- Add patch to turn the audible bell off by default. (bnc #176424)
* Wed May 17 2006 - dreveman@suse.de
++++++ compiz-0.0.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/ChangeLog new/compiz-0.0.10/ChangeLog
--- old/compiz-0.0.10/ChangeLog 2006-05-17 12:50:25.000000000 +0200
+++ new/compiz-0.0.10/ChangeLog 2006-05-19 16:07:48.000000000 +0200
@@ -1,3 +1,23 @@
+2006-05-19 David Reveman
+
+ * plugins/switcher.c (ICON_SIZE): Allow use of larger window icons.
+
+2006-05-18 Dan Winship
+
+ * plugins/wobbly.c (WOBBLY_FOCUS_DEFAULT): Set this to "None" to
+ match wobblyInitScreen() so that it actually works right.
+
+ * plugins/compiz.schemas.in.in: regen
+
+2006-05-18 Dan Winship
+
+ * src/session.c (saveYourselfCallback): if we have a
+ RestartCommand registered with the session manager, update the
+ --sm-client-id in it to match the id we were assigned. bnc 176746
+
+ * src/main.c (main, usage): remove unused --sm-save-file arg and
+ fix documentation of --sm-client-id.
+
2006-05-17 David Reveman
* plugins/compiz.schemas.in.in: Regen (Overlay Icon).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/compiz.schemas.in.in new/compiz-0.0.10/plugins/compiz.schemas.in.in
--- old/compiz-0.0.10/plugins/compiz.schemas.in.in 2006-05-17 12:47:10.000000000 +0200
+++ new/compiz-0.0.10/plugins/compiz.schemas.in.in 2006-05-19 10:28:18.000000000 +0200
@@ -2099,7 +2099,7 @@
<owner>compiz</owner>
<type>list</type>
string
- <default>[@SCALE_CORNER@]</default>
+ <default>[]</default>
<locale name="C">
<short>Corners</short>
<long>
@@ -2527,7 +2527,7 @@
<applyto>/apps/compiz/plugins/wobbly/screen0/options/focus_effect</applyto>
<owner>compiz</owner>
<type>string</type>
- <default>Shiver</default>
+ <default>None</default>
<locale name="C">
<short>Focus Effect</short>
<long>
@@ -2557,7 +2557,7 @@
<owner>compiz</owner>
<type>list</type>
string
- <default>[@SCALE_CORNER@]</default>
+ <default>[]</default>
<locale name="C">
<short>Focus Window Types</short>
<long>
@@ -2572,7 +2572,7 @@
<owner>compiz</owner>
<type>list</type>
string
- <default>[@SCALE_CORNER@]</default>
+ <default>[]</default>
<locale name="C">
<short>Grab Window Types</short>
<long>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/switcher.c new/compiz-0.0.10/plugins/switcher.c
--- old/compiz-0.0.10/plugins/switcher.c 2006-05-17 08:07:53.000000000 +0200
+++ new/compiz-0.0.10/plugins/switcher.c 2006-05-19 13:00:55.000000000 +0200
@@ -180,7 +180,7 @@
#define BOX_WIDTH 3
-#define ICON_SIZE 48
+#define ICON_SIZE 64
static float _boxVertices[] =
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/plugins/wobbly.c new/compiz-0.0.10/plugins/wobbly.c
--- old/compiz-0.0.10/plugins/wobbly.c 2006-05-06 11:31:04.000000000 +0200
+++ new/compiz-0.0.10/plugins/wobbly.c 2006-05-19 10:28:19.000000000 +0200
@@ -148,7 +148,7 @@
#define NUM_EFFECT (sizeof (effectType) / sizeof (effectType[0]))
#define WOBBLY_MAP_DEFAULT (effectName[1])
-#define WOBBLY_FOCUS_DEFAULT (effectName[1])
+#define WOBBLY_FOCUS_DEFAULT (effectName[0])
static char *mapWinType[] = {
"Splash",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/po/ChangeLog new/compiz-0.0.10/po/ChangeLog
--- old/compiz-0.0.10/po/ChangeLog 2006-05-05 22:26:03.000000000 +0200
+++ new/compiz-0.0.10/po/ChangeLog 2006-05-19 10:28:19.000000000 +0200
@@ -1,3 +1,7 @@
+2006-05-18 Dan Winship
+
+ * POTFILES.in: s/compiz.schemas.in/compiz.schemas.in.in/
+
2006-05-05 Dan Winship
* Add po/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/po/POTFILES.in new/compiz-0.0.10/po/POTFILES.in
--- old/compiz-0.0.10/po/POTFILES.in 2006-05-05 22:26:03.000000000 +0200
+++ new/compiz-0.0.10/po/POTFILES.in 2006-05-19 10:28:19.000000000 +0200
@@ -1 +1 @@
-plugins/compiz.schemas.in
+plugins/compiz.schemas.in.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/src/main.c new/compiz-0.0.10/src/main.c
--- old/compiz-0.0.10/src/main.c 2006-04-28 00:40:35.000000000 +0200
+++ new/compiz-0.0.10/src/main.c 2006-05-19 10:28:19.000000000 +0200
@@ -88,8 +88,7 @@
"[--test-mode]\n "
"[--replace] "
"[--sm-disable] "
- "[--sm-save-file] "
- "[--sm-client-id] "
+ "[--sm-client-id ID] "
"[--version]\n "
"[--help] "
"[PLUGIN]...\n",
@@ -120,7 +119,6 @@
int i, nPlugin = 0;
Bool disableSm = FALSE;
char *clientId = NULL;
- char *saveFile = NULL;
programName = argv[0];
programArgc = argc;
@@ -195,11 +193,6 @@
if (i + 1 < argc)
clientId = argv[++i];
}
- else if (!strcmp (argv[i], "--sm-save-file"))
- {
- if (i + 1 < argc)
- saveFile = argv[++i];
- }
else if (!strcmp (argv[i], "--bg-image"))
{
if (i + 1 < argc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.10/src/session.c new/compiz-0.0.10/src/session.c
--- old/compiz-0.0.10/src/session.c 2006-04-28 00:40:36.000000000 +0200
+++ new/compiz-0.0.10/src/session.c 2006-05-19 10:28:19.000000000 +0200
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
@@ -43,10 +44,42 @@
static CompWatchFdHandle iceWatchFdHandle;
static Bool connected = 0;
static Bool iceConnected = 0;
+static char *smClientId;
static void iceInit (void);
static void
+saveYourselfGotProps (SmcConn connection,
+ SmPointer client_data,
+ int num_props,
+ SmProp **props)
+{
+ int p, i;
+
+ for (p = 0; p < num_props; p++) {
+ if (!strcmp (props[p]->name, SmRestartCommand)) {
+ for (i = 0; i < props[p]->num_vals - 1; i++) {
+ if (!strncmp (props[p]->vals[i].value,
+ "--sm-client-id",
+ props[p]->vals[i].length)) {
+ SmPropValue oldVal = props[p]->vals[i + 1];
+
+ props[p]->vals[i + 1].value = smClientId;
+ props[p]->vals[i + 1].length = strlen (smClientId);
+ SmcSetProperties (connection, 1, &props[p]);
+ props[p]->vals[i + 1] = oldVal;
+
+ SmcSaveYourselfDone (connection, 1);
+ return;
+ }
+ }
+ }
+ }
+
+ SmcSaveYourselfDone (connection, 1);
+}
+
+static void
saveYourselfCallback (SmcConn connection,
SmPointer client_data,
int saveType,
@@ -54,7 +87,8 @@
int interact_Style,
Bool fast)
{
- SmcSaveYourselfDone (connection, 1);
+ if (!SmcGetProperties (connection, saveYourselfGotProps, NULL))
+ SmcSaveYourselfDone (connection, 1);
}
static void
@@ -81,7 +115,6 @@
initSession (char *smPrevClientId)
{
static SmcCallbacks callbacks;
- static char *smClientId;
if (getenv ("SESSION_MANAGER"))
{
@@ -129,6 +162,10 @@
{
if (SmcCloseConnection (smcConnection, 0, NULL) != SmcConnectionInUse)
connected = FALSE;
+ if (smClientId) {
+ free (smClientId);
+ smClientId = NULL;
+ }
}
}
++++++ compiz-wobbly-off.patch ++++++
--- plugins/compiz.schemas.in.in 2006/05/19 20:45:39 1.1
+++ plugins/compiz.schemas.in.in 2006/05/19 20:46:06
@@ -13,7 +13,7 @@
<owner>compiz</owner>
<type>list</type>
string
- <default>[gconf,decoration,wobbly,fade,minimize,cube,rotate,zoom,scale,move,resize,place,switcher,water]</default>
+ <default>[gconf,decoration,fade,minimize,cube,rotate,zoom,scale,move,resize,place,switcher,water]</default>
<locale name="C">
<short>Active Plugins</short>
<long>
@@ -2615,7 +2615,7 @@
<applyto>/apps/compiz/plugins/wobbly/screen0/options/maximize_effect</applyto>
<owner>compiz</owner>
<type>bool</type>
- <default>true</default>
+ <default>false</default>
<locale name="C">
<short>Maximize Effect</short>
<long>
++++++ gnome-xgl-settings-0.5.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/ChangeLog new/gnome-xgl-settings-0.5/ChangeLog
--- old/gnome-xgl-settings-0.5/ChangeLog 2006-05-17 05:55:33.000000000 +0200
+++ new/gnome-xgl-settings-0.5/ChangeLog 2006-05-19 22:43:13.000000000 +0200
@@ -1,7 +1,20 @@
-2006-05-16 Dan Winship
+2006-05-19 Dan Winship
* configure.in: 0.5
+ * xgl-settings/gnome-xgl-info: update for new xgl-hardware-list
+ format
+
+ * xgl-settings/switch.c: deal with config scripts
+
+2006-05-17 Dan Winship
+
+ * xgl-settings/settings.c (key_active_plugins_wobbly_changed):
+ Don't mistakenly turn wobbly windows back on at startup if it was
+ off before.
+
+2006-05-16 Dan Winship
+
* xgl-settings/gnome-xgl-settings.glade: hide the "all options"
page.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/xgl-settings/gnome-xgl-info new/gnome-xgl-settings-0.5/xgl-settings/gnome-xgl-info
--- old/gnome-xgl-settings-0.5/xgl-settings/gnome-xgl-info 2006-05-17 05:17:41.000000000 +0200
+++ new/gnome-xgl-settings-0.5/xgl-settings/gnome-xgl-info 2006-05-19 22:38:20.000000000 +0200
@@ -1,53 +1,58 @@
-#!/bin/sh
+#!/bin/bash
# Output:
-# CardStatus [CardName]
+# CardStatus CardName
# where CardStatus is: G(ood), B(ad), S(low), or U(nknown)
-# 3DStatus [MissingPackages]
-# where 3DStatus is 0 or 1
+# 3DStatus [MissingPackages] [SetupScript]
+# where 3DStatus is 0 or 1, MissingPackages are packages that might
+# need to be installed, and SetupScript is a script for additional
+# X configuration. (SetupScript starts with a "/", MissingPackages
+# doesn't.)
# XglStatus [RecommendedOptions]
# where XglStatus is 0 or 1 and RecommendedOptions is set if
# XglStatus is 0 OR it doesn't match /etc/sysconfig/displaymanager
packages=""
+setup=""
xgl_opts=""
card_status=""
-card_name=`/sbin/lspci | /usr/bin/sed -ne 's/^.*VGA compatible controller: //p'`
-if [ -n "$card_name" ]; then
- vendor="xxx"
+card_id=$(/sbin/lspci -mn | /usr/bin/sed -ne 's/"//g' -e 's/ /:/g' -e 's/-r//' -e 's/.*Class:0300://p')
+card_name=$(/sbin/lspci | /usr/bin/sed -ne 's/^.*VGA compatible controller: //p')
+if [ -n "$card_id" ]; then
IFS=" =" # That's "SPACE TAB ="
while read tag data; do
+ data=$(sed -ne 's/[[:space:]]*#.*//' -e '/./p' <<< $data)
case $tag in
- \#*|"")
- ;;
- VENDOR)
- vendor="$data"
- ;;
PACKAGES)
packages="$data"
;;
+ SETUP)
+ setup="$data"
+ ;;
XGL_OPTS)
xgl_opts="$data"
;;
- *)
- if expr "$card_name" : "$vendor.*$data" > /dev/null; then
- card_status="$tag"
+ G|B|S|U)
+ if [[ $card_id =~ ^$data ]]; then
+ card_status=$tag
break
fi
;;
esac
done < /etc/X11/xgl-hardware-list
+ unset IFS
fi
if [ -z "$card_status" ]; then
card_status=U
packages=""
+ setup=""
xgl_opts=""
fi
-if /usr/bin/3Ddiag-result; then
+if /usr/bin/3Ddiag-result &>/dev/null; then
accel_status=1
else
accel_status=0
@@ -63,6 +68,12 @@
rpm -q $pkg >/dev/null || missing_packages="$missing_packages$pkg "
done
+if [ -n "$setup" ]; then
+ if ! $setup -n; then
+ missing_packages="$missing_packages $setup"
+ fi
+fi
+
. /etc/sysconfig/displaymanager
case "$DISPLAYMANAGER_XSERVER" in
Xgl)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/xgl-settings/settings.c new/gnome-xgl-settings-0.5/xgl-settings/settings.c
--- old/gnome-xgl-settings-0.5/xgl-settings/settings.c 2006-05-16 17:15:18.000000000 +0200
+++ new/gnome-xgl-settings-0.5/xgl-settings/settings.c 2006-05-18 00:17:21.000000000 +0200
@@ -314,10 +314,10 @@
{
GtkToggleButton *toggle;
- toggle = GXGL_WIDGET ("wobbly_windows");
- if (active != gtk_toggle_button_get_active (toggle))
- gtk_toggle_button_set_active (toggle, active);
if (!active) {
+ toggle = GXGL_WIDGET ("wobbly_windows");
+ if (active != gtk_toggle_button_get_active (toggle))
+ gtk_toggle_button_set_active (toggle, active);
toggle = GXGL_WIDGET ("wobbly_map");
if (active != gtk_toggle_button_get_active (toggle))
gtk_toggle_button_set_active (toggle, active);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/xgl-settings/switch.c new/gnome-xgl-settings-0.5/xgl-settings/switch.c
--- old/gnome-xgl-settings-0.5/xgl-settings/switch.c 2006-05-17 05:18:12.000000000 +0200
+++ new/gnome-xgl-settings-0.5/xgl-settings/switch.c 2006-05-17 18:07:12.000000000 +0200
@@ -34,6 +34,7 @@
static char **missing_packages = NULL;
static gboolean xgl_enabled = FALSE;
static char *xgl_opts = NULL;
+static char *config_script = NULL;
typedef enum {
SwitchButtonNone,
@@ -305,6 +306,23 @@
g_strfreev (missing_packages);
missing_packages = strlen (lines[1]) > 2 ? g_strsplit (lines[1] + 2, " ", 0) : NULL;
+ if (config_script) {
+ g_free (config_script);
+ config_script = NULL;
+ }
+ if (missing_packages) {
+ int npackages = g_strv_length (missing_packages);
+
+ if (*missing_packages[npackages - 1] == '/') {
+ config_script = missing_packages[npackages - 1];
+ if (npackages == 1) {
+ g_free (missing_packages);
+ missing_packages = NULL;
+ } else
+ missing_packages[npackages - 1] = NULL;
+ }
+ }
+
xgl_enabled = lines[2][0] == '1';
if (xgl_opts)
g_free (xgl_opts);
@@ -430,16 +448,22 @@
static void
run_sax2 (void)
{
- char *argv[] = {
- "/opt/gnome/bin/gnomesu",
- "--",
- "/usr/X11R6/bin/sax2",
- "-O",
- "Monitor",
- NULL
- };
+ char *argv[6];
ran_sax = TRUE;
+ argv[0] = "/opt/gnome/bin/gnomesu";
+ argv[1] = "--";
+
+ if (config_script) {
+ argv[2] = config_script;
+ argv[3] = NULL;
+ } else {
+ argv[2] = "/usr/X11R6/bin/sax2";
+ argv[3] = "-O";
+ argv[4] = "Monitor";
+ argv[5] = NULL;
+ };
+
spawn_in_background (argv, _("Waiting for SaX2 to finish..."));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...