packages: compiz/compiz.spec, compiz/compiz-gtk (NEW), compiz/compiz-gtk.de...

[patrys]

Author: patrys                       Date: Thu Nov  4 22:00:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make it work with desktop-effects.spec

---- Files affected:
packages/compiz:
   compiz.spec (1.121 -> 1.122) , compiz-gtk (NONE -> 1.1)  (NEW), compiz-gtk.desktop (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/compiz/compiz.spec
diff -u packages/compiz/compiz.spec:1.121 packages/compiz/compiz.spec:1.122
--- packages/compiz/compiz.spec:1.121	Sun Oct 24 13:08:53 2010
+++ packages/compiz/compiz.spec	Thu Nov  4 23:00:29 2010
@@ -13,11 +13,13 @@
 Name:		compiz
 # note that even versions are STABLE
 Version:	0.8.6
-Release:	1
+Release:	2
 License:	GPL or MIT
 Group:		X11/Applications
 Source0:	http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	1e284eade99ff310551d5919b6ba57c1
+Source1:        compiz-gtk
+Source2:        compiz-gtk.desktop
 Patch0:		%{name}-kde4.patch
 Patch1:		%{name}-no-gdk_display.patch
 URL:		http://www.compiz.org/
@@ -273,6 +275,14 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.la
 %endif
 
+%if %{with gtk}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
+desktop-file-install \
+	--vendor="" \
+	--dir $RPM_BUILD_ROOT%{_desktopdir} \
+	%{SOURCE2}
+%endif
+
 %find_lang %{name}
 
 %clean
@@ -378,7 +388,9 @@
 %if %{with gtk}
 %files gtk-decorator
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/compiz-gtk
 %attr(755,root,root) %{_bindir}/gtk-window-decorator
+%{_datadir}/applications/compiz-gtk.desktop
 %if %{with gconf}
 %{_sysconfdir}/gconf/schemas/gwd.schemas
 %endif
@@ -402,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2010/11/04 22:00:29  patrys
+- make it work with desktop-effects.spec
+
 Revision 1.121  2010/10/24 11:08:53  sparky
 - added no-gdk_display patch
 

================================================================
Index: packages/compiz/compiz-gtk
diff -u /dev/null packages/compiz/compiz-gtk:1.1
--- /dev/null	Thu Nov  4 23:00:34 2010
+++ packages/compiz/compiz-gtk	Thu Nov  4 23:00:29 2010
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+function runCompiz() {
+	gtk-window-decorator &
+	if ( [ -e /usr/lib/compizconfig/backends/libgconf.so ] || [ -e /usr/lib64/compizconfig/backends/libgconf.so ] )
+        then
+                exec compiz --ignore-desktop-hints ccp $@
+        else
+        	exec compiz --ignore-desktop-hints glib gconf gnomecompat $@
+        fi
+}
+
+ISSW=`glxinfo | grep "Software Rasterizer" -c`
+
+# Try with direct rendering
+HAVETFP=`glxinfo | grep texture_from_pixmap -c`
+
+if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
+	runCompiz $@
+fi
+
+# Try again with indirect rendering
+export LIBGL_ALWAYS_INDIRECT=1
+
+HAVETFP=`glxinfo | grep texture_from_pixmap -c`
+
+if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
+	runCompiz $@
+fi
+
+# Fall back to metacity
+exec metacity $@

================================================================
Index: packages/compiz/compiz-gtk.desktop
diff -u /dev/null packages/compiz/compiz-gtk.desktop:1.1
--- /dev/null	Thu Nov  4 23:00:34 2010
+++ packages/compiz/compiz-gtk.desktop	Thu Nov  4 23:00:29 2010
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Compiz
+TryExec=compiz-gtk
+Exec=compiz-gtk
+NoDisplay=true
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/compiz/compiz.spec?r1=1.121&r2=1.122&f=u