rpms/compiz/devel compiz.spec, 1.88, 1.89 composite-cube-logo.patch, 1.4, 1.5 fedora-logo.patch, 1.7, 1.8 aiglx-defaults.patch, 1.5, NONE close-session.patch, 1.1, NONE restart.patch, 1.1, NONE terminate-move.patch, 1.1, NONE tfp-server-extension.patch, 1.5, NONE

Kristian Høgsberg (krh) fedora-extras-commits at redhat.com
Wed Aug 15 22:21:44 UTC 2007 

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6772

Modified Files:
	compiz.spec composite-cube-logo.patch fedora-logo.patch 
Removed Files:
	aiglx-defaults.patch close-session.patch restart.patch 
	terminate-move.patch tfp-server-extension.patch 
Log Message:
* Wed Aug 15 2007 Kristian Høgsberg <krh at redhat.com> - 0.5.2-5.0ec3ec
- Reorder plugin list to avoid 'place' getting removed on startup.
- Add run-command-key.patch to put the run command key in the GNOME
  keyboard shortcut dialog (#213576).
- Drop a bunch of obsolete patches.
- Bump mesa-libGL and X server requires to fix TFP bugs for
  power-of-two textures (#251935).
- Rebase fedora-logo and composite-cube-logo patch.



Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- compiz.spec	14 Aug 2007 18:51:36 -0000	1.88
+++ compiz.spec	15 Aug 2007 22:21:11 -0000	1.89
@@ -1,13 +1,13 @@
 %define		snapshot	0ec3ec
 %define		dialogversion	0.7.5
-%define		plugins		place,png,decoration,clone,fade,minimize,move,resize,switcher,scale
+%define		plugins		glib,gconf,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,plane
 
 Name:           compiz
 Url:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        4.%{snapshot}%{?dist}
+Release:        5.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,8 +15,8 @@
 # libdrm is not available on these arches
 ExcludeArch:   	s390 s390x ppc64
 
-Requires:	xorg-x11-server-Xorg >= 1.1.0-26
-Requires:	mesa-libGL >= 6.5-9
+Requires:	xorg-x11-server-Xorg >= 1.3.0.0-19.fc8
+Requires:	mesa-libGL >= 7.0.1-2.fc8
 Requires:	libwnck >= 2.15.4
 Requires:       system-logos
 Requires:	gnome-session >= 2.19.6-5
@@ -44,11 +44,9 @@
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 
 # Patches that are not upstream
-Patch101: aiglx-defaults.patch
-Patch102: tfp-server-extension.patch
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
-Patch118: compiz-0.3.6-wnck-modal-window.patch
+Patch110: run-command-key.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -76,9 +74,9 @@
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
 %setup -q  -n compiz-%{snapshot}
 
-# %patch103 -p1 -b .composite-cube-logo
+%patch103 -p1 -b .composite-cube-logo
 %patch105 -p1 -b .fedora-logo
-# %patch118 -p1 -b .wnck-modal-window
+%patch110 -p1 -b .run-command-key
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -199,6 +197,15 @@
 %{_libdir}/libdecoration.so
 
 %changelog
+* Wed Aug 15 2007 Kristian Høgsberg <krh at redhat.com> - 0.5.2-5.0ec3ec
+- Reorder plugin list to avoid 'place' getting removed on startup.
+- Add run-command-key.patch to put the run command key in the GNOME
+  keyboard shortcut dialog (#213576).
+- Drop a bunch of obsolete patches.
+- Bump mesa-libGL and X server requires to fix TFP bugs for
+  power-of-two textures (#251935).
+- Rebase fedora-logo and composite-cube-logo patch.
+
 * Tue Aug 14 2007 Kristian Høgsberg <krh at redhat.com> - 0.5.2-4.0ec3ec
 - Build with desktop-effects so we don't pick up metacity work spaces.
   Fixes #250568.

composite-cube-logo.patch:

Index: composite-cube-logo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/composite-cube-logo.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- composite-cube-logo.patch	17 Jan 2007 00:10:38 -0000	1.4
+++ composite-cube-logo.patch	15 Aug 2007 22:21:11 -0000	1.5
@@ -1,30 +1,31 @@
---- compiz-0.3.6/plugins/cube.c~	2007-01-15 19:26:18.000000000 -0500
-+++ compiz-0.3.6/plugins/cube.c	2007-01-15 19:30:29.000000000 -0500
-@@ -1421,11 +1421,27 @@
+diff -up compiz-0ec3ec/plugins/cube.c~ compiz-0ec3ec/plugins/cube.c
+--- compiz-0ec3ec/plugins/cube.c~	2007-07-23 16:20:42.000000000 -0400
++++ compiz-0ec3ec/plugins/cube.c	2007-08-15 17:45:18.000000000 -0400
+@@ -1272,11 +1272,27 @@ cubePaintTop (CompScreen	      *s,
  
- 	if (cs->invert == 1 && hsize == 4 && cs->texture.name)
- 	{
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
+     if (cs->invert == 1 && size == 4 && cs->texture.name)
+     {
++	glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
 +
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
++	glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
++	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
++	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR);
++	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0);
++	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
++	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
++	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
 +
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS);
-+	    glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
++	glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
++	glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS);
++	glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
 +
- 	    enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD);
- 	    glTexCoordPointer (2, GL_FLOAT, 0, cs->tc);
- 	    glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nvertices >> 1);
- 	    disableTexture (s, &cs->texture);
- 	    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
+ 	enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD);
+ 	glTexCoordPointer (2, GL_FLOAT, 0, cs->tc);
+ 	glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nVertices >> 1);
+ 	disableTexture (s, &cs->texture);
+ 	glDisableClientState (GL_TEXTURE_COORD_ARRAY);
 +
