Mon May 12 01:57:37 2008 UTC ()
Make compiz work out of the box:
  o Install schemas for compiz core and plugins, not just gwd
  o Patch compiz-core schema to load a sane set of plugins by default
  o Patch compiz-decorator schema to workaround a bug in the
    xf86-video-intel driver related to drop shadows.
  o Enable gnome PKG_OPTION by default.
  o Bump pkg revision.


(jmcneill)
diff -r1.17 -r1.18 pkgsrc/wm/compiz/Makefile
diff -r1.6 -r1.7 pkgsrc/wm/compiz/PLIST
diff -r1.5 -r1.6 pkgsrc/wm/compiz/distinfo
diff -r0 -r1.3 pkgsrc/wm/compiz/patches/patch-aa
diff -r0 -r1.3 pkgsrc/wm/compiz/patches/patch-ab
cvs diff -r1.17 -r1.18 pkgsrc/wm/compiz/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/compiz/Makefile 2008/04/23 22:48:35 1.17
+++ pkgsrc/wm/compiz/Makefile 2008/05/12 01:57:37 1.18
@@ -1,40 +1,83 @@ @@ -1,40 +1,83 @@
1# $NetBSD: Makefile,v 1.17 2008/04/23 22:48:35 xtraeme Exp $ 1# $NetBSD: Makefile,v 1.18 2008/05/12 01:57:37 jmcneill Exp $
2# 2#
3 3
4DISTNAME= compiz-0.6.2 4DISTNAME= compiz-0.6.2
5#PKGREVISION= 8 5PKGREVISION= 1
6CATEGORIES= wm x11 6CATEGORIES= wm x11
7MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/ 7MASTER_SITES= http://xorg.freedesktop.org/releases/individual/app/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://compiz.org/ 10HOMEPAGE= http://compiz.org/
11COMMENT= Compositing window manager 11COMMENT= Compositing window manager
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= intltool pkg-config msgfmt 14USE_TOOLS+= intltool pkg-config msgfmt
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18 18
 19COMPIZ_GCONF_SCHEMAS+= compiz-annotate.schemas
 20COMPIZ_GCONF_SCHEMAS+= compiz-blur.schemas
 21COMPIZ_GCONF_SCHEMAS+= compiz-clone.schemas
 22COMPIZ_GCONF_SCHEMAS+= compiz-core.schemas
 23COMPIZ_GCONF_SCHEMAS+= compiz-cube.schemas
 24COMPIZ_GCONF_SCHEMAS+= compiz-dbus.schemas
 25COMPIZ_GCONF_SCHEMAS+= compiz-decoration.schemas
 26COMPIZ_GCONF_SCHEMAS+= compiz-fade.schemas
 27COMPIZ_GCONF_SCHEMAS+= compiz-fs.schemas
 28COMPIZ_GCONF_SCHEMAS+= compiz-gconf.schemas
 29COMPIZ_GCONF_SCHEMAS+= compiz-glib.schemas
 30COMPIZ_GCONF_SCHEMAS+= compiz-ini.schemas
 31COMPIZ_GCONF_SCHEMAS+= compiz-inotify.schemas
 32COMPIZ_GCONF_SCHEMAS+= compiz-minimize.schemas
 33COMPIZ_GCONF_SCHEMAS+= compiz-move.schemas
 34COMPIZ_GCONF_SCHEMAS+= compiz-place.schemas
 35COMPIZ_GCONF_SCHEMAS+= compiz-plane.schemas
 36COMPIZ_GCONF_SCHEMAS+= compiz-png.schemas
 37COMPIZ_GCONF_SCHEMAS+= compiz-regex.schemas
 38COMPIZ_GCONF_SCHEMAS+= compiz-resize.schemas
 39COMPIZ_GCONF_SCHEMAS+= compiz-rotate.schemas
 40COMPIZ_GCONF_SCHEMAS+= compiz-scale.schemas
 41COMPIZ_GCONF_SCHEMAS+= compiz-screenshot.schemas
 42COMPIZ_GCONF_SCHEMAS+= compiz-svg.schemas
 43COMPIZ_GCONF_SCHEMAS+= compiz-switcher.schemas
 44COMPIZ_GCONF_SCHEMAS+= compiz-video.schemas
 45COMPIZ_GCONF_SCHEMAS+= compiz-water.schemas
 46COMPIZ_GCONF_SCHEMAS+= compiz-wobbly.schemas
 47COMPIZ_GCONF_SCHEMAS+= compiz-zoom.schemas
 48
