Hello community,
here is the log from the commit of package compiz
checked in at Mon May 29 01:07:02 CEST 2006.
--------
--- compiz/compiz.changes 2006-05-26 12:47:45.000000000 +0200
+++ compiz/compiz.changes 2006-05-26 22:53:00.000000000 +0200
@@ -1,0 +2,11 @@
+Fri May 26 22:49:21 CEST 2006 - danw@suse.de
+
+- Update gnome-xgl-settings to 0.6, fixing:
+- Don't consider 3D to be configured unless it's configured with
+ the right driver (#178906)
+- Use zen-installer rather than zen-updater (#176553)
+- Don't consider SaX2 to have failed if the user cancels it
+ (ie, stay in the "you need to run sax" state, don't move to the
+ "i give up, go look at the wiki" state). (#178902)
+
+-------------------------------------------------------------------
Old:
----
gnome-xgl-settings-0.5.tar.gz
New:
----
gnome-xgl-settings-0.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.BJaMAi/_old 2006-05-29 01:05:08.000000000 +0200
+++ /var/tmp/diff_new_pack.BJaMAi/_new 2006-05-29 01:05:08.000000000 +0200
@@ -15,17 +15,17 @@
License: X11/MIT, GPL
Group: System/GUI/Other
PreReq: %fillup_prereq
-Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060519
+Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526
Autoreqprov: on
Version: cvs_060526
-Release: 1
+Release: 2
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64
### /bin/ls *.tar.{gz,bz2} 2>/dev/null|perl -ne 'print "Source$n: ".$_; $n++;'
Source: Mesa-CVS-20060502.tar.bz2
Source1: compiz-0.0.11.tar.bz2
-Source2: gnome-xgl-settings-0.5.tar.gz
+Source2: gnome-xgl-settings-0.6.tar.gz
### /bin/ls *.{diff,patch} | perl -ne 'print "Patch$n: ".$_; $n++;'
Patch: Mesa-6.4.1-x86_64-fixes-1.patch
Patch1: Mesa-configs.diff
@@ -138,6 +138,14 @@
/etc/opt/gnome/gconf/schemas/compiz.schemas
%changelog -n compiz
+* Fri May 26 2006 - danw@suse.de
+- Update gnome-xgl-settings to 0.6, fixing:
+- Don't consider 3D to be configured unless it's configured with
+ the right driver (#178906)
+- Use zen-installer rather than zen-updater (#176553)
+- Don't consider SaX2 to have failed if the user cancels it
+ (ie, stay in the "you need to run sax" state, don't move to the
+ "i give up, go look at the wiki" state). (#178902)
* Fri May 26 2006 - dreveman@suse.de
- Task switcher (ALT-TAB) able to "show all" (bnc 173376)
- Fix so swicher doesn't eat keystrokes (bnc 177650)
++++++ gnome-xgl-settings-0.5.tar.gz -> gnome-xgl-settings-0.6.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/ChangeLog new/gnome-xgl-settings-0.6/ChangeLog
--- old/gnome-xgl-settings-0.5/ChangeLog 2006-05-19 22:43:13.000000000 +0200
+++ new/gnome-xgl-settings-0.6/ChangeLog 2006-05-26 22:48:36.000000000 +0200
@@ -1,3 +1,22 @@
+2006-05-26 Dan Winship
+
+ * configure.in: 0.6
+
+ * xgl-settings/gnome-xgl-info: if there is a DRIVER specified in
+ xgl-hardware-list, only consider the card to be 3D-accelerated if
+ it's using that driver, not if it's using some other driver that
+ happens to claim 3D support. #178906
+
+ * xgl-settings/switch.c (spawn_in_background): add a "gboolean
+ *ran_successfully" arg and pass it to spawn_wait_func.
+ (spawn_wait_func): if a ran_successfully arg was passed, set it
+ depending on the exit status.
+ (run_installer): Use zen-installer now, since it's been fixed.
+ (run_sax2): Pass &ran_sax to spawn_in_background if actually
+ invoking SaX2 rather than a config script. Fixes it so that if you
+ cancel gnomesu or sax, it still says "you need to run sax" rather
+ than switching to "go to the wiki". #178902.
+
2006-05-19 Dan Winship
* configure.in: 0.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/configure new/gnome-xgl-settings-0.6/configure
--- old/gnome-xgl-settings-0.5/configure 2006-05-17 17:08:08.000000000 +0200
+++ new/gnome-xgl-settings-0.6/configure 2006-05-26 22:49:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gnome-xgl-settings 0.5.
+# Generated by GNU Autoconf 2.59 for gnome-xgl-settings 0.6.
#
# Report bugs to http://bugzilla.novell.com/enter_bug.cgi?product=gnome-xgl-settings.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='gnome-xgl-settings'
PACKAGE_TARNAME='gnome-xgl-settings'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='gnome-xgl-settings 0.5'
+PACKAGE_VERSION='0.6'
+PACKAGE_STRING='gnome-xgl-settings 0.6'
PACKAGE_BUGREPORT='http://bugzilla.novell.com/enter_bug.cgi?product=gnome-xgl-settings'
ac_unique_file="xgl-settings"
@@ -974,7 +974,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gnome-xgl-settings 0.5 to adapt to many kinds of systems.
+\`configure' configures gnome-xgl-settings 0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1040,7 +1040,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-xgl-settings 0.5:";;
+ short | recursive ) echo "Configuration of gnome-xgl-settings 0.6:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-gnome-xgl-settings configure 0.5
+gnome-xgl-settings configure 0.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1205,7 +1205,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-xgl-settings $as_me 0.5, which was
+It was created by gnome-xgl-settings $as_me 0.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1853,7 +1853,7 @@
# Define the identity of the package.
PACKAGE='gnome-xgl-settings'
- VERSION='0.5'
+ VERSION='0.6'
cat >>confdefs.h <<_ACEOF
@@ -22302,7 +22302,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by gnome-xgl-settings $as_me 0.5, which was
+This file was extended by gnome-xgl-settings $as_me 0.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22365,7 +22365,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-gnome-xgl-settings config.status 0.5
+gnome-xgl-settings config.status 0.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-xgl-settings-0.5/configure.in new/gnome-xgl-settings-0.6/configure.in
--- old/gnome-xgl-settings-0.5/configure.in 2006-05-17 16:55:39.000000000 +0200
+++ new/gnome-xgl-settings-0.6/configure.in 2006-05-26 22:48:19.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([gnome-xgl-settings], [0.5],
+AC_INIT([gnome-xgl-settings], [0.6],
[http://bugzilla.novell.com/enter_bug.cgi?product=gnome-xgl-settings])
AC_CONFIG_SRCDIR([xgl-settings])
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.6/xgl-settings/gnome-xgl-info
--- old/gnome-xgl-settings-0.5/xgl-settings/gnome-xgl-info 2006-05-19 22:38:20.000000000 +0200
+++ new/gnome-xgl-settings-0.6/xgl-settings/gnome-xgl-info 2006-05-26 22:35:13.000000000 +0200
@@ -13,6 +13,7 @@
# where XglStatus is 0 or 1 and RecommendedOptions is set if
# XglStatus is 0 OR it doesn't match /etc/sysconfig/displaymanager
+driver=""
packages=""
setup=""
xgl_opts=""
@@ -20,11 +21,17 @@
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')
+
+cur_driver=$(perl -ne 'if (/^Section\s+"Device"/../^EndSection/) { if (/^\s*Driver\s+"(.*)"/) { print "$1\n"; } }' /etc/X11/xorg.conf)
+
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
+ DRIVER)
+ driver="$data"
+ ;;
PACKAGES)
packages="$data"
;;
@@ -47,14 +54,20 @@
if [ -z "$card_status" ]; then
card_status=U
+ driver=""
packages=""
setup=""
xgl_opts=""
fi
-if /usr/bin/3Ddiag-result &>/dev/null; then
- accel_status=1
+if [ -z "$driver" -o "$driver" = "$cur_driver" ]; then
+ if /usr/bin/3Ddiag-result &>/dev/null; then
+ accel_status=1
+ else
+ accel_status=0
+ fi
else
+ # FIXME: we should eventually distinguish this
accel_status=0
fi
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.6/xgl-settings/switch.c
--- old/gnome-xgl-settings-0.5/xgl-settings/switch.c 2006-05-17 18:07:12.000000000 +0200
+++ new/gnome-xgl-settings-0.6/xgl-settings/switch.c 2006-05-26 21:27:16.000000000 +0200
@@ -24,6 +24,8 @@
#include "gnome-xgl-settings.h"
+#include
+
#include
static gboolean ran_installer = FALSE, ran_sax = FALSE;
@@ -403,24 +405,31 @@
static void
spawn_wait_func (GPid pid, int status, gpointer user_data)
{
+ gboolean *ran_successfully = user_data;
+
g_spawn_close_pid (pid);
+ if (ran_successfully) {
+ *ran_successfully = WIFEXITED (status) &&
+ (WEXITSTATUS (status) == 0);
+ }
+
gtk_widget_set_sensitive (GXGL_WIDGET ("page_xgl"), TRUE);
setup_switch_page ();
}
static void
-spawn_in_background (char **argv, const char *comment)
+spawn_in_background (char **argv, const char *comment, gboolean *ran_successfully)
{
GPid pid;
if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &pid, NULL)) {
- //FIXME;
+ //FIXME; do we need an error dialog?
setup_switch_page ();
return;
}
- g_child_watch_add (pid, spawn_wait_func, NULL);
+ g_child_watch_add (pid, spawn_wait_func, &ran_successfully);
gtk_widget_set_sensitive (GXGL_WIDGET ("page_xgl"), FALSE);
gtk_text_buffer_set_text (
@@ -435,14 +444,15 @@
int i;
argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "/usr/bin/zen-updater");
+ g_ptr_array_add (argv, "/usr/bin/zen-installer");
for (i = 0; missing_packages[i]; i++)
g_ptr_array_add (argv, missing_packages[i]);
g_ptr_array_add (argv, NULL);
ran_installer = TRUE;
spawn_in_background ((char **)argv->pdata,
- _("Waiting for the Software Update tool to finish..."));
+ _("Waiting for the Software Update tool to finish..."),
+ NULL);
}
static void
@@ -450,13 +460,14 @@
{
char *argv[6];
- ran_sax = TRUE;
argv[0] = "/opt/gnome/bin/gnomesu";
argv[1] = "--";
if (config_script) {
argv[2] = config_script;
argv[3] = NULL;
+
+ ran_sax = TRUE;
} else {
argv[2] = "/usr/X11R6/bin/sax2";
argv[3] = "-O";
@@ -464,7 +475,8 @@
argv[5] = NULL;
};
- spawn_in_background (argv, _("Waiting for SaX2 to finish..."));
+ spawn_in_background (argv, _("Waiting for SaX2 to finish..."),
+ config_script ? NULL : &ran_sax);
}
void
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...