-+	    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- 	}
- 	else
- 	{
++	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+     }
+     else
+     {

fedora-logo.patch:

Index: fedora-logo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/fedora-logo.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-logo.patch	9 Aug 2007 22:07:04 -0000	1.7
+++ fedora-logo.patch	15 Aug 2007 22:21:11 -0000	1.8
@@ -1,24 +1,25 @@
---- compiz-0.5.2/metadata/cube.xml~	2007-08-03 14:39:29.000000000 -0400
-+++ compiz-0.5.2/metadata/cube.xml	2007-08-08 18:48:30.000000000 -0400
-@@ -197,9 +197,9 @@
- 		<long xml:lang="zh_CN">立方体顶边和底边的颜色</long>
- 		<long xml:lang="zh_TW">立方體的頂面和底面顏色</long>
+diff -up compiz-0ec3ec/metadata/cube.xml.in.fedora-logo compiz-0ec3ec/metadata/cube.xml.in
+--- compiz-0ec3ec/metadata/cube.xml.in.fedora-logo	2007-08-13 17:49:03.000000000 -0400
++++ compiz-0ec3ec/metadata/cube.xml.in	2007-08-15 18:07:54.000000000 -0400
+@@ -42,9 +42,9 @@
+ 		<_short>Cube Color</_short>
+ 		<_long>Color of top and bottom sides of the cube</_long>
  		<default>
 -		    <red>0xfefe</red>
 -		    <green>0xffff</green>
 -		    <blue>0xc7c7</blue>
-+		    <red>0x1919</red>
-+		    <green>0x4a4a</green>
-+		    <blue>0xffff</blue>
++		    <red>0x0000</red>
++		    <green>0x1919</green>
++		    <blue>0x4a4a</blue>
  		</default>
  	    </option>
- 	    <option type="bool" name="in">
-@@ -319,7 +319,7 @@
- 		<long xml:lang="zh_TW">應該要描繪至立方體頂面的 PNG 和 SVG 檔案清單</long>
+ 	    <option name="in" type="bool">
+@@ -62,7 +62,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>/usr/share/pixmaps/fedora-logo</value>
  		</default>
  	    </option>
- 	    <option type="bool" name="skydome">
+ 	    <option name="skydome" type="bool">


--- aiglx-defaults.patch DELETED ---


--- close-session.patch DELETED ---


--- restart.patch DELETED ---


--- terminate-move.patch DELETED ---


--- tfp-server-extension.patch DELETED ---

More information about the fedora-extras-commits mailing list