From 98ad61c5a08b597914be0b2b0c3ec1591241a0b6 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Jan 17 2007 00:10:38 +0000 Subject: - Update to 0.3.6, update patches. - Drop autotool build requires. - Drop glfinish.patch, cow.patch, resize-offset.patch and icon-menu-patch. - Add libdecoration.so - Update to desktop-effects-0.7.0, which spawns the right decorator and plays nicely with unknown plugins. --- diff --git a/.cvsignore b/.cvsignore index 675f52f..7149645 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,11 +1,2 @@ -compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2 -desktop-effects-0.6.19.tar.bz2 -desktop-effects-0.6.41.tar.bz2 -desktop-effects-0.6.61.tar.bz2 -desktop-effects-0.6.107.tar.gz -desktop-effects-0.6.83.tar.bz2 -desktop-effects-0.6.107.tar.bz2 -desktop-effects-0.6.137.tar.bz2 -desktop-effects-0.6.163.tar.gz -compiz-0.3.2.tar.bz2 -compiz-0.3.4.tar.bz2 +desktop-effects-0.7.0.tar.bz2 +compiz-0.3.6.tar.bz2 diff --git a/aiglx-defaults.patch b/aiglx-defaults.patch index 9b7de9b..3a471f0 100644 --- a/aiglx-defaults.patch +++ b/aiglx-defaults.patch @@ -1,29 +1,32 @@ ---- compiz-0.3.4/src/main.c.aiglx-defaults 2006-11-11 13:11:36.000000000 -0500 -+++ compiz-0.3.4/src/main.c 2006-11-23 01:25:37.000000000 -0500 -@@ -78,8 +78,8 @@ +--- 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 strictBinding = FALSE; +Bool indirectRendering = TRUE; -+Bool strictBinding = TRUE; + Bool strictBinding = TRUE; Bool noDetection = FALSE; - #ifdef USE_COW -@@ -95,10 +95,13 @@ +@@ -94,7 +94,7 @@ + "[--bg-image PNG] " "[--refresh-rate RATE]\n " "[--fast-filter] " - "[--indirect-rendering] " -+ "[--direct-rendering]\n " - "[--strict-binding] " -- "[--replace]\n " -+ "[--xgl-binding] " -+ "[--test-mode]\n " -+ "[--replace] " +- "[--indirect-rendering] " ++ "[--direct-rendering] " + "[--loose-binding] " + "[--replace]\n " "[--sm-disable] " -- "[--sm-client-id ID] " -+ "[--sm-client-id ID]\n " - "[--no-detection] " - "[--version]\n " - +@@ -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/compiz.spec b/compiz.spec index 03696a1..547d304 100644 --- a/compiz.spec +++ b/compiz.spec @@ -1,13 +1,13 @@ # -*- mode: rpm-spec -*- -%define dialogversion 0.6.163 +%define dialogversion 0.7.0 Name: compiz Url: http://www.freedesktop.org/Software/compiz License: X11/MIT/GPL Group: User Interface/Desktops -Version: 0.3.4 -Release: 2%{?dist} +Version: 0.3.6 +Release: 1%{?dist} Summary: OpenGL window and compositing manager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +31,6 @@ BuildRequires: libXfixes-devel, libXrandr-devel, libXrender-devel BuildRequires: libXcomposite-devel, libXdamage-devel, libXext-devel BuildRequires: libXt-devel, libXmu-devel, libICE-devel, libSM-devel BuildRequires: gnome-desktop-devel, control-center-devel, GConf2-devel -BuildRequires: gettext autoconf automake libtool BuildRequires: desktop-file-utils BuildRequires: intltool >= 0.35 BuildRequires: dbus-devel @@ -39,20 +38,14 @@ BuildRequires: librsvg2-devel BuildRequires: metacity Source0: %{name}-%{version}.tar.bz2 -Source1: desktop-effects-%{dialogversion}.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 -Patch106: glfinish.patch -Patch107: cow.patch - -Patch113: resize-offset.patch Patch114: restart.patch -Patch115: icon-menu.patch Patch116: terminate-move.patch %description @@ -84,14 +77,8 @@ windows and compositing manager. %patch101 -p1 -b .aiglx-defaults %patch102 -p1 -b .tfp-server-extension %patch103 -p1 -b .composite-cube-logo - %patch105 -p1 -b .fedora-logo -%patch106 -p1 -b .glfinish -%patch107 -p1 -b .cow - -%patch113 -p1 -b .resize-offset %patch114 -p1 -b .restart -%patch115 -p1 -b .icon-menu %patch116 -p1 -b .terminate-move %build @@ -100,8 +87,6 @@ rm -rf $RPM_BUILD_ROOT CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}" export CPPFLAGS -autoreconf - %configure \ --enable-gconf \ --enable-dbus \ @@ -110,13 +95,11 @@ autoreconf --enable-metacity \ --enable-gnome -make %{?_smp_mflags} +make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps # desktop-effects cd ../desktop-effects-%{dialogversion} -sed -i -e "s/gnome-window-decorator/gtk-window-decorator/" desktop-effects.c %configure -make %install @@ -126,16 +109,22 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL echo INSTALLING DESKTOP EFFECTS -cd ../desktop-effects-%{dialogversion} +pushd ../desktop-effects-%{dialogversion} make DESTDIR=$RPM_BUILD_ROOT install || exit 1 desktop-file-install --vendor redhat --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Red-Hat-Base \ $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop +popd find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' +%find_lang compiz +%find_lang desktop-effects + +cat compiz.lang desktop-effects.lang > all.lang + %post update-desktop-database -q %{_datadir}/applications export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` @@ -166,11 +155,12 @@ fi %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f all.lang %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING* INSTALL README TODO %{_bindir}/compiz %{_bindir}/gtk-window-decorator +%{_libdir}/libdecoration.so.* %{_libdir}/compiz/*.so %{_libdir}/window-manager-settings/libcompiz.so %{_sysconfdir}/gconf/schemas/compiz.schemas @@ -191,9 +181,19 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) %{_libdir}/pkgconfig/compiz.pc +%{_libdir}/pkgconfig/libdecoration.pc %{_includedir}/compiz +%{_libdir}/libdecoration.so %changelog +* Tue Jan 16 2007 Kristian Høgsberg - 0.3.6-1 +- Update to 0.3.6, update patches. +- Drop autotool build requires. +- Drop glfinish.patch, cow.patch, resize-offset.patch and icon-menu-patch. +- Add libdecoration.so +- Update to desktop-effects-0.7.0, which spawns the right decorator + and plays nicely with unknown plugins. + * Sat Nov 25 2006 Matthias Clasen - 0.3.4-2 - Update the fedora logo patch (#217224) @@ -208,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT - Drop upstreamed patches - Work with new metacity theme api -* Mon Oct 2 2006 Soren Sandmann - 0.0.13-0.32.20060818git.fc6 +* Mon Oct 2 2006 Soren Sandmann - 0.0.13-0.32.20060818git.fc6 - Install the .desktop file with desktop-file-install. Add X-Red-Hat-Base to make it appear in "Preferences", rather than "More Preferences". * Sat Sep 30 2006 Soren Sandmann - 0.0.13-0.31.20060818git.fc6 diff --git a/composite-cube-logo.patch b/composite-cube-logo.patch index c777257..ba7c248 100644 --- a/composite-cube-logo.patch +++ b/composite-cube-logo.patch @@ -1,20 +1,8 @@ -Composite cube logo against background color. - -From: Kristian Høgsberg - - ---- - - plugins/cube.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/plugins/cube.c b/plugins/cube.c -index 31edd5c..339d843 100644 ---- a/plugins/cube.c -+++ b/plugins/cube.c -@@ -1162,11 +1162,28 @@ cubePaintTransformedScreen (CompScreen +--- 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 @@ - if (cs->invert == 1 && s->size == 4 && cs->texture.name) + if (cs->invert == 1 && hsize == 4 && cs->texture.name) { + glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); + @@ -31,7 +19,6 @@ index 31edd5c..339d843 100644 + 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); diff --git a/fedora-logo.patch b/fedora-logo.patch index e32fba8..a8006a2 100644 --- a/fedora-logo.patch +++ b/fedora-logo.patch @@ -1,5 +1,5 @@ ---- compiz-0.3.2/plugins/cube.c.fedora-logo 2006-11-10 14:40:19.000000000 -0500 -+++ compiz-0.3.2/plugins/cube.c 2006-11-10 14:42:29.000000000 -0500 +--- compiz-0.3.6/plugins/cube.c.foo 2007-01-12 18:21:50.000000000 -0500 ++++ compiz-0.3.6/plugins/cube.c 2007-01-12 18:22:25.000000000 -0500 @@ -46,14 +46,14 @@ #include @@ -14,14 +14,14 @@ #define CUBE_IN_DEFAULT FALSE static char *cubeImages[] = { -- "freedesktop.png" -+ "/usr/share/pixmaps/fedora-logo.png" +- "freedesktop" ++ "fedora-logo" }; #define N_CUBE_IMAGES (sizeof (cubeImages) / sizeof (cubeImages[0])) ---- compiz-0.3.4/plugins/compiz.schemas.in.fedora-logo 2006-11-15 18:28:01.000000000 +0100 -+++ compiz-0.3.4/plugins/compiz.schemas.in 2006-11-25 10:29:49.000000000 +0100 -@@ -15725,7 +15725,7 @@ +--- compiz-0.3.6/plugins/compiz.schemas.in.foo 2006-12-28 22:27:00.000000000 -0500 ++++ compiz-0.3.6/plugins/compiz.schemas.in 2007-01-12 18:21:50.000000000 -0500 +@@ -15753,7 +15753,7 @@ /apps/compiz/plugins/cube/screen0/options/color compiz string @@ -30,12 +30,12 @@ Cube Color Color of top and bottom sides of the cube -@@ -15918,7 +15918,7 @@ +@@ -15946,7 +15946,7 @@ compiz list string -- [freedesktop.png] -+ [/usr/share/pixmaps/fedora-logo.png] +- [freedesktop] ++ [/usr/share/pixmaps/fedora-logo] Image files List of PNG and SVG files that should be rendered on top face of cube diff --git a/sources b/sources index 4129aea..a2d92b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7c562abf38a5595d8942d1b45ca99fba desktop-effects-0.6.163.tar.gz -101fd4a8fdb92caea6c10f6957273945 compiz-0.3.4.tar.bz2 +f08bb98f1b1c30e657fb32e2d97ae69d desktop-effects-0.7.0.tar.bz2 +260b03fc9ae62ff1ad4e8c5e92d56180 compiz-0.3.6.tar.bz2 diff --git a/tfp-server-extension.patch b/tfp-server-extension.patch index ab706f0..8e1d6e6 100644 --- a/tfp-server-extension.patch +++ b/tfp-server-extension.patch @@ -1,18 +1,6 @@ -Make compiz look for GLX_EXT_texture_from_pixmap in the server extensions - -From: Kristian Høgsberg - -too. ---- - - src/screen.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/screen.c b/src/screen.c -index 0941107..9ec30d5 100644 ---- a/src/screen.c -+++ b/src/screen.c -@@ -897,7 +897,7 @@ addScreen (CompDisplay *display, +--- compiz-0.3.6/src/screen.c~ 2006-12-29 14:24:40.000000000 -0500 ++++ compiz-0.3.6/src/screen.c 2007-01-12 16:01:34.000000000 -0500 +@@ -1384,7 +1384,7 @@ Window *children; unsigned int nchildren; int defaultDepth, nvisinfo, nElements, value, i; @@ -21,16 +9,15 @@ index 0941107..9ec30d5 100644 GLint stencilBits; XSetWindowAttributes attrib; GLfloat globalAmbient[] = { 0.1f, 0.1f, 0.1f, 0.1f }; -@@ -1117,7 +1117,11 @@ addScreen (CompDisplay *display, - XFree (visinfo); +@@ -1630,7 +1630,10 @@ + i++; - glxExtensions = glXQueryExtensionsString (s->display->display, 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")) - { - fprintf (stderr, "%s: GLX_EXT_texture_from_pixmap is missing\n", - programName); + 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) + {