rpms/compiz/devel .cvsignore, 1.17, 1.18 aiglx-defaults.patch, 1.4, 1.5 compiz.spec, 1.68, 1.69 composite-cube-logo.patch, 1.3, 1.4 fedora-logo.patch, 1.5, 1.6 sources, 1.19, 1.20 tfp-server-extension.patch, 1.3, 1.4 cow.patch, 1.2, NONE glfinish.patch, 1.2, NONE icon-menu.patch, 1.2, NONE resize-offset.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 17 00:10:40 UTC 2007
- Previous message (by thread): rpms/bind/devel bind.spec,1.150,1.151
- Next message (by thread): rpms/compiz/devel button-clicks.patch, 1.2, NONE double-click.patch, 1.1, NONE fbconfig-depth-fix.patch, 1.4, NONE new-metacity-theme.patch, 1.1, NONE plane.patch, 1.10, NONE positioning.patch, 1.1, NONE resize-move-keybindings.patch, 1.1, NONE sync-override-redirect-windows.patch, 1.1, NONE thumbnail-sorting.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: krh
Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30821
Modified Files:
.cvsignore aiglx-defaults.patch compiz.spec
composite-cube-logo.patch fedora-logo.patch sources
tfp-server-extension.patch
Removed Files:
cow.patch glfinish.patch icon-menu.patch resize-offset.patch
Log Message:
* Tue Jan 16 2007 Kristian Høgsberg <krh at localhost.localdomain> - 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 23 Nov 2006 06:26:01 -0000 1.17
+++ .cvsignore 17 Jan 2007 00:10:38 -0000 1.18
@@ -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
aiglx-defaults.patch:
main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: aiglx-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/aiglx-defaults.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aiglx-defaults.patch 23 Nov 2006 06:26:01 -0000 1.4
+++ aiglx-defaults.patch 17 Jan 2007 00:10:38 -0000 1.5
@@ -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"))
+ {
Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- compiz.spec 9 Dec 2006 06:35:48 -0000 1.68
+++ compiz.spec 17 Jan 2007 00:10:38 -0000 1.69
@@ -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: 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: 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 @@
%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 @@
CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
export CPPFLAGS
-autoreconf
-
%configure \
--enable-gconf \
--enable-dbus \
@@ -110,13 +95,11 @@
--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 @@
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 @@
%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 @@
%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 <krh at localhost.localdomain> - 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 <mclasen at redhat.com> - 0.3.4-2
- Update the fedora logo patch (#217224)
@@ -208,7 +208,7 @@
- Drop upstreamed patches
- Work with new metacity theme api
-* Mon Oct 2 2006 Soren Sandmann <sandmann at redhat.ocm> - 0.0.13-0.32.20060818git.fc6
+* Mon Oct 2 2006 Soren Sandmann <sandmann at redhat.com> - 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 <sandmann at redhat.com> - 0.0.13-0.31.20060818git.fc6
composite-cube-logo.patch:
cube.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+)
Index: composite-cube-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/composite-cube-logo.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- composite-cube-logo.patch 18 Aug 2006 01:36:27 -0000 1.3
+++ composite-cube-logo.patch 17 Jan 2007 00:10:38 -0000 1.4
@@ -1,20 +1,8 @@
-Composite cube logo against background color.
-
-From: Kristian Høgsberg <krh at redhat.com>
-
-
----
-
- 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 @@
+ 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);
fedora-logo.patch:
compiz.schemas.in | 4 ++--
cube.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
Index: fedora-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fedora-logo.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-logo.patch 25 Nov 2006 14:40:08 -0000 1.5
+++ fedora-logo.patch 17 Jan 2007 00:10:38 -0000 1.6
@@ -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 <compiz.h>
@@ -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 @@
<applyto>/apps/compiz/plugins/cube/screen0/options/color</applyto>
<owner>compiz</owner>
<type>string</type>
@@ -30,12 +30,12 @@
<locale name="C">
<short>Cube Color</short>
<long>Color of top and bottom sides of the cube</long>
-@@ -15918,7 +15918,7 @@
+@@ -15946,7 +15946,7 @@
<owner>compiz</owner>
<type>list</type>
<list_type>string</list_type>
-- <default>[freedesktop.png]</default>
-+ <default>[/usr/share/pixmaps/fedora-logo.png]</default>
+- <default>[freedesktop]</default>
++ <default>[/usr/share/pixmaps/fedora-logo]</default>
<locale name="C">
<short>Image files</short>
<long>List of PNG and SVG files that should be rendered on top face of cube</long>
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 23 Nov 2006 06:26:01 -0000 1.19
+++ sources 17 Jan 2007 00:10:38 -0000 1.20
@@ -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
tfp-server-extension.patch:
screen.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
Index: tfp-server-extension.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/tfp-server-extension.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tfp-server-extension.patch 18 Aug 2006 01:36:27 -0000 1.3
+++ tfp-server-extension.patch 17 Jan 2007 00:10:38 -0000 1.4
@@ -1,18 +1,6 @@
-Make compiz look for GLX_EXT_texture_from_pixmap in the server extensions
-
-From: Kristian Høgsberg <krh at redhat.com>
-
-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 @@
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)
+ {
--- cow.patch DELETED ---
--- glfinish.patch DELETED ---
--- icon-menu.patch DELETED ---
--- resize-offset.patch DELETED ---
- Previous message (by thread): rpms/bind/devel bind.spec,1.150,1.151
- Next message (by thread): rpms/compiz/devel button-clicks.patch, 1.2, NONE double-click.patch, 1.1, NONE fbconfig-depth-fix.patch, 1.4, NONE new-metacity-theme.patch, 1.1, NONE plane.patch, 1.10, NONE positioning.patch, 1.1, NONE resize-move-keybindings.patch, 1.1, NONE sync-override-redirect-windows.patch, 1.1, NONE thumbnail-sorting.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list