19GCONF_SCHEMAS+= gwd.schemas 49GCONF_SCHEMAS+= gwd.schemas
 50GCONF_SCHEMAS+= ${COMPIZ_GCONF_SCHEMAS}
 51
20PKGCONFIG_OVERRIDE+= compiz.pc.in 52PKGCONFIG_OVERRIDE+= compiz.pc.in
21PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in 53PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in
22 54
23CONFIGURE_ARGS+= --disable-inotify 55CONFIGURE_ARGS+= --disable-inotify
24 56
25PKG_SUPPORTED_OPTIONS= gnome kde 57PKG_SUPPORTED_OPTIONS= gnome kde
 58PKG_SUGGESTED_OPTIONS= gnome
26PKG_OPTIONS_VAR= PKG_OPTIONS.compiz 59PKG_OPTIONS_VAR= PKG_OPTIONS.compiz
27 60
 61SUBST_CLASSES+= paths
 62SUBST_FILES.paths= metadata/compiz-decoration.schemas
 63SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g'
 64SUBST_STAGE.paths= post-patch
 65
 66post-install:
 67.for schema in ${COMPIZ_GCONF_SCHEMAS}
 68 ${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${PREFIX}/share/gconf/schemas
 69.endfor
 70
28.include "../../mk/bsd.options.mk" 71.include "../../mk/bsd.options.mk"
29 72
30PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 73PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
31 74
32# this is as much as needed for the basic window decorator 75# this is as much as needed for the basic window decorator
33.include "../../graphics/cairo/buildlink3.mk" 76.include "../../graphics/cairo/buildlink3.mk"
34.include "../../x11/gtk2/buildlink3.mk" 77.include "../../x11/gtk2/buildlink3.mk"
35.include "../../devel/libwnck/buildlink3.mk" 78.include "../../devel/libwnck/buildlink3.mk"
36 79
37.if !empty(PKG_OPTIONS:Mgnome) 80.if !empty(PKG_OPTIONS:Mgnome)
38CONFIGURE_ARGS+= --enable-librsvg 81CONFIGURE_ARGS+= --enable-librsvg
39PLIST.gnome= yes 82PLIST.gnome= yes
40.include "../../x11/gnome-control-center/buildlink3.mk" 83.include "../../x11/gnome-control-center/buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/wm/compiz/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/compiz/PLIST 2008/04/23 22:48:35 1.6
+++ pkgsrc/wm/compiz/PLIST 2008/05/12 01:57:37 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2008/04/23 22:48:35 xtraeme Exp $ 1@comment $NetBSD: PLIST,v 1.7 2008/05/12 01:57:37 jmcneill Exp $
2bin/compiz 2bin/compiz
3bin/gtk-window-decorator 3bin/gtk-window-decorator
4include/compiz/compiz.h 4include/compiz/compiz.h
5include/compiz/cube.h 5include/compiz/cube.h
6include/compiz/decoration.h 6include/compiz/decoration.h
7include/compiz/scale.h 7include/compiz/scale.h
8lib/compiz/libannotate.la 8lib/compiz/libannotate.la
9lib/compiz/libblur.la 9lib/compiz/libblur.la
10lib/compiz/libclone.la 10lib/compiz/libclone.la
11lib/compiz/libcube.la 11lib/compiz/libcube.la
12lib/compiz/libdbus.la 12lib/compiz/libdbus.la
13lib/compiz/libdecoration.la 13lib/compiz/libdecoration.la
14lib/compiz/libfade.la 14lib/compiz/libfade.la
@@ -27,27 +27,27 @@ lib/compiz/libscale.la @@ -27,27 +27,27 @@ lib/compiz/libscale.la
27lib/compiz/libscreenshot.la 27lib/compiz/libscreenshot.la
28${PLIST.gnome}lib/compiz/libsvg.la 28${PLIST.gnome}lib/compiz/libsvg.la
29lib/compiz/libswitcher.la 29lib/compiz/libswitcher.la
30lib/compiz/libvideo.la 30lib/compiz/libvideo.la
31lib/compiz/libwater.la 31lib/compiz/libwater.la
32lib/compiz/libwobbly.la 32lib/compiz/libwobbly.la
33lib/compiz/libzoom.la 33lib/compiz/libzoom.la
34lib/libdecoration.la 34lib/libdecoration.la
35lib/pkgconfig/compiz-cube.pc 35lib/pkgconfig/compiz-cube.pc
36lib/pkgconfig/compiz-gconf.pc 36lib/pkgconfig/compiz-gconf.pc
37lib/pkgconfig/compiz-scale.pc 37lib/pkgconfig/compiz-scale.pc
38lib/pkgconfig/compiz.pc 38lib/pkgconfig/compiz.pc
39lib/pkgconfig/libdecoration.pc 39lib/pkgconfig/libdecoration.pc
40${PLIST.gnome}window-manager-settings/libcompiz.la 40${PLIST.gnome}lib/window-manager-settings/libcompiz.la
41share/compiz/annotate.xml 41share/compiz/annotate.xml
42share/compiz/blur.xml 42share/compiz/blur.xml
43share/compiz/clone.xml 43share/compiz/clone.xml
44share/compiz/core.xml 44share/compiz/core.xml
45share/compiz/cube.xml 45share/compiz/cube.xml
46share/compiz/dbus.xml 46share/compiz/dbus.xml
47share/compiz/decoration.xml 47share/compiz/decoration.xml
48share/compiz/fade.xml 48share/compiz/fade.xml
49share/compiz/freedesktop.png 49share/compiz/freedesktop.png
50share/compiz/fs.xml 50share/compiz/fs.xml
51share/compiz/gconf.xml 51share/compiz/gconf.xml
52share/compiz/glib.xml 52share/compiz/glib.xml
53share/compiz/icon.png 53share/compiz/icon.png
@@ -60,26 +60,55 @@ share/compiz/plane.xml @@ -60,26 +60,55 @@ share/compiz/plane.xml
60share/compiz/png.xml 60share/compiz/png.xml
61share/compiz/regex.xml 61share/compiz/regex.xml
62share/compiz/resize.xml 62share/compiz/resize.xml
63share/compiz/rotate.xml 63share/compiz/rotate.xml
64share/compiz/scale.xml 64share/compiz/scale.xml
65share/compiz/schemas.xslt 65share/compiz/schemas.xslt
66share/compiz/screenshot.xml 66share/compiz/screenshot.xml
67share/compiz/svg.xml 67share/compiz/svg.xml
68share/compiz/switcher.xml 68share/compiz/switcher.xml
69share/compiz/video.xml 69share/compiz/video.xml
70share/compiz/water.xml 70share/compiz/water.xml
71share/compiz/wobbly.xml 71share/compiz/wobbly.xml
72share/compiz/zoom.xml 72share/compiz/zoom.xml
 73share/gconf/schemas/compiz-annotate.schemas
 74share/gconf/schemas/compiz-blur.schemas
 75share/gconf/schemas/compiz-clone.schemas
 76share/gconf/schemas/compiz-core.schemas
 77share/gconf/schemas/compiz-cube.schemas
 78share/gconf/schemas/compiz-dbus.schemas
 79share/gconf/schemas/compiz-decoration.schemas
 80share/gconf/schemas/compiz-fade.schemas
 81share/gconf/schemas/compiz-fs.schemas
 82share/gconf/schemas/compiz-gconf.schemas
 83share/gconf/schemas/compiz-glib.schemas
 84share/gconf/schemas/compiz-ini.schemas
 85share/gconf/schemas/compiz-inotify.schemas
 86share/gconf/schemas/compiz-minimize.schemas
 87share/gconf/schemas/compiz-move.schemas
 88share/gconf/schemas/compiz-place.schemas
 89share/gconf/schemas/compiz-plane.schemas
 90share/gconf/schemas/compiz-png.schemas
 91share/gconf/schemas/compiz-regex.schemas
 92share/gconf/schemas/compiz-resize.schemas
 93share/gconf/schemas/compiz-rotate.schemas
 94share/gconf/schemas/compiz-scale.schemas
 95share/gconf/schemas/compiz-screenshot.schemas
 96share/gconf/schemas/compiz-svg.schemas
 97share/gconf/schemas/compiz-switcher.schemas
 98share/gconf/schemas/compiz-video.schemas
 99share/gconf/schemas/compiz-water.schemas
 100share/gconf/schemas/compiz-wobbly.schemas
 101share/gconf/schemas/compiz-zoom.schemas
73share/gconf/schemas/gwd.schemas 102share/gconf/schemas/gwd.schemas
74${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-desktop-key.xml 103${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-desktop-key.xml
75${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-key.xml 104${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-key.xml
76${PLIST.gnome}share/gnome/wm-properties/compiz.desktop 105${PLIST.gnome}share/gnome/wm-properties/compiz.desktop
77share/locale/af/LC_MESSAGES/compiz.mo 106share/locale/af/LC_MESSAGES/compiz.mo
78share/locale/ar/LC_MESSAGES/compiz.mo 107share/locale/ar/LC_MESSAGES/compiz.mo
79share/locale/bg/LC_MESSAGES/compiz.mo 108share/locale/bg/LC_MESSAGES/compiz.mo
80share/locale/bn/LC_MESSAGES/compiz.mo 109share/locale/bn/LC_MESSAGES/compiz.mo
81share/locale/bs/LC_MESSAGES/compiz.mo 110share/locale/bs/LC_MESSAGES/compiz.mo
82share/locale/ca/LC_MESSAGES/compiz.mo 111share/locale/ca/LC_MESSAGES/compiz.mo
83share/locale/cs/LC_MESSAGES/compiz.mo 112share/locale/cs/LC_MESSAGES/compiz.mo
84share/locale/cy/LC_MESSAGES/compiz.mo 113share/locale/cy/LC_MESSAGES/compiz.mo
85share/locale/da/LC_MESSAGES/compiz.mo 114share/locale/da/LC_MESSAGES/compiz.mo
cvs diff -r1.5 -r1.6 pkgsrc/wm/compiz/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/compiz/distinfo 2008/04/23 18:17:25 1.5
+++ pkgsrc/wm/compiz/distinfo 2008/05/12 01:57:37 1.6
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.5 2008/04/23 18:17:25 xtraeme Exp $ 1$NetBSD: distinfo,v 1.6 2008/05/12 01:57:37 jmcneill Exp $
2 2
3SHA1 (compiz-0.6.2.tar.gz) = ab5ecad856049a12a803fe6c94c3e55cdfcb5f68 3SHA1 (compiz-0.6.2.tar.gz) = ab5ecad856049a12a803fe6c94c3e55cdfcb5f68
4RMD160 (compiz-0.6.2.tar.gz) = 6cc235570c3ac15573050b27198648045a85a804 4RMD160 (compiz-0.6.2.tar.gz) = 6cc235570c3ac15573050b27198648045a85a804
5Size (compiz-0.6.2.tar.gz) = 1784471 bytes 5Size (compiz-0.6.2.tar.gz) = 1784471 bytes
 6SHA1 (patch-aa) = 1b6ab48fd459bc2fa4173f8f1d4936aa0d5c00be
 7SHA1 (patch-ab) = 273430fa119b4c904287115be1f5273868073899
File Added: pkgsrc/wm/compiz/patches/patch-aa
$NetBSD: patch-aa,v 1.3 2008/05/12 01:57:37 jmcneill Exp $

--- metadata/compiz-core.schemas.orig	2008-05-11 20:43:31.000000000 -0400
+++ metadata/compiz-core.schemas	2008-05-11 20:44:03.000000000 -0400
@@ -7,7 +7,7 @@
       <owner>compiz</owner>
       <type>list</type>
       <list_type>string</list_type>
-      <default>[]</default>
+      <default>[gconf,decoration,wobbly,fade,minimize,switcher,move,resize,place,rotate,zoom,scale]</default>
       <locale name="C">
         <short>Active Plugins</short>
         <long>List of currently active plugins</long>
File Added: pkgsrc/wm/compiz/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.3 2008/05/12 01:57:37 jmcneill Exp $

--- metadata/compiz-decoration.schemas.orig	2007-10-01 13:43:31.000000000 -0400
+++ metadata/compiz-decoration.schemas	2008-05-11 21:38:39.000000000 -0400
@@ -6,7 +6,7 @@
       <applyto>/apps/compiz/plugins/decoration/allscreens/options/shadow_radius</applyto>
       <owner>compiz</owner>
       <type>float</type>
-      <default>8.0</default>
+      <default>9.0</default>
       <locale name="C">
         <short>Shadow Radius</short>
         <long>Drop shadow radius (0.1 - 18.0)</long>
@@ -337,7 +337,7 @@
       <applyto>/apps/compiz/plugins/decoration/allscreens/options/command</applyto>
       <owner>compiz</owner>
       <type>string</type>
-      <default/>
+      <default>@PREFIX@/bin/gtk-window-decorator</default>
       <locale name="C">
         <short>Command</short>
         <long>Decorator command line that is executed if no decorator is already running</long>