Hello community, here is the log from the commit of package compiz-manager checked in at Tue Sep 16 01:35:13 CEST 2008. -------- --- compiz-manager/compiz-manager.changes 2008-05-26 19:33:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes 2008-09-15 23:36:25.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 10 00:00:00 CEST 2008 - davidr@novell.com + +- Xdmx support. + +------------------------------------------------------------------- New: ---- compiz-manager-NOMAD.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.M25296/_old 2008-09-16 01:34:57.000000000 +0200 +++ /var/tmp/diff_new_pack.M25296/_new 2008-09-16 01:34:57.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package compiz-manager (Version 0.0.1_git080201 ) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,13 +24,14 @@ PreReq: %fillup_prereq Requires: compiz Version: 0.0.1_git080201 -Release: 22 +Release: 47 Summary: A wrapper script to launch Compiz with proper options BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 Source2: Compiz.desktop Patch: compiz-manager-cleanup.patch Patch1: whitelist-radeonrandr12.diff +Patch2: compiz-manager-NOMAD.diff ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 BuildArch: noarch @@ -43,6 +51,7 @@ %setup -q -n %{name}-%{version} %patch -p1 %patch1 -p0 +%patch2 -p0 %install %__install -d -m 755 %{buildroot}/%{_bindir} @@ -60,6 +69,8 @@ %{_datadir}/compiz-manager/* %changelog +* Wed Sep 10 2008 davidr@novell.com +- Xdmx support. * Tue May 20 2008 rodrigo@suse.de - Update from buildservice: * Removed --replace from COMPIZ_OPTIONS ++++++ compiz-manager-NOMAD.diff ++++++ --- compiz-manager.orig 2008-09-10 18:04:28.000000000 +0200 +++ compiz-manager 2008-09-10 18:05:06.000000000 +0200 @@ -199,6 +199,19 @@ fi } +# Detects if Xdmx is running +check_xdmx() +{ + verbose "Checking for Xdmx: " + if xdpyinfo | grep -q DMX ; then + verbose "present. \n" + return 0; + else + verbose "not present. \n" + return 1; + fi +} + # Detects if Xgl is running check_xgl() { @@ -359,8 +372,16 @@ INDIRECT="yes"; fi +# if we run under Xdmx +if check_xdmx; then + # check if we have the required bits to run compiz and if not, + # fallback + if ! check_composite; then + abort_with_fallback_wm + fi + # if we run under Xgl, we can skip some tests here -if ! check_xgl; then +elif ! check_xgl; then # if vesa or vga are in use, do not even try glxinfo (LP#119341) if ! running_under_whitelisted_driver || have_blacklisted_pciid; then abort_with_fallback_wm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org