Hello community, here is the log from the commit of package compiz checked in at Tue Mar 11 17:17:42 CET 2008. -------- --- compiz/compiz.changes 2008-01-30 00:21:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2008-03-10 20:09:13.249028000 +0100 @@ -1,0 +2,19 @@ +Fri Mar 07 01:20:00 IST 2008 - cyberorg@cyberorg.info + +- 0.7.2 development release +- Several bugfixes +- Translation support in gtk-window-decorator. +- Updated translations. +- Full session save/restore in a plugin. + +------------------------------------------------------------------- +Fri Feb 08 01:20:00 IST 2008 - cyberorg@cyberorg.info + +- 0.7.0 development release +- move svg plugin to -gnome package due to librsvg dep +- add compiz-decorator script to start decorator according to DE +- multi-display support +- kde4-window-decorator +- Added mouse wheel handling to g-w-d + +------------------------------------------------------------------- @@ -6,0 +26,8 @@ +Tue Dec 04 13:40:00 IST 2007 - cyberorg@cyberorg.info + +- sync to latest git +- many bug fixes including kwd fixes +- back to action system used in 0.5.2 +- kconfig plugin back in this release + +------------------------------------------------------------------- @@ -14,0 +42,11 @@ +Fri Oct 19 13:45:00 IST 2007 - cyberorg@cyberorg.info + +- Update to version 0.6.2 +- Remove settings tabs from gnome-xgl-settings, it launches ccsm now +- Support for automatically starting one decorator per screen. +- various stacking problem fixes. +- Fixes for various focus issues. +- Minor other bug fixes. +- kconfig plugin no in this version + +------------------------------------------------------------------- @@ -23,0 +62 @@ +- Apply compiz-disable-xcb-support.diff to build on 10.2 Old: ---- compiz-0.5.4.tar.gz compiz-default-kconfig-settings.diff compiz-prepend-glib-gconf-to-plugins-list.diff compiz-randr-update-1.diff gnome-xgl-settings-0.9-compiz-0.5.4-update.diff gnome-xgl-settings-246659-hwinfo.diff gnome-xgl-settings-266157-driver-check.diff gnome-xgl-settings-linguas.diff gnome-xgl-settings-po.tar.bz2 gnome-xgl-settings-strict-aliasing.diff gnome-xgl-switch-md5dir.diff New: ---- compiz-0.7.2.tar.bz2 compiz-decorator gnome-xgl-settings-remove-gconf.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.O27229/_old 2008-03-11 17:15:47.000000000 +0100 +++ /var/tmp/diff_new_pack.O27229/_new 2008-03-11 17:15:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package compiz (Version 0.5.4) +# spec file for package compiz (Version 0.7.2 ) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,6 +10,7 @@ # norootforbuild + Name: compiz BuildRequires: Mesa-devel control-center2-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel %if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" @@ -18,6 +19,9 @@ %if 0%{suse_version} >= 01021 BuildRequires: metacity-devel %endif +%if 0%{suse_version} > 01030 +BuildRequires: kde4-kwin kdebase4-workspace-devel libkde4-devel +%endif %if %suse_version <= 1021 BuildRequires: gconf2-rpm-macros %endif @@ -30,34 +34,33 @@ PreReq: %fillup_prereq Enhances: xgl >= git_070104 AutoReqProv: on -Version: 0.5.4 -Release: 75 +Version: 0.7.2 +Release: 1 Requires: compiz-decorator = %{version} Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 Source: MesaLib-6.5.2.tar.bz2 -Source1: compiz-%version.tar.gz +Source1: compiz-%version.tar.bz2 Source2: gnome-xgl-settings-0.9.tar.gz Source3: opensuse.png -Source4: gnome-xgl-settings-po.tar.bz2 +Source4: compiz-decorator +#Source4: gnome-xgl-settings-po.tar.bz2 Patch: compiz-java-config-notify.diff Patch1: compiz-default-gconf-settings.diff -Patch2: compiz-default-kconfig-settings.diff Patch3: compiz-libqtpath.diff Patch4: compiz-ldpreload-indirect.diff Patch5: compiz-no-focus-prevention-for-windows-without-decorations.diff Patch6: compiz-scale-mode-toggle-1.diff -Patch7: compiz-prepend-glib-gconf-to-plugins-list.diff -Patch8: compiz-randr-update-1.diff -Patch30: gnome-xgl-switch-md5dir.diff -Patch31: gnome-xgl-settings-246659-hwinfo.diff -Patch32: gnome-xgl-settings-linguas.diff -Patch33: gnome-xgl-settings-266157-driver-check.diff -Patch34: gnome-xgl-settings-0.9-compiz-0.5.4-update.diff -Patch35: gnome-xgl-settings-strict-aliasing.diff +Patch29: gnome-xgl-settings-remove-gconf.diff # PATCH-FIX-OPENSUSE gnome-xgl-settings-hwinfo-primary-display-bno335445.patch bnc335445 Patch36: gnome-xgl-settings-hwinfo-primary-display-bno335445.patch +#Patch30: gnome-xgl-switch-md5dir.diff +#Patch31: gnome-xgl-settings-246659-hwinfo.diff +#Patch32: gnome-xgl-settings-linguas.diff +#Patch33: gnome-xgl-settings-266157-driver-check.diff +#Patch34: gnome-xgl-settings-0.9-compiz-0.5.4-update.diff +#Patch35: gnome-xgl-settings-strict-aliasing.diff Patch60: Mesa-x86_64-fixes.diff %if "%(xft-config --prefix)" == "/usr" %define xorg_prefix %_prefix @@ -106,7 +109,7 @@ %package kde Summary: OpenGL window and compositing managerdecorator Group: System/GUI/KDE -Requires: kdebase3 %name = %version +Requires: %name = %version Provides: compiz-decorator = %version AutoReqProv: on @@ -120,6 +123,25 @@ -------- David Reveman <davidr@novell.com> +%package kde4 +Summary: OpenGL window and compositing manager. +Group: System/GUI/Other +Requires: kde4-kwin %name = %version +Provides: compiz-decorator = %version +AutoReqProv: on + +%description kde4 +Compiz is an OpenGL compositing manager that use +GLX_EXT_texture_from_drawable for binding redirected top-level windows +to texture objects. It has a flexible plug-in system and it is designed +to run well on most graphics hardware. + + + +Authors: +-------- + David Reveman <davidr@novell.com> + %package devel Summary: OpenGL window and compositing manager. Group: System/GUI/Other @@ -130,7 +152,7 @@ %if 0%{suse_version} >= 01021 Requires: metacity-devel %endif -%if %suse_version <= 1021 +%if %suse_version <= 01021 Requires: gconf2-rpm-macros %endif %if 0%{suse_version} >= 01020 @@ -151,29 +173,30 @@ David Reveman <davidr@novell.com> %prep -%setup -q -c -n %name -T -a 0 -a 1 -a 2 -a 4 -mv xgl-settings/* gnome-xgl-settings-*/po/ -rmdir xgl-settings +%setup -q -c -n %name -T -a 0 -a 1 -a 2 cd compiz-* %patch -%patch1 -%patch2 +%patch1 -p1 +#%patch2 %ifarch x86_64 %patch3 %endif -%patch4 +%patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -%patch8 +#%patch7 +#%if 0%{suse_version} < 01021 +#%patch8 +#%endif cd - cd gnome-xgl-* -%patch30 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -%patch35 -p1 +%patch29 -p1 +#%patch30 +#%patch31 -p1 +#%patch32 -p1 +#%patch33 -p1 +#%patch34 +#%patch35 -p1 %patch36 -p1 sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch cd - @@ -210,6 +233,7 @@ ##### compiz # pushd compiz-* +#sh autogen.sh %configure --sysconfdir=%gnome_etc \ --disable-schemas-install \ "$mesagl" @@ -239,6 +263,7 @@ install -d -m 755 %buildroot/var/adm/fillup-templates find %buildroot ( -name *.a -o -name *.la ) -print0 | xargs -0 rm -f install -m 444 %_sourcedir/opensuse.png %buildroot%_datadir/compiz/ +install -m 755 %_sourcedir/compiz-decorator %buildroot%_bindir/ %find_gconf_schemas %find_lang xgl-settings touch %name.schemas_pre %name.schemas_preun %name.schemas_posttrans %name.schemas_list @@ -261,6 +286,7 @@ %files -f %name.schemas_list %defattr(-, root, root) %_bindir/compiz +%_bindir/compiz-decorator %_bindir/gnome-xgl-info %_bindir/gnome-xgl-switch %_libdir/libdecoration.so.* @@ -285,7 +311,6 @@ %_libdir/compiz/librotate.so %_libdir/compiz/libscale.so %_libdir/compiz/libscreenshot.so -%_libdir/compiz/libsvg.so %_libdir/compiz/libswitcher.so %_libdir/compiz/libvideo.so %_libdir/compiz/libwater.so @@ -308,6 +333,7 @@ %_bindir/gtk-window-decorator %_libdir/compiz/libglib.so %_libdir/compiz/libgconf.so +%_libdir/compiz/libsvg.so %gnome_prefix/bin/gnome-xgl-settings %gnome_prefix/share/applications/gnome-xgl-settings.desktop %dir %gnome_prefix/share/gnome-xgl-settings @@ -332,20 +358,53 @@ %_libdir/compiz/libkconfig.so %kde_prefix/share/config/compizrc %kde_prefix/share/config.kcfg/compiz-* +%if 0%{suse_version} > 01030 + +%files kde4 +%defattr(-, root, root) +%_bindir/kde4-window-decorator +%endif %changelog +* Fri Mar 07 2008 cyberorg@cyberorg.info +- 0.7.2 development release +- Several bugfixes +- Translation support in gtk-window-decorator. +- Updated translations. +- Full session save/restore in a plugin. +* Fri Feb 08 2008 cyberorg@cyberorg.info +- 0.7.0 development release +- move svg plugin to -gnome package due to librsvg dep +- add compiz-decorator script to start decorator according to DE +- multi-display support +- kde4-window-decorator +- Added mouse wheel handling to g-w-d * Wed Jan 30 2008 dreveman@suse.de - Better RANDR support. +* Tue Dec 04 2007 cyberorg@cyberorg.info +- sync to latest git +- many bug fixes including kwd fixes +- back to action system used in 0.5.2 +- kconfig plugin back in this release * Tue Oct 30 2007 btimothy@suse.de - Fix gnome-xgl-info to parse the primary vga controller properly when mulitple devices are outputted from `hwinfo --gfxcard`. Also fixes leading zero problem with device indexes. #335445 +* Fri Oct 19 2007 cyberorg@cyberorg.info +- Update to version 0.6.2 +- Remove settings tabs from gnome-xgl-settings, it launches ccsm now +- Support for automatically starting one decorator per screen. +- various stacking problem fixes. +- Fixes for various focus issues. +- Minor other bug fixes. +- kconfig plugin no in this version * Thu Sep 06 2007 dreveman@suse.de - Fix plugin load crash in gnome-xgl-settings. #296701 * Mon Aug 27 2007 cyberorg@cyberorg.info - Apply compiz-prepend-glib-gconf-to-plugins-list.diff, prevent gconf unload if compiz launched with gconf. +- Apply compiz-disable-xcb-support.diff to build on 10.2 * Wed Aug 22 2007 mhopf@suse.de - Fix strict aliasing issue in gnome-xgl-settings (#241515). - Removed -fno-strict-aliasing (except for Mesa where necessary). ++++++ compiz-default-gconf-settings.diff ++++++ --- /var/tmp/diff_new_pack.O27229/_old 2008-03-11 17:15:47.000000000 +0100 +++ /var/tmp/diff_new_pack.O27229/_new 2008-03-11 17:15:47.000000000 +0100 @@ -1,75 +1,74 @@ ---- ../compiz/metadata/compiz-core.schemas 2007-08-02 17:36:04.000000000 -0400 -+++ ./metadata/compiz-core.schemas 2007-08-02 15:45:34.000000000 -0400 -@@ -7,7 +7,7 @@ - <owner>compiz</owner> - <type>list</type> - <list_type>string</list_type> -- <default>[]</default> -+ <default>[glib,gconf,png,inotify,decoration,wobbly,fade,minimize,cube,rotate,zoom,scale,move,resize,place,dbus,switcher,water,screenshot]</default> - <locale name="C"> - <short>Active Plugins</short> - <long>List of currently active plugins</long> -@@ -8557,7 +8557,7 @@ - <applyto>/apps/compiz/general/allscreens/options/audible_bell</applyto> - <owner>compiz</owner> - <type>bool</type> -- <default>true</default> -+ <default>false</default> - <locale name="C"> - <short>Audible Bell</short> - <long>Audible system beep</long> -@@ -10170,7 +10170,7 @@ - <applyto>/apps/compiz/general/allscreens/options/ping_delay</applyto> - <owner>compiz</owner> - <type>int</type> -- <default>5000</default> -+ <default>7500</default> - <locale name="C"> - <short>Ping Delay</short> - <long>Interval between ping messages (1000 - 30000)</long> -Only in ../compiz/metadata: compiz-core.schemas~ -diff -ur ../compiz/metadata/compiz-cube.schemas ./metadata/compiz-cube.schemas ---- ../compiz/metadata/compiz-cube.schemas 2007-08-02 17:36:04.000000000 -0400 -+++ ./metadata/compiz-cube.schemas 2007-08-02 17:41:24.000000000 -0400 -@@ -590,7 +590,7 @@ - <owner>compiz</owner> - <type>list</type> - <list_type>string</list_type> -- <default>[freedesktop]</default> -+ <default>[opensuse]</default> - <locale name="C"> - <short>Image files</short> - <long>List of PNG and SVG files that should be rendered on top face of cube</long> ---- ../compiz/metadata/compiz-decoration.schemas 2007-08-02 17:36:04.000000000 -0400 -+++ ./metadata/compiz-decoration.schemas 2007-08-02 15:45:34.000000000 -0400 -@@ -337,7 +337,7 @@ - <applyto>/apps/compiz/plugins/decoration/allscreens/options/command</applyto> - <owner>compiz</owner> - <type>string</type> -- <default/> -+ <default>gtk-window-decorator</default> - <locale name="C"> - <short>Command</short> - <long>Decorator command line that is executed if no decorator is already running</long> ---- ../compiz/metadata/compiz-fade.schemas 2007-08-02 17:36:04.000000000 -0400 -+++ ./metadata/compiz-fade.schemas 2007-08-02 15:45:34.000000000 -0400 -@@ -6,7 +6,7 @@ - <applyto>/apps/compiz/plugins/fade/screen0/options/fade_speed</applyto> - <owner>compiz</owner> - <type>float</type> -- <default>5.0</default> -+ <default>10.0</default> - <locale name="C"> - <short>Fade Speed</short> - <long>Window fade speed (0.1 - 25.0)</long> ---- ../compiz/metadata/compiz-move.schemas 2007-08-02 17:36:04.000000000 -0400 -+++ ./metadata/compiz-move.schemas 2007-08-02 15:45:34.000000000 -0400 -@@ -164,7 +164,7 @@ - <applyto>/apps/compiz/plugins/move/allscreens/options/opacity</applyto> - <owner>compiz</owner> - <type>int</type> -- <default>100</default> -+ <default>80</default> - <locale name="C"> - <short>Opacity</short> - <long>Opacity level of moving windows (1 - 100)</long> +index 7bd9398..8388612 100644 +--- a/metadata/core.xml.in ++++ b/metadata/core.xml.in +@@ -283,7 +283,7 @@ + <option name="audible_bell" type="bool"> + <_short>Audible Bell</_short> + <_long>Audible system beep</_long> +- <default>true</default> ++ <default>false</default> + </option> + <option name="toggle_window_maximized_key" type="key"> + <_short>Toggle Window Maximized</_short> +@@ -328,7 +328,7 @@ + <option name="ping_delay" type="int"> + <_short>Ping Delay</_short> + <_long>Interval between ping messages</_long> +- <default>5000</default> ++ <default>7500</default> + <min>1000</min> + <max>30000</max> + </option> +diff --git a/metadata/cube.xml.in b/metadata/cube.xml.in +index 0107d98..83a97f7 100644 +--- a/metadata/cube.xml.in ++++ b/metadata/cube.xml.in +@@ -53,7 +53,7 @@ + <_long>List of PNG and SVG files that should be rendered on top face of cube</_long> + <type>string</type> + <default> +- <value>freedesktop</value> ++ <value>opensuse</value> + </default> + </option> + <option name="skydome" type="bool"> +diff --git a/metadata/dbus.xml.in b/metadata/dbus.xml.in +diff --git a/metadata/decoration.xml.in b/metadata/decoration.xml.in +index e458f80..1d45c3c 100644 +--- a/metadata/decoration.xml.in ++++ b/metadata/decoration.xml.in +@@ -49,6 +49,7 @@ + <option name="command" type="string"> + <_short>Command</_short> + <_long>Decorator command line that is executed if no decorator is already running</_long> ++ <default>compiz-decorator</default> + </option> + <option name="mipmap" type="bool"> + <_short>Mipmap</_short> +diff --git a/metadata/fade.xml.in b/metadata/fade.xml.in +index cfe0661..005b36c 100644 +--- a/metadata/fade.xml.in ++++ b/metadata/fade.xml.in +@@ -12,7 +12,7 @@ + <option name="fade_speed" type="float"> + <_short>Fade Speed</_short> + <_long>Window fade speed</_long> +- <default>5.0</default> ++ <default>10.0</default> + <min>0.1</min> + <max>25.0</max> + <precision>0.1</precision> +diff --git a/metadata/move.xml.in b/metadata/move.xml.in +index e744722..005a2b5 100644 +--- a/metadata/move.xml.in ++++ b/metadata/move.xml.in +@@ -16,7 +16,7 @@ + <option name="opacity" type="int"> + <_short>Opacity</_short> + <_long>Opacity level of moving windows</_long> +- <default>100</default> ++ <default>80</default> + <min>1</min> + <max>100</max> + </option> +diff --git a/src/window.c b/src/window.c ++++++ compiz-ldpreload-indirect.diff ++++++ --- /var/tmp/diff_new_pack.O27229/_old 2008-03-11 17:15:47.000000000 +0100 +++ /var/tmp/diff_new_pack.O27229/_new 2008-03-11 17:15:47.000000000 +0100 @@ -1,6 +1,7 @@ -diff -urp ../compiz-0.5.1.orig/src/display.c ./src/display.c ---- ../compiz-0.5.1.orig/src/display.c 2007-07-13 13:46:26.000000000 +0200 -+++ ./src/display.c 2007-07-16 17:02:54.000000000 +0200 +diff --git a/src/display.c b/src/display.c +index a988b38..cb3cb5f 100644 +--- a/src/display.c ++++ b/src/display.c @@ -43,6 +43,8 @@ #include <compiz.h> @@ -10,27 +11,28 @@ static unsigned int virtualModMask[] = { CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask, CompModeSwitchMask, CompNumLockMask, CompScrollLockMask -@@ -1989,6 +1991,17 @@ addDisplay (char *name) +@@ -1994,6 +1996,17 @@ addDisplay (char *name) + COMP_DISPLAY_OPTION_NUM)) return FALSE; - } + if (!noLibGLFallback) + { -+ int major, minor; ++ int major, minor; + -+ if (!glXQueryVersion (dpy, &major, &minor)) -+ return FALSE; ++ if (!glXQueryVersion (dpy, &major, &minor)) ++ return FALSE; + -+ if (major < 2 || minor < 4) -+ return FALSE; ++ if (major < 2 || minor < 4) ++ return FALSE; + } + - if (!compInitDisplayOptionsFromMetadata (d, - &coreMetadata, - coreDisplayOptionInfo, -diff -urp ../compiz-0.5.1.orig/src/main.c ./src/main.c ---- ../compiz-0.5.1.orig/src/main.c 2007-07-13 13:46:26.000000000 +0200 -+++ ./src/main.c 2007-07-16 17:05:34.000000000 +0200 + snprintf (d->displayString, 255, "DISPLAY=%s", DisplayString (dpy)); + + #ifdef DEBUG +diff --git a/src/main.c b/src/main.c +index f6e5b26..6783781 100644 +--- a/src/main.c ++++ b/src/main.c @@ -67,6 +67,8 @@ Bool onlyCurrentScreen = FALSE; Bool useCow = TRUE; #endif @@ -40,7 +42,7 @@ CompMetadata coreMetadata; static void -@@ -366,6 +368,10 @@ main (int argc, char **argv) +@@ -378,6 +380,10 @@ main (int argc, char **argv) if (i + 1 < argc) backgroundImage = argv[++i]; } @@ -51,23 +53,27 @@ else if (*argv[i] == '-') { compLogMessage (NULL, "core", CompLogLevelWarn, -@@ -432,11 +438,32 @@ main (int argc, char **argv) - - compAddMetadataFromFile (&coreMetadata, "core"); +@@ -390,6 +396,9 @@ main (int argc, char **argv) + } + } + if (noLibGLFallback) + unsetenv ("LD_PRELOAD"); + - if (!disableSm) + if (refreshRateArg) + { + ctx.refreshRateData = malloc (strlen (refreshRateArg) + 256); +@@ -448,8 +457,24 @@ main (int argc, char **argv) initSession (clientId); if (!addDisplay (displayName)) +- return 1; + { + if (!noLibGLFallback) + { + char *arg[argc + 2]; + static const char *libindirect_libgl = "/usr/$LIB/libIndirectGL.so.1"; -+ + + memcpy (arg, argv, sizeof (char *) * argc); + + arg[argc] = "--no-libgl-fallback"; @@ -78,9 +84,8 @@ + setenv ("LD_PRELOAD", libindirect_libgl, TRUE); + execvp (arg[0], arg); + } -+ - return 1; ++ return 1; + } - eventLoop (); + if (!disableSm) ++++++ gnome-xgl-settings-remove-gconf.diff ++++++ ++++ 119705 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org