rpms
/
compiz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 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.
This commit is contained in:
Kristian Høgsberg 2007-08-15 22:21:11 +00:00
parent 23e50ca4fa
commit ba68739783
8 changed files with 55 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
aiglx-defaults.patch
View File

@ -1,32 +0,0 @@
--- compiz-0.3.6/src/main.c~ 2006-12-28 21:56:41.000000000 -0500
+++ compiz-0.3.6/src/main.c 2007-01-12 18:06:57.000000000 -0500
@@ -78,7 +78,7 @@
CompWindow *lastDamagedWindow = 0;
Bool replaceCurrentWm = FALSE;
-Bool indirectRendering = FALSE;
+Bool indirectRendering = TRUE;
Bool strictBinding = TRUE;
Bool noDetection = FALSE;
@@ -94,7 +94,7 @@
"[--bg-image PNG] "
"[--refresh-rate RATE]\n "
"[--fast-filter] "
- "[--indirect-rendering] "
+ "[--direct-rendering] "
"[--loose-binding] "
"[--replace]\n "
"[--sm-disable] "
@@ -188,9 +188,9 @@
{
defaultTextureFilter = "Fast";
}
- else if (!strcmp (argv[i], "--indirect-rendering"))
+ else if (!strcmp (argv[i], "--direct-rendering"))
{
- indirectRendering = TRUE;
+ indirectRendering = FALSE;
}
else if (!strcmp (argv[i], "--loose-binding"))
{

67
close-session.patch
View File

@ -1,67 +0,0 @@
--- compiz-0.3.6/include/compiz.h.close-session 2006-12-27 13:28:22.000000000 -0500
+++ compiz-0.3.6/include/compiz.h 2007-03-28 22:14:27.000000000 -0400
@@ -210,6 +210,7 @@
extern Bool strictBinding;
extern Bool useCow;
extern Bool noDetection;
+extern Bool disableSm;
extern int defaultRefreshRate;
extern char *defaultTextureFilter;
--- compiz-0.3.6/src/display.c.close-session 2006-12-24 23:38:12.000000000 -0500
+++ compiz-0.3.6/src/display.c 2007-03-28 22:12:30.000000000 -0400
@@ -1876,6 +1876,13 @@
}
}
+static void prepareShutDown(void)
+{
+ while (popPlugin ());
+ if (!disableSm)
+ closeSession ();
+}
+
void
eventLoop (void)
{
@@ -1907,11 +1914,13 @@
if (restartSignal)
{
+ prepareShutDown ();
execvp (programName, programArgv);
exit (1);
}
else if (shutDown)
{
+ prepareShutDown ();
exit (0);
}
--- compiz-0.3.6/src/main.c.close-session 2007-03-28 22:12:29.000000000 -0400
+++ compiz-0.3.6/src/main.c 2007-03-28 22:14:06.000000000 -0400
@@ -81,6 +81,7 @@
Bool indirectRendering = TRUE;
Bool strictBinding = TRUE;
Bool noDetection = FALSE;
+Bool disableSm = FALSE;
#ifdef USE_COW
Bool useCow = TRUE;
@@ -133,7 +134,6 @@
char *displayName = 0;
char *plugin[256];
int i, nPlugin = 0;
- Bool disableSm = FALSE;
char *clientId = NULL;
programName = argv[0];
@@ -241,8 +241,5 @@
eventLoop ();
- if (!disableSm)
- closeSession ();
-
return 0;
}

25
compiz.spec
View File

@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# 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 @@ Source0: %{name}-%{snapshot}.tar.gz
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 @@ windows and compositing manager.
%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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libdecoration.so
%changelog
* Wed Aug 15 2007 Kristian Høgsberg <krh@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@redhat.com> - 0.5.2-4.0ec3ec
- Build with desktop-effects so we don't pick up metacity work spaces.
Fixes #250568.

51
composite-cube-logo.patch
View File

