Sun Jun 30 20:30:09 2013 UTC ()
Update to last release before the rewrite. Added options framework for
inotify (enabled by default), gnome, kde{3,4}, and fuse PKG_OPTIONS.
PLIST is handled accordingly. USE_TOOLS+=xgettext msgmerge; Moved
PKG_OPTIONS in Makefile to options.mk. Fix DLLIBS using
BUILDLINK_TRANSFORM. Buildlink pango (build), dlopen, glib2,
libxml2, libXext, and libX11. From NEWS:

Release 0.8.8 (2011-03-30 Danny Baumann <dannybaumann@web.de>)
==============================================================
Maintenance release.

Various focus and stacking fixes.

Removed usages of deprecated GTK API.

Fixed drawing of switcher background with KDE4 window decorator.

Release 0.8.6 (2010-03-28 Danny Baumann <dannybaumann@web.de>)
==============================================================
Maintenance release.

Various focus and window placement fixes.

Fixed handling of windows that have a (server-drawn) border.

Fixed handling of window icons that have a colour depth of 1 bit.

Added KDE 4.4 support to KDE4 window decorator.


(rodent)
diff -r1.65 -r1.66 pkgsrc/wm/compiz/Makefile
diff -r1.11 -r1.12 pkgsrc/wm/compiz/PLIST
diff -r1.22 -r1.23 pkgsrc/wm/compiz/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/wm/compiz/distinfo
diff -r0 -r1.1 pkgsrc/wm/compiz/options.mk
diff -r1.4 -r1.5 pkgsrc/wm/compiz/patches/patch-aa
diff -r1.5 -r0 pkgsrc/wm/compiz/patches/patch-ab
cvs diff -r1.65 -r1.66 pkgsrc/wm/compiz/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/compiz/Makefile 2013/06/06 12:53:55 1.65
+++ pkgsrc/wm/compiz/Makefile 2013/06/30 20:30:09 1.66
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.65 2013/06/06 12:53:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.66 2013/06/30 20:30:09 rodent Exp $
2# 2#
3 3
4PKGVER= 0.8.4 4PKGVER= 0.8.8
5DISTNAME= compiz-${PKGVER} 5DISTNAME= compiz-${PKGVER}
6PKGREVISION= 36 
7CATEGORIES= wm x11 6CATEGORIES= wm x11
8MASTER_SITES= http://releases.compiz.org/${PKGVER}/ 7MASTER_SITES= http://releases.compiz.org/${PKGVER}/
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://compiz.org/ 10HOMEPAGE= http://compiz.org/
12COMMENT= Compositing window manager 11COMMENT= Compositing window manager
13LICENSE= mit 12LICENSE= mit
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_TOOLS+= intltool pkg-config msgfmt gmake 15USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config xgettext
17USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20 19
21COMPIZ_GCONF_SCHEMAS+= compiz-annotate.schemas 20COMPIZ_GCONF_SCHEMAS+= compiz-annotate.schemas
22COMPIZ_GCONF_SCHEMAS+= compiz-blur.schemas 21COMPIZ_GCONF_SCHEMAS+= compiz-blur.schemas
23COMPIZ_GCONF_SCHEMAS+= compiz-clone.schemas 22COMPIZ_GCONF_SCHEMAS+= compiz-clone.schemas
24COMPIZ_GCONF_SCHEMAS+= compiz-commands.schemas 23COMPIZ_GCONF_SCHEMAS+= compiz-commands.schemas
25COMPIZ_GCONF_SCHEMAS+= compiz-core.schemas 24COMPIZ_GCONF_SCHEMAS+= compiz-core.schemas
26COMPIZ_GCONF_SCHEMAS+= compiz-cube.schemas 25COMPIZ_GCONF_SCHEMAS+= compiz-cube.schemas
27COMPIZ_GCONF_SCHEMAS+= compiz-dbus.schemas 26COMPIZ_GCONF_SCHEMAS+= compiz-dbus.schemas
28COMPIZ_GCONF_SCHEMAS+= compiz-decoration.schemas 27COMPIZ_GCONF_SCHEMAS+= compiz-decoration.schemas
29COMPIZ_GCONF_SCHEMAS+= compiz-fade.schemas 28COMPIZ_GCONF_SCHEMAS+= compiz-fade.schemas
@@ -46,76 +45,64 @@ COMPIZ_GCONF_SCHEMAS+= compiz-scale.sch @@ -46,76 +45,64 @@ COMPIZ_GCONF_SCHEMAS+= compiz-scale.sch
46COMPIZ_GCONF_SCHEMAS+= compiz-screenshot.schemas 45COMPIZ_GCONF_SCHEMAS+= compiz-screenshot.schemas
47COMPIZ_GCONF_SCHEMAS+= compiz-svg.schemas 46COMPIZ_GCONF_SCHEMAS+= compiz-svg.schemas
48COMPIZ_GCONF_SCHEMAS+= compiz-switcher.schemas 47COMPIZ_GCONF_SCHEMAS+= compiz-switcher.schemas
49COMPIZ_GCONF_SCHEMAS+= compiz-video.schemas 48COMPIZ_GCONF_SCHEMAS+= compiz-video.schemas
50COMPIZ_GCONF_SCHEMAS+= compiz-water.schemas 49COMPIZ_GCONF_SCHEMAS+= compiz-water.schemas
51COMPIZ_GCONF_SCHEMAS+= compiz-wobbly.schemas 50COMPIZ_GCONF_SCHEMAS+= compiz-wobbly.schemas
52COMPIZ_GCONF_SCHEMAS+= compiz-zoom.schemas 51COMPIZ_GCONF_SCHEMAS+= compiz-zoom.schemas
53GCONF_SCHEMAS+= gwd.schemas 52GCONF_SCHEMAS+= gwd.schemas
54GCONF_SCHEMAS+= ${COMPIZ_GCONF_SCHEMAS} 53GCONF_SCHEMAS+= ${COMPIZ_GCONF_SCHEMAS}
55 54
56PKGCONFIG_OVERRIDE+= compiz.pc.in 55PKGCONFIG_OVERRIDE+= compiz.pc.in
57PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in 56PKGCONFIG_OVERRIDE+= libdecoration/libdecoration.pc.in
58 57
59CONFIGURE_ARGS+= --disable-inotify 
60 
61PKG_SUPPORTED_OPTIONS= gnome kde 
62PKG_SUGGESTED_OPTIONS= gnome 
63PKG_OPTIONS_VAR= PKG_OPTIONS.compiz 
64 
65SUBST_CLASSES+= paths 58SUBST_CLASSES+= paths
66SUBST_FILES.paths= metadata/decoration.xml.in 59SUBST_FILES.paths= metadata/decoration.xml.in
67SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g' 60SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g'
68SUBST_STAGE.paths= post-patch 61SUBST_STAGE.paths= post-patch
69 62
 63.include "options.mk"
 64
 65BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 66
70post-install: 67post-install:
71.for schema in ${COMPIZ_GCONF_SCHEMAS} 68.for schema in ${COMPIZ_GCONF_SCHEMAS}
72 ${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${DESTDIR}${PREFIX}/share/gconf/schemas 69 ${INSTALL_DATA} ${WRKSRC}/metadata/${schema} ${DESTDIR}${PREFIX}/share/gconf/schemas
73.endfor 70.endfor
74 71
75.include "../../mk/bsd.options.mk" 
76 
77PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 
78 
79# this is as much as needed for the basic window decorator 72# this is as much as needed for the basic window decorator
 73BUILDLINK_DEPMETHOD.pango= build
 74.include "../../devel/pango/buildlink3.mk"
80.include "../../graphics/cairo/buildlink3.mk" 75.include "../../graphics/cairo/buildlink3.mk"
81.include "../../x11/gtk2/buildlink3.mk" 76.include "../../x11/gtk2/buildlink3.mk"
82.include "../../devel/libwnck/buildlink3.mk" 77.include "../../devel/libwnck/buildlink3.mk"
83 78
84.if !empty(PKG_OPTIONS:Mgnome) 
85CONFIGURE_ARGS+= --enable-librsvg 
86PLIST.gnome= yes 
87.include "../../x11/gnome-control-center/buildlink3.mk" 
88.include "../../wm/metacity/buildlink3.mk" 
89.include "../../graphics/librsvg/buildlink3.mk" 
90.endif 
91 
92.if !empty(PKG_OPTIONS:Mkde) 
93PLIST.kde= yes 
94.include "../../x11/kdebase3/buildlink3.mk" 
95.include "../../sysutils/dbus-qt3/buildlink3.mk" 
96.endif 
97 
98# While we don't use threads, we link against libpthread because 79# While we don't use threads, we link against libpthread because
99# some plugins do it. 80# some plugins do it. Same for dlopen.
100.include "../../mk/pthread.buildlink3.mk" 81.include "../../mk/pthread.buildlink3.mk"
 82.include "../../mk/dlopen.buildlink3.mk"
101 83
102.include "../../audio/libcanberra/buildlink3.mk" 84.include "../../audio/libcanberra/buildlink3.mk"
103.include "../../devel/GConf/schemas.mk" 85.include "../../devel/GConf/schemas.mk"
104.include "../../graphics/png/buildlink3.mk" 86.include "../../graphics/png/buildlink3.mk"
 87.include "../../devel/glib2/buildlink3.mk"
105.include "../../sysutils/dbus/buildlink3.mk" 88.include "../../sysutils/dbus/buildlink3.mk"
106.include "../../sysutils/dbus-glib/buildlink3.mk" 89.include "../../sysutils/dbus-glib/buildlink3.mk"
 90.include "../../textproc/libxml2/buildlink3.mk"
107.include "../../textproc/libxslt/buildlink3.mk" 91.include "../../textproc/libxslt/buildlink3.mk"
108.include "../../x11/libXcomposite/buildlink3.mk" 92.include "../../x11/libXcomposite/buildlink3.mk"
109.include "../../x11/libXfixes/buildlink3.mk" 93.include "../../x11/libXfixes/buildlink3.mk"
110.include "../../x11/libXdamage/buildlink3.mk" 94.include "../../x11/libXdamage/buildlink3.mk"
111.include "../../x11/libXrandr/buildlink3.mk" 95.include "../../x11/libXrandr/buildlink3.mk"
112.include "../../x11/libXinerama/buildlink3.mk" 96.include "../../x11/libXinerama/buildlink3.mk"
113.include "../../x11/libXxf86vm/buildlink3.mk" 97.include "../../x11/libXxf86vm/buildlink3.mk"
114.include "../../x11/libdrm/buildlink3.mk" 98.include "../../x11/libdrm/buildlink3.mk"
115.include "../../x11/libICE/buildlink3.mk" 99.include "../../x11/libICE/buildlink3.mk"
116.include "../../x11/libSM/buildlink3.mk" 100.include "../../x11/libSM/buildlink3.mk"
117.include "../../x11/startup-notification/buildlink3.mk" 101.include "../../x11/startup-notification/buildlink3.mk"
 102BUILDLINK_API_DEPENDS.libXrender+= libXrender>=0.9.3
118.include "../../x11/libXrender/buildlink3.mk" 103.include "../../x11/libXrender/buildlink3.mk"
119.include "../../graphics/MesaLib/buildlink3.mk" 104.include "../../graphics/MesaLib/buildlink3.mk"
120.include "../../graphics/glu/buildlink3.mk" 105.include "../../graphics/glu/buildlink3.mk"
 106.include "../../x11/libXext/buildlink3.mk"
 107.include "../../x11/libX11/buildlink3.mk"
121.include "../../mk/bsd.pkg.mk" 108.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/wm/compiz/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/compiz/PLIST 2010/03/16 11:06:17 1.11
+++ pkgsrc/wm/compiz/PLIST 2013/06/30 20:30:09 1.12
@@ -1,82 +1,83 @@ @@ -1,82 +1,83 @@
1@comment $NetBSD: PLIST,v 1.11 2010/03/16 11:06:17 obache Exp $ 1@comment $NetBSD: PLIST,v 1.12 2013/06/30 20:30:09 rodent Exp $
2bin/compiz 2bin/compiz
3bin/gtk-window-decorator 3bin/gtk-window-decorator
4${PLIST.kde}bin/kde-window-decorator 4${PLIST.kde3}bin/kde-window-decorator
5include/compiz/compiz-common.h 5include/compiz/compiz-common.h
6include/compiz/compiz-core.h 6include/compiz/compiz-core.h
7include/compiz/compiz-cube.h 7include/compiz/compiz-cube.h
8include/compiz/compiz-plugin.h 8include/compiz/compiz-plugin.h
9include/compiz/compiz-scale.h 9include/compiz/compiz-scale.h
10include/compiz/compiz.h 10include/compiz/compiz.h
11include/compiz/decoration.h 11include/compiz/decoration.h
12lib/compiz/libannotate.la 12lib/compiz/libannotate.la
13lib/compiz/libblur.la 13lib/compiz/libblur.la
14lib/compiz/libclone.la 14lib/compiz/libclone.la
15lib/compiz/libcommands.la 15lib/compiz/libcommands.la
16lib/compiz/libcube.la 16lib/compiz/libcube.la
17lib/compiz/libdbus.la 17lib/compiz/libdbus.la
18lib/compiz/libdecoration.la 18lib/compiz/libdecoration.la
19lib/compiz/libfade.la 19lib/compiz/libfade.la
20lib/compiz/libgconf.la 20lib/compiz/libgconf.la
21lib/compiz/libglib.la 21lib/compiz/libglib.la
22lib/compiz/libgnomecompat.la 22lib/compiz/libgnomecompat.la
23lib/compiz/libini.la 23lib/compiz/libini.la
24${PLIST.kde}lib/compiz/libkconfig.la 24${PLIST.inotify}lib/compiz/libinotify.la
 25${PLIST.kde3}lib/compiz/libkconfig.la
25lib/compiz/libminimize.la 26lib/compiz/libminimize.la
26lib/compiz/libmove.la 27lib/compiz/libmove.la
27lib/compiz/libobs.la 28lib/compiz/libobs.la
28lib/compiz/libplace.la 29lib/compiz/libplace.la
29lib/compiz/libpng.la 30lib/compiz/libpng.la
30lib/compiz/libregex.la 31lib/compiz/libregex.la
31lib/compiz/libresize.la 32lib/compiz/libresize.la
32lib/compiz/librotate.la 33lib/compiz/librotate.la
33lib/compiz/libscale.la 34lib/compiz/libscale.la
34lib/compiz/libscreenshot.la 35lib/compiz/libscreenshot.la
35${PLIST.gnome}lib/compiz/libsvg.la 36${PLIST.gnome}lib/compiz/libsvg.la
36lib/compiz/libswitcher.la 37lib/compiz/libswitcher.la
37lib/compiz/libvideo.la 38lib/compiz/libvideo.la
38lib/compiz/libwater.la 39lib/compiz/libwater.la
39lib/compiz/libwobbly.la 40lib/compiz/libwobbly.la
40lib/compiz/libzoom.la 41lib/compiz/libzoom.la
41lib/libdecoration.la 42lib/libdecoration.la
42lib/pkgconfig/compiz-cube.pc 43lib/pkgconfig/compiz-cube.pc
43lib/pkgconfig/compiz-gconf.pc 44lib/pkgconfig/compiz-gconf.pc
44${PLIST.kde}lib/pkgconfig/compiz-kconfig.pc 45${PLIST.kde3}lib/pkgconfig/compiz-kconfig.pc
45lib/pkgconfig/compiz-scale.pc 46lib/pkgconfig/compiz-scale.pc
46lib/pkgconfig/compiz.pc 47lib/pkgconfig/compiz.pc
47lib/pkgconfig/libdecoration.pc 48lib/pkgconfig/libdecoration.pc
48${PLIST.gnome}lib/window-manager-settings/libcompiz.la 49${PLIST.gnome}lib/window-manager-settings/libcompiz.la
49${PLIST.gnome}share/applications/compiz.desktop 50${PLIST.gnome}share/applications/compiz.desktop
50share/compiz/annotate.xml 51share/compiz/annotate.xml
51share/compiz/blur.xml 52share/compiz/blur.xml
52share/compiz/clone.xml 53share/compiz/clone.xml
53share/compiz/commands.xml 54share/compiz/commands.xml
54share/compiz/core.xml 55share/compiz/core.xml
55share/compiz/cube.xml 56share/compiz/cube.xml
56share/compiz/dbus.xml 57share/compiz/dbus.xml
57share/compiz/decoration.xml 58share/compiz/decoration.xml
58share/compiz/fade.xml 59share/compiz/fade.xml
59share/compiz/freedesktop.png 60share/compiz/freedesktop.png
60share/compiz/fs.xml 61share/compiz/fs.xml
61share/compiz/gconf.xml 62share/compiz/gconf.xml
62share/compiz/glib.xml 63share/compiz/glib.xml
63share/compiz/gnomecompat.xml 64share/compiz/gnomecompat.xml
64share/compiz/icon.png 65share/compiz/icon.png
65share/compiz/ini.xml 66share/compiz/ini.xml
66share/compiz/inotify.xml 67share/compiz/inotify.xml
67${PLIST.kde}share/compiz/kcfg.xslt 68${PLIST.kde}share/compiz/kcfg.xslt
68share/compiz/kconfig.xml 69share/compiz/kconfig.xml
69${PLIST.kde}share/compiz/kconfig.xslt 70${PLIST.kde3}share/compiz/kconfig.xslt
70share/compiz/minimize.xml 71share/compiz/minimize.xml
71share/compiz/move.xml 72share/compiz/move.xml
72share/compiz/obs.xml 73share/compiz/obs.xml
73share/compiz/place.xml 74share/compiz/place.xml
74share/compiz/png.xml 75share/compiz/png.xml
75share/compiz/regex.xml 76share/compiz/regex.xml
76share/compiz/resize.xml 77share/compiz/resize.xml
77share/compiz/rotate.xml 78share/compiz/rotate.xml
78share/compiz/scale.xml 79share/compiz/scale.xml
79share/compiz/schemas.xslt 80share/compiz/schemas.xslt
80share/compiz/screenshot.xml 81share/compiz/screenshot.xml
81share/compiz/svg.xml 82share/compiz/svg.xml
82share/compiz/switcher.xml 83share/compiz/switcher.xml
@@ -125,27 +126,27 @@ ${PLIST.kde}share/kde/config.kcfg/compiz @@ -125,27 +126,27 @@ ${PLIST.kde}share/kde/config.kcfg/compiz
125${PLIST.kde}share/kde/config.kcfg/compiz-clone.kcfg 126${PLIST.kde}share/kde/config.kcfg/compiz-clone.kcfg
126${PLIST.kde}share/kde/config.kcfg/compiz-commands.kcfg 127${PLIST.kde}share/kde/config.kcfg/compiz-commands.kcfg
127${PLIST.kde}share/kde/config.kcfg/compiz-core.kcfg 128${PLIST.kde}share/kde/config.kcfg/compiz-core.kcfg
128${PLIST.kde}share/kde/config.kcfg/compiz-cube.kcfg 129${PLIST.kde}share/kde/config.kcfg/compiz-cube.kcfg
129${PLIST.kde}share/kde/config.kcfg/compiz-dbus.kcfg 130${PLIST.kde}share/kde/config.kcfg/compiz-dbus.kcfg
130${PLIST.kde}share/kde/config.kcfg/compiz-decoration.kcfg 131${PLIST.kde}share/kde/config.kcfg/compiz-decoration.kcfg
131${PLIST.kde}share/kde/config.kcfg/compiz-fade.kcfg 132${PLIST.kde}share/kde/config.kcfg/compiz-fade.kcfg
132${PLIST.kde}share/kde/config.kcfg/compiz-fs.kcfg 133${PLIST.kde}share/kde/config.kcfg/compiz-fs.kcfg
133${PLIST.kde}share/kde/config.kcfg/compiz-gconf.kcfg 134${PLIST.kde}share/kde/config.kcfg/compiz-gconf.kcfg
134${PLIST.kde}share/kde/config.kcfg/compiz-glib.kcfg 135${PLIST.kde}share/kde/config.kcfg/compiz-glib.kcfg
135${PLIST.kde}share/kde/config.kcfg/compiz-gnomecompat.kcfg 136${PLIST.kde}share/kde/config.kcfg/compiz-gnomecompat.kcfg
136${PLIST.kde}share/kde/config.kcfg/compiz-ini.kcfg 137${PLIST.kde}share/kde/config.kcfg/compiz-ini.kcfg
137${PLIST.kde}share/kde/config.kcfg/compiz-inotify.kcfg 138${PLIST.kde}share/kde/config.kcfg/compiz-inotify.kcfg
138${PLIST.kde}share/kde/config.kcfg/compiz-kconfig.kcfg 139${PLIST.kde3}share/kde/config.kcfg/compiz-kconfig.kcfg
139${PLIST.kde}share/kde/config.kcfg/compiz-minimize.kcfg 140${PLIST.kde}share/kde/config.kcfg/compiz-minimize.kcfg
140${PLIST.kde}share/kde/config.kcfg/compiz-move.kcfg 141${PLIST.kde}share/kde/config.kcfg/compiz-move.kcfg
141${PLIST.kde}share/kde/config.kcfg/compiz-obs.kcfg 142${PLIST.kde}share/kde/config.kcfg/compiz-obs.kcfg
142${PLIST.kde}share/kde/config.kcfg/compiz-place.kcfg 143${PLIST.kde}share/kde/config.kcfg/compiz-place.kcfg
143${PLIST.kde}share/kde/config.kcfg/compiz-png.kcfg 144${PLIST.kde}share/kde/config.kcfg/compiz-png.kcfg
144${PLIST.kde}share/kde/config.kcfg/compiz-regex.kcfg 145${PLIST.kde}share/kde/config.kcfg/compiz-regex.kcfg
145${PLIST.kde}share/kde/config.kcfg/compiz-resize.kcfg 146${PLIST.kde}share/kde/config.kcfg/compiz-resize.kcfg
146${PLIST.kde}share/kde/config.kcfg/compiz-rotate.kcfg 147${PLIST.kde}share/kde/config.kcfg/compiz-rotate.kcfg
147${PLIST.kde}share/kde/config.kcfg/compiz-scale.kcfg 148${PLIST.kde}share/kde/config.kcfg/compiz-scale.kcfg
148${PLIST.kde}share/kde/config.kcfg/compiz-screenshot.kcfg 149${PLIST.kde}share/kde/config.kcfg/compiz-screenshot.kcfg
149${PLIST.kde}share/kde/config.kcfg/compiz-svg.kcfg 150${PLIST.kde}share/kde/config.kcfg/compiz-svg.kcfg
150${PLIST.kde}share/kde/config.kcfg/compiz-switcher.kcfg 151${PLIST.kde}share/kde/config.kcfg/compiz-switcher.kcfg
151${PLIST.kde}share/kde/config.kcfg/compiz-video.kcfg 152${PLIST.kde}share/kde/config.kcfg/compiz-video.kcfg
cvs diff -r1.22 -r1.23 pkgsrc/wm/compiz/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/wm/compiz/buildlink3.mk 2013/06/06 12:53:55 1.22
+++ pkgsrc/wm/compiz/buildlink3.mk 2013/06/30 20:30:09 1.23
@@ -1,32 +1,52 @@ @@ -1,32 +1,52 @@
1# $NetBSD: buildlink3.mk,v 1.22 2013/06/06 12:53:55 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.23 2013/06/30 20:30:09 rodent Exp $
2 2
3BUILDLINK_TREE+= compiz 3BUILDLINK_TREE+= compiz
4 4
5.if !defined(COMPIZ_BUILDLINK3_MK) 5.if !defined(COMPIZ_BUILDLINK3_MK)
6COMPIZ_BUILDLINK3_MK:= 6COMPIZ_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.compiz+= compiz>=0.6.2 8BUILDLINK_API_DEPENDS.compiz+= compiz>=0.6.2
9BUILDLINK_ABI_DEPENDS.compiz+= compiz>=0.8.4nb36 9BUILDLINK_ABI_DEPENDS.compiz+= compiz>=0.8.4nb36
10BUILDLINK_PKGSRCDIR.compiz?= ../../wm/compiz 10BUILDLINK_PKGSRCDIR.compiz?= ../../wm/compiz
11 11
12.include "../../devel/libwnck/buildlink3.mk" 12pkgbase := compiz
 13.include "../../mk/pkg-build-options.mk"
 14
 15#.if !empty(PKG_BUILD_OPTIONS:Mfuse)
 16#.include "../../filesystems/fuse/buildlink3.mk"
 17#.endif
 18
 19.if !empty(PKG_BUILD_OPTIONS:Mgnome)
 20.include "../../x11/gnome-desktop/buildlink3.mk"
 21.include "../../x11/gnome-control-center/buildlink3.mk"
 22.include "../../graphics/librsvg/buildlink3.mk"
 23.endif
 24
 25.if !empty(PKG_BUILD_OPTIONS:Mkde3)
 26.include "../../x11/kdebase3/buildlink3.mk"
 27.endif
 28
 29# XXX NLS is supposed to be optional, but it doens't appear to be.
 30#.if !empty(PKG_BUILD_OPTIONS:Mnls)
 31#.include "../../devel/gettext-lib/buildlink3.mk"
 32#.endif
 33
 34.include "../../mk/pthread.buildlink3.mk"
 35.include "../../mk/dlopen.buildlink3.mk"
13.include "../../graphics/cairo/buildlink3.mk" 36.include "../../graphics/cairo/buildlink3.mk"
14.include "../../graphics/glu/buildlink3.mk" 37.include "../../graphics/glu/buildlink3.mk"
15.include "../../graphics/MesaLib/buildlink3.mk" 38.include "../../graphics/MesaLib/buildlink3.mk"
16.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
17.include "../../sysutils/dbus/buildlink3.mk" 40.include "../../sysutils/dbus/buildlink3.mk"
18.include "../../sysutils/dbus-glib/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"
19.include "../../textproc/libxslt/buildlink3.mk" 42.include "../../textproc/libxml2/buildlink3.mk"
20.include "../../x11/gtk2/buildlink3.mk" 
21.include "../../x11/libXcomposite/buildlink3.mk" 43.include "../../x11/libXcomposite/buildlink3.mk"
22.include "../../x11/libXfixes/buildlink3.mk" 44.include "../../x11/libXfixes/buildlink3.mk"
23.include "../../x11/libXdamage/buildlink3.mk" 45.include "../../x11/libXdamage/buildlink3.mk"
24.include "../../x11/libXrandr/buildlink3.mk" 
25.include "../../x11/libXinerama/buildlink3.mk" 46.include "../../x11/libXinerama/buildlink3.mk"
26.include "../../x11/libICE/buildlink3.mk" 
27.include "../../x11/libSM/buildlink3.mk" 
28.include "../../x11/libXrender/buildlink3.mk" 47.include "../../x11/libXrender/buildlink3.mk"
29.include "../../x11/startup-notification/buildlink3.mk" 48.include "../../x11/libXext/buildlink3.mk"
 49.include "../../x11/libX11/buildlink3.mk"
30.endif # COMPIZ_BUILDLINK3_MK 50.endif # COMPIZ_BUILDLINK3_MK
31 51
32BUILDLINK_TREE+= -compiz 52BUILDLINK_TREE+= -compiz
cvs diff -r1.10 -r1.11 pkgsrc/wm/compiz/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/compiz/distinfo 2010/06/11 23:28:00 1.10
+++ pkgsrc/wm/compiz/distinfo 2013/06/30 20:30:09 1.11
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.10 2010/06/11 23:28:00 wiz Exp $ 1$NetBSD: distinfo,v 1.11 2013/06/30 20:30:09 rodent Exp $
2 2
3SHA1 (compiz-0.8.4.tar.gz) = 244ac823818209e44944d74df42d8986ec31d9dd 3SHA1 (compiz-0.8.8.tar.gz) = 01d065db07f6fd6bcad51811ffba69221aff656e
4RMD160 (compiz-0.8.4.tar.gz) = 176bfa04b8ee3ee3c5b7e6f3c27c88d16c54ac63 4RMD160 (compiz-0.8.8.tar.gz) = 421d4f010d1e10d1562e86ea0112e9a8eca711e7
5Size (compiz-0.8.4.tar.gz) = 1755741 bytes 5Size (compiz-0.8.8.tar.gz) = 1758943 bytes
6SHA1 (patch-aa) = 0772722aea9828c1f05f48ebbdad02387ae9c41a 6SHA1 (patch-aa) = dff6929da74854df3b3a9f35b4d61267e89b10dd
7SHA1 (patch-ab) = ff3d5515111df0b5fbcdd9f9163a576ab76071ff 
File Added: pkgsrc/wm/compiz/options.mk
# $NetBSD: options.mk,v 1.1 2013/06/30 20:30:09 rodent Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.compiz
PKG_SUPPORTED_OPTIONS=	fuse gnome inotify kde3 kde4
PKG_SUGGESTED_OPTIONS+=	inotify
PLIST_VARS+=		gnome inotify kde kde3

.include "../../mk/bsd.options.mk"

# XXX configure needs fuse.pc, which isn't in NetBSD's base for some reason
.if !empty(PKG_OPTIONS:Mfuse)
.include "../../filesystems/fuse/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-fuse
.else
CONFIGURE_ARGS+=	--disable-fuse
.endif

.if !empty(PKG_OPTIONS:Mgnome)
CONFIGURE_ARGS+=	--enable-librsvg
PLIST.gnome=		yes
BUILDLINK_DEPMETHOD.gnome-desktop=	build
.include "../../x11/gnome-desktop/buildlink3.mk"
BUILDLINK_DEPMETHOD.gnome-control-center=	build
.include "../../x11/gnome-control-center/buildlink3.mk"
BUILDLINK_DEPMETHOD.metacity=	build
.include "../../wm/metacity/buildlink3.mk"
BUILDLINK_DEPMETHOD.librsvg=	build
.include "../../graphics/librsvg/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-gnome --disable-gnome-keybindings
.endif

.if !empty(PKG_OPTIONS:Minotify)
.include "../../devel/libinotify/buildlink3.mk"
PLIST.inotify=		yes
.else
CONFIGURE_ARGS+=	--disable-inotify
.endif

.if !empty(PKG_OPTIONS:Mkde3)
# XXX This option is broken on NetBSD 6.0.1/amd64 + pkgsrc-current
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
.include "../../sysutils/dbus-qt3/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-kconfig
PLIST.kde=		yes
PLIST.kde3=		yes
.else
CONFIGURE_ARGS+=	--disable-kde --disable-kconfig
.endif

.if !empty(PKG_OPTIONS:Mkde4)
# XXX This option is broken on NetBSD 6.0.1/amd64 + pkgsrc-current
.include "../../x11/kde-workspace4/buildlink3.mk"
# XXX Test to see which PLIST entries are KDE{3,4}-specific, besides kconfig.
PLIST.kde=		yes
#PLIST.kde4=		yes
.else
CONFIGURE_ARGS+=	--disable-kde4
.endif
cvs diff -r1.4 -r1.5 pkgsrc/wm/compiz/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/wm/compiz/patches/patch-aa 2009/11/26 19:46:35 1.4
+++ pkgsrc/wm/compiz/patches/patch-aa 2013/06/30 20:30:09 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.4 2009/11/26 19:46:35 imil Exp $ 1$NetBSD: patch-aa,v 1.5 2013/06/30 20:30:09 rodent Exp $
 2
 3Default to gtk-window-decorator.
2 4
3--- metadata/decoration.xml.in.orig 2009-11-26 10:26:46.000000000 +0000 5--- metadata/decoration.xml.in.orig 2009-11-26 10:26:46.000000000 +0000
4+++ metadata/decoration.xml.in 6+++ metadata/decoration.xml.in
5@@ -16,7 +16,7 @@ 7@@ -16,7 +16,7 @@
6 <option name="shadow_radius" type="float"> 8 <option name="shadow_radius" type="float">
7 <_short>Shadow Radius</_short> 9 <_short>Shadow Radius</_short>
8 <_long>Drop shadow radius</_long> 10 <_long>Drop shadow radius</_long>
9- <default>8.0</default> 11- <default>8.0</default>
10+ <default>9.0</default> 12+ <default>9.0</default>
11 <min>0.1</min> 13 <min>0.1</min>
12 <max>18.0</max> 14 <max>18.0</max>
13 <precision>0.1</precision> 15 <precision>0.1</precision>
14@@ -50,6 +50,7 @@ 16@@ -50,6 +50,7 @@
File Deleted: pkgsrc/wm/compiz/patches/Attic/patch-ab