From ba687397839dae8b446a98d0577bb2bdd49d3251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 15 Aug 2007 22:21:11 +0000 Subject: [PATCH] - 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. --- aiglx-defaults.patch | 32 ------------- close-session.patch | 67 --------------------------- compiz.spec | 25 ++++++---- composite-cube-logo.patch | 51 +++++++++++---------- fedora-logo.patch | 25 +++++----- restart.patch | 93 -------------------------------------- terminate-move.patch | 23 ---------- tfp-server-extension.patch | 23 ---------- 8 files changed, 55 insertions(+), 284 deletions(-) delete mode 100644 aiglx-defaults.patch delete mode 100644 close-session.patch delete mode 100644 restart.patch delete mode 100644 terminate-move.patch delete mode 100644 tfp-server-extension.patch diff --git a/aiglx-defaults.patch b/aiglx-defaults.patch deleted file mode 100644 index 3a471f0..0000000 --- a/aiglx-defaults.patch +++ /dev/null @@ -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")) - { diff --git a/close-session.patch b/close-session.patch deleted file mode 100644 index 57d2392..0000000 --- a/close-session.patch +++ /dev/null @@ -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; - } diff --git a/compiz.spec b/compiz.spec index 8f4520d..a80b6e9 100644 --- a/compiz.spec +++ b/compiz.spec @@ -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 - 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 - 0.5.2-4.0ec3ec - Build with desktop-effects so we don't pick up metacity work spaces. Fixes #250568. diff --git a/composite-cube-logo.patch b/composite-cube-logo.patch index ba7c248..0ac0f80 100644 --- a/composite-cube-logo.patch +++ b/composite-cube-logo.patch @@ -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 + { diff --git a/fedora-logo.patch b/fedora-logo.patch index ad1545e..8dd46d7 100644 --- a/fedora-logo.patch +++ b/fedora-logo.patch @@ -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 @@ - 立方体顶边和底边的颜色 - 立方體的頂面和底面顏色 +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 + <_long>Color of top and bottom sides of the cube - 0xfefe - 0xffff - 0xc7c7 -+ 0x1919 -+ 0x4a4a -+ 0xffff ++ 0x0000 ++ 0x1919 ++ 0x4a4a - -