@ -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
{

25
fedora-logo.patch
View File

@ -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">

93
restart.patch
View File

@ -1,93 +0,0 @@
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/session.c.restart 2006-08-17 17:36:07.000000000 -0400
+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/src/session.c 2006-09-26 13:57:18.000000000 -0400
@@ -49,6 +49,71 @@
static void iceInit (void);
static void
+set_string_list_property (SmcConn connection,
+ const char *name,
+ const char **values)
+{
+ SmProp prop, *pProp;
+ int i;
+
+ prop.name = (char *)name;
+ prop.type = SmLISTofARRAY8;
+
+ i = 0;
+ while (values[i] != NULL)
+ i++;
+
+ prop.vals = malloc (i * sizeof (SmPropValue));
+ if (!prop.vals)
+ return;
+
+ i = 0;
+ while (values[i] != NULL)
+ {
+ prop.vals[i].value = (char *)values[i];
+ prop.vals[i].length = strlen (values[i]);
+
+ i++;
+ }
+
+ prop.num_vals = i;
+
+ pProp = &prop;
+ SmcSetProperties (connection, 1, &pProp);
+
+ free (prop.vals);
+}
+
+static void
+set_clone_restart_commands (SmcConn connection)
+{
+ const char *clone[] = { "compiz", NULL };
+ const char *restart[] = { "compiz", "gconf", NULL };
+
+ set_string_list_property (connection, SmCloneCommand, clone);
+ set_string_list_property (connection, SmRestartCommand, restart);
+}
+
+static void
+set_restart_style (SmcConn connection)
+{
+ SmProp prop, *pProp;
+ SmPropValue propVal;
+ char hint = SmRestartImmediately;
+
+ prop.name = SmRestartStyleHint;
+ prop.type = SmCARD8;
+ prop.num_vals = 1;
+ prop.vals = &propVal;
+ propVal.value = &hint;
+ propVal.length = 1;
+
+ pProp = &prop;
+
+ SmcSetProperties (connection, 1, &pProp);
+}
+
+static void
saveYourselfGotProps (SmcConn connection,
SmPointer client_data,
int num_props,
@@ -69,13 +134,16 @@
SmcSetProperties (connection, 1, &props[p]);
props[p]->vals[i + 1] = oldVal;
- SmcSaveYourselfDone (connection, 1);
- return;
+ goto out;
}
}
}
}
+out:
+ set_restart_style (connection);
+ set_clone_restart_commands (connection);
+
SmcSaveYourselfDone (connection, 1);
}

23
terminate-move.patch
View File

@ -1,23 +0,0 @@
--- compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/move.c.move-terminate 2006-09-28 15:42:09.000000000 -0400
+++ compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86/plugins/move.c 2006-09-28 15:42:29.000000000 -0400
@@ -365,6 +365,20 @@
MOVE_DISPLAY (d);
switch (event->type) {
+ case ButtonPress:
+ s = findScreenAtDisplay (d, event->xbutton.root);
+ if (s)
+ {
+ MOVE_SCREEN (s);
+
+ if (ms->grabIndex)
+ {
+ moveTerminate (d,
+ &md->opt[MOVE_DISPLAY_OPTION_INITIATE].value.action,
+ 0, NULL, 0);
+ }
+ }
+ break;
case KeyPress:
case KeyRelease:
s = findScreenAtDisplay (d, event->xkey.root);

23
tfp-server-extension.patch
View File

@ -1,23 +0,0 @@
--- compiz-0.4.0/src/screen.c.tfp-server-extension 2007-04-02 05:05:49.000000000 -0400
+++ compiz-0.4.0/src/screen.c 2007-06-05 23:20:52.000000000 -0400
@@ -1396,7 +1396,7 @@ addScreen (CompDisplay *display,
Window *children;
unsigned int nchildren;
int defaultDepth, nvisinfo, nElements, value, i;
- const char *glxExtensions, *glExtensions;
+ const char *glxExtensions, *glxServerExtensions, *glExtensions;
XSetWindowAttributes attrib;
GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f };
GLfloat ambientLight[] = { 0.0f, 0.0f, 0.0f, 0.0f };
@@ -1645,7 +1645,10 @@ addScreen (CompDisplay *display,
i++;
glxExtensions = glXQueryExtensionsString (dpy, screenNum);
- if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap"))
+ glxServerExtensions = glXQueryServerString(s->display->display,
+ screenNum, GLX_EXTENSIONS);
+ if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap") &&
+ !strstr (glxServerExtensions, "GLX_EXT_texture_from_pixmap"))
{
if (i > 0)
{