rpms/compiz/devel compiz-0.8.2-wall.patch, NONE, 1.1 compiz.spec, 1.169, 1.170
drago01
drago01 at fedoraproject.org
Fri Jul 10 21:24:50 UTC 2009
Author: drago01
Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16835
Modified Files:
compiz.spec
Added Files:
compiz-0.8.2-wall.patch
Log Message:
Move wall plugin from fusion to the main compiz package
compiz-0.8.2-wall.patch:
--- NEW FILE compiz-0.8.2-wall.patch ---
diff -upNr compiz-0.8.2.orign/metadata/wall.xml.in compiz-0.8.2/metadata/wall.xml.in
--- compiz-0.8.2.orign/metadata/wall.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.2/metadata/wall.xml.in 2009-03-05 04:36:21.000000000 +0100
@@ -0,0 +1,357 @@
+<?xml version="1.0"?>
+<compiz>
+ <plugin name="wall" useBcop="true">
+ <_short>Desktop Wall</_short>
+ <_long>Desktop Wall Plugin</_long>
+ <category>Desktop</category>
+ <feature>largedesktop</feature>
+ <deps>
+ <relation type="after">
+ <plugin>decoration</plugin>
+ </relation>
+ <relation type="before">
+ <plugin>wobbly</plugin>
+ <plugin>fade</plugin>
+ </relation>
+ </deps>
+ <display>
+ <group>
+ <_short>Viewport Switch Preview</_short>
+ <option name="show_switcher" type="bool">
+ <_short>Show Viewport Switcher Preview</_short>
+ <_long>Show switcher window while switching viewports</_long>
+ <default>true</default>
+ </option>
+ <option name="miniscreen" type="bool">
+ <_short>Show Live Viewport Previews</_short>
+ <_long>Show live viewport previews in switcher window</_long>
+ <default>false</default>
+ </option>
+ <option name="preview_timeout" type="float">
+ <_short>Switch Target Preview Visibility Time</_short>
+ <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long>
+ <default>0.4</default>
+ <min>0.0</min>
+ <max>2.0</max>
+ <precision>0.05</precision>
+ </option>
+ <option name="preview_scale" type="int">
+ <_short>Preview Scale</_short>
+ <_long>Size of the preview in %</_long>
+ <default>100</default>
+ <min>0</min>
+ <max>400</max>
+ </option>
+ <option name="edge_radius" type="int">
+ <_short>Edge Radius</_short>
+ <_long>Radius of the rounded edge</_long>
+ <default>5</default>
+ <min>0</min>
+ <max>20</max>
+ </option>
+ <option name="border_width" type="int">
+ <_short>Border Width</_short>
+ <_long>Width of the border between the previews</_long>
+ <default>10</default>
+ <min>0</min>
+ <max>30</max>
+ </option>
+ <option name="outline_color" type="color">
+ <_short>Outline Color</_short>
+ <_long>Outline color of the switcher window.</_long>
+ <default>
+ <red>0x3333</red>
+ <green>0x3333</green>
+ <blue>0x3333</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <subgroup>
+ <_short>Background Gradient</_short>
+
+ <option name="background_gradient_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color for the background gradient of the switcher window.</_long>
+ <default>
+ <red>0xcccc</red>
+ <green>0xcccc</green>
+ <blue>0xe665</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <option name="background_gradient_highlight_color" type="color">
+ <_short>Highlight Color</_short>
+ <_long>Second color for the background gradient of the switcher window.</_long>
+ <default>
+ <red>0xf332</red>
+ <green>0xf332</green>
+ <blue>0xffff</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <option name="background_gradient_shadow_color" type="color">
+ <_short>Shadow Color</_short>
+ <_long>Third color for the background gradient of the switcher window.</_long>
+ <default>
+ <red>0xf332</red>
+ <green>0xf332</green>
+ <blue>0xffff</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <_short>Thumb Gradient</_short>
+
+ <option name="thumb_gradient_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color for the thumb gradient of the switcher window.</_long>
+ <default>
+ <red>0x3333</red>
+ <green>0x3333</green>
+ <blue>0x3333</blue>
+ <alpha>0x5999</alpha>
+ </default>
+ </option>
+ <option name="thumb_gradient_highlight_color" type="color">
+ <_short>Highlight Color</_short>
+ <_long>Second color for the thumb gradient of the switcher window.</_long>
+ <default>
+ <red>0x3fff</red>
+ <green>0x3fff</green>
+ <blue>0x3fff</blue>
+ <alpha>0x3fff</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <_short>Highlight Gradient</_short>
+
+ <option name="thumb_highlight_gradient_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color for the thumb highlight gradient of the switcher window.</_long>
+ <default>
+ <red>0xffff</red>
+ <green>0xffff</green>
+ <blue>0xffff</blue>
+ <alpha>0xf332</alpha>
+ </default>
+ </option>
+ <option name="thumb_highlight_gradient_shadow_color" type="color">
+ <_short>Shadow Color</_short>
+ <_long>Second color for the thumb highlight gradient of the switcher window.</_long>
+ <default>
+ <red>0xdfff</red>
+ <green>0xdfff</green>
+ <blue>0xdfff</blue>
+ <alpha>0xa665</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <_short>Arrow Colors</_short>
+
+ <option name="arrow_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color of the arrow of the switcher window.</_long>
+ <default>
+ <red>0xe665</red>
+ <green>0xe665</green>
+ <blue>0xe665</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <option name="arrow_shadow_color" type="color">
+ <_short>Shadow Color</_short>
+ <_long>Second color of the arrow of the switcher window.</_long>
+ <default>
+ <red>0xdc28</red>
+ <green>0xdc28</green>
+ <blue>0xdc28</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <_short>Viewport Switching</_short>
+ <option name="allow_wraparound" type="bool">
+ <_short>Allow Wrap-Around</_short>
+ <_long>Allow wrap-around when moving the wall up/down/left/right</_long>
+ <default>false</default>
+ </option>
+ <option name="slide_duration" type="float">
+ <_short>Wall Sliding Duration</_short>
+ <_long>Duration (in s) for wall sliding viewport switching animation</_long>
+ <default>0.3</default>
+ <min>0.0</min>
+ <max>5.0</max>
+ <precision>0.05</precision>
+ </option>
+ <option name="no_slide_match" type="match">
+ <_short>Non Sliding Windows</_short>
+ <_long>Windows that should not slide during the slide animation</_long>
+ <default>type=Dock | type=Desktop | state=Sticky</default>
+ </option>
[...4527 lines suppressed...]
+unsigned short * wallGetArrowBaseColor (CompDisplay *d);
+unsigned short wallGetArrowBaseColorRed (CompDisplay *d);
+unsigned short wallGetArrowBaseColorGreen (CompDisplay *d);
+unsigned short wallGetArrowBaseColorBlue (CompDisplay *d);
+unsigned short wallGetArrowBaseColorAlpha (CompDisplay *d);
+CompOption * wallGetArrowBaseColorOption (CompDisplay *d);
+void wallSetArrowBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+unsigned short * wallGetArrowShadowColor (CompDisplay *d);
+unsigned short wallGetArrowShadowColorRed (CompDisplay *d);
+unsigned short wallGetArrowShadowColorGreen (CompDisplay *d);
+unsigned short wallGetArrowShadowColorBlue (CompDisplay *d);
+unsigned short wallGetArrowShadowColorAlpha (CompDisplay *d);
+CompOption * wallGetArrowShadowColorOption (CompDisplay *d);
+void wallSetArrowShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+Bool wallGetAllowWraparound (CompDisplay *d);
+CompOption * wallGetAllowWraparoundOption (CompDisplay *d);
+void wallSetAllowWraparoundNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+float wallGetSlideDuration (CompDisplay *d);
+CompOption * wallGetSlideDurationOption (CompDisplay *d);
+void wallSetSlideDurationNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompMatch * wallGetNoSlideMatch (CompDisplay *d);
+CompOption * wallGetNoSlideMatchOption (CompDisplay *d);
+void wallSetNoSlideMatchNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetLeftKey (CompDisplay *d);
+void wallSetLeftKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetLeftKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetLeftKeyOption (CompDisplay *d);
+void wallSetLeftKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetLeftButton (CompDisplay *d);
+void wallSetLeftButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetLeftButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetLeftButtonOption (CompDisplay *d);
+void wallSetLeftButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetRightKey (CompDisplay *d);
+void wallSetRightKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetRightKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetRightKeyOption (CompDisplay *d);
+void wallSetRightKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetRightButton (CompDisplay *d);
+void wallSetRightButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetRightButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetRightButtonOption (CompDisplay *d);
+void wallSetRightButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetUpKey (CompDisplay *d);
+void wallSetUpKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetUpKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetUpKeyOption (CompDisplay *d);
+void wallSetUpKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetUpButton (CompDisplay *d);
+void wallSetUpButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetUpButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetUpButtonOption (CompDisplay *d);
+void wallSetUpButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetDownKey (CompDisplay *d);
+void wallSetDownKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetDownKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetDownKeyOption (CompDisplay *d);
+void wallSetDownKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetDownButton (CompDisplay *d);
+void wallSetDownButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetDownButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetDownButtonOption (CompDisplay *d);
+void wallSetDownButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetNextKey (CompDisplay *d);
+void wallSetNextKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetNextKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetNextKeyOption (CompDisplay *d);
+void wallSetNextKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetNextButton (CompDisplay *d);
+void wallSetNextButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetNextButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetNextButtonOption (CompDisplay *d);
+void wallSetNextButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetPrevKey (CompDisplay *d);
+void wallSetPrevKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetPrevKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetPrevKeyOption (CompDisplay *d);
+void wallSetPrevKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetPrevButton (CompDisplay *d);
+void wallSetPrevButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetPrevButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetPrevButtonOption (CompDisplay *d);
+void wallSetPrevButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetLeftWindowKey (CompDisplay *d);
+void wallSetLeftWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetLeftWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetLeftWindowKeyOption (CompDisplay *d);
+void wallSetLeftWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetRightWindowKey (CompDisplay *d);
+void wallSetRightWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetRightWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetRightWindowKeyOption (CompDisplay *d);
+void wallSetRightWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetUpWindowKey (CompDisplay *d);
+void wallSetUpWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetUpWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetUpWindowKeyOption (CompDisplay *d);
+void wallSetUpWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetDownWindowKey (CompDisplay *d);
+void wallSetDownWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetDownWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetDownWindowKeyOption (CompDisplay *d);
+void wallSetDownWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipLeftEdge (CompDisplay *d);
+void wallSetFlipLeftEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipLeftEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipLeftEdgeOption (CompDisplay *d);
+void wallSetFlipLeftEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipRightEdge (CompDisplay *d);
+void wallSetFlipRightEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipRightEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipRightEdgeOption (CompDisplay *d);
+void wallSetFlipRightEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipUpEdge (CompDisplay *d);
+void wallSetFlipUpEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipUpEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipUpEdgeOption (CompDisplay *d);
+void wallSetFlipUpEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipDownEdge (CompDisplay *d);
+void wallSetFlipDownEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipDownEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipDownEdgeOption (CompDisplay *d);
+void wallSetFlipDownEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+int wallGetMmmode (CompScreen *s);
+CompOption * wallGetMmmodeOption (CompScreen *s);
+void wallSetMmmodeNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+Bool wallGetEdgeflipPointer (CompScreen *s);
+CompOption * wallGetEdgeflipPointerOption (CompScreen *s);
+void wallSetEdgeflipPointerNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+Bool wallGetEdgeflipMove (CompScreen *s);
+CompOption * wallGetEdgeflipMoveOption (CompScreen *s);
+void wallSetEdgeflipMoveNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+Bool wallGetEdgeflipDnd (CompScreen *s);
+CompOption * wallGetEdgeflipDndOption (CompScreen *s);
+void wallSetEdgeflipDndNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+#ifndef GENERIC_PRIVATE_DEFINES
+#define GENERIC_PRIVATE_DEFINES
+
+#define GET_PLUGIN_CORE(object, plugin) \
+ ((plugin##Core *) (object)->base.privates[plugin##CorePrivateIndex].ptr)
+#define PLUGIN_CORE(object, plugin, prefix) \
+ plugin##Core * prefix##c = GET_PLUGIN_CORE (object, plugin)
+
+#define GET_PLUGIN_DISPLAY(object, plugin) \
+ ((plugin##Display *) \
+ (object)->base.privates[plugin##DisplayPrivateIndex].ptr)
+#define PLUGIN_DISPLAY(object, plugin, prefix) \
+ plugin##Display * prefix##d = GET_PLUGIN_DISPLAY (object, plugin)
+
+#define GET_PLUGIN_SCREEN(object, parent, plugin) \
+ ((plugin##Screen *) \
+ (object)->base.privates[(parent)->screenPrivateIndex].ptr)
+#define PLUGIN_SCREEN(object, plugin, prefix) \
+ plugin##Screen * prefix##s = \
+ GET_PLUGIN_SCREEN (object, \
+ GET_PLUGIN_DISPLAY ((object)->display, plugin), plugin)
+
+#define GET_PLUGIN_WINDOW(object, parent, plugin) \
+ ((plugin##Window *) \
+ (object)->base.privates[(parent)->windowPrivateIndex].ptr)
+#define PLUGIN_WINDOW(object, plugin, prefix) \
+ plugin##Window * prefix##w = \
+ GET_PLUGIN_WINDOW (object, \
+ GET_PLUGIN_SCREEN ((object)->screen, \
+ GET_PLUGIN_DISPLAY ((object)->screen->display, plugin), plugin), plugin)
+
+#endif
+
+COMPIZ_END_DECLS
+
+#endif
Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -p -r1.169 -r1.170
--- compiz.spec 10 Jul 2009 11:57:02 -0000 1.169
+++ compiz.spec 10 Jul 2009 21:24:50 -0000 1.170
@@ -14,7 +14,7 @@ URL: http://www.go-compiz.org
License: GPLv2+ and LGPLv2+ and MIT
Group: User Interface/Desktops
Version: 0.8.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,7 @@ BuildRequires: mesa-libGLU-devel
BuildRequires: kdebase-workspace-devel plasma-devel
BuildRequires: dbus-qt-devel
BuildRequires: fuse-devel
+BuildRequires: cairo-devel
Source0: http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
Source1: desktop-effects-%{dialogversion}.tar.bz2
@@ -59,6 +60,7 @@ Patch102: desktop-effects-0.7.17-wall-pl
Patch103: composite-cube-logo.patch
Patch105: fedora-logo.patch
Patch106: redhat-logo.patch
+Patch107: compiz-0.8.2-wall.patch
#Patch110: scale-key.patch
# update translations in desktop-effects
Patch115: desktop-effects-linguas.patch
@@ -100,7 +102,6 @@ Requires: gnome-session >= 2.19.6-5
Requires: metacity >= 2.18
Requires: libwnck >= 2.15.4
Requires: %{name} = %{version}
-Requires: compiz-fusion-gnome = %{version}
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
@@ -140,6 +141,7 @@ popd
%else
%patch106 -p1 -b .redhat-logo
%endif
+%patch107 -p1 -b .wall
#%patch110 -p1 -b .scale-key
%patch123 -p1 -b .initial-plugins
@@ -155,7 +157,8 @@ export CPPFLAGS
LDFLAGS="$LDFLAGS -L%{_libdir}/kde4/devel"
export LDFLAGS
-
+aclocal
+automake
%configure \
--enable-gconf \
--enable-dbus \
@@ -356,6 +359,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-5
+- Move wall plugin from fusion to the main compiz package
+- Drop requires on compiz-fusion-gnome
+
* Fri Jul 10 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-4
- Replace compiz-0.8.2-pin-initial-plugins with a fixed up one
by Philippe Troin <phil at fifi.org> (RH #473896)
More information about the fedora-extras-commits
mailing list