Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/compiz: ChangeLog compiz-0.8.6.ebuild compiz-0.8.4-r3.ebuild
Date: Sat, 03 Apr 2010 06:03:34
Message-Id: E1NxwS8-0000xL-40@stork.gentoo.org
1 jmbsvicetto 10/04/03 06:03:28
2
3 Modified: ChangeLog
4 Added: compiz-0.8.6.ebuild compiz-0.8.4-r3.ebuild
5 Log:
6 Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6 release and to avoid future dep issues.
7 Did a revbump to avoid issues with installed packages.
8 Added a patch to enable emerald to build with gtk+-2.20. Fixes bug 311743 - thanks to Guillaume ZITTA <gentoo@×××××.fr>.
9 (Portage version: 2.2_rc67/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.53 x11-wm/compiz/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?rev=1.53&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?rev=1.53&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?r1=1.52&r2=1.53
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v
21 retrieving revision 1.52
22 retrieving revision 1.53
23 diff -u -r1.52 -r1.53
24 --- ChangeLog 20 Feb 2010 19:05:22 -0000 1.52
25 +++ ChangeLog 3 Apr 2010 06:03:27 -0000 1.53
26 @@ -1,6 +1,18 @@
27 # ChangeLog for x11-wm/compiz
28 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.52 2010/02/20 19:05:22 hanno Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.53 2010/04/03 06:03:27 jmbsvicetto Exp $
31 +
32 +*compiz-0.8.6 (03 Apr 2010)
33 +*compiz-0.8.4-r3 (03 Apr 2010)
34 +
35 + 03 Apr 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
36 + +compiz-0.8.4-r3.ebuild, +files/compiz-0.8.4-gtk+-2.20-build.patch,
37 + +compiz-0.8.6.ebuild:
38 + Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6
39 + release and to avoid future dep issues.
40 + Did a revbump to avoid issues with installed packages.
41 + Added a patch to enable emerald to build with gtk+-2.20. Fixes bug 311743
42 + - thanks to Guillaume ZITTA <gentoo@×××××.fr>.
43
44 20 Feb 2010; Hanno Boeck <hanno@g.o> compiz-0.8.4-r2.ebuild,
45 +files/compiz-0.8.4-kde44.patch, +files/compiz-0.8.4-libpng14.patch:
46
47
48
49 1.1 x11-wm/compiz/compiz-0.8.6.ebuild
50
51 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.8.6.ebuild?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.8.6.ebuild?rev=1.1&content-type=text/plain
53
54 Index: compiz-0.8.6.ebuild
55 ===================================================================
56 # Copyright 1999-2010 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 # $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6.ebuild,v 1.1 2010/04/03 06:03:27 jmbsvicetto Exp $
59
60 EAPI="2"
61
62 inherit autotools eutils gnome2-utils
63
64 DESCRIPTION="3D composite and windowmanager"
65 HOMEPAGE="http://www.compiz.org/"
66 SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
67
68 LICENSE="GPL-2 LGPL-2.1 MIT"
69 SLOT="0"
70 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
71 IUSE="+cairo dbus fuse gnome gtk kde +svg"
72
73 DEPEND="
74 dev-libs/glib:2
75 dev-libs/libxml2
76 dev-libs/libxslt
77 media-libs/libpng
78 >=media-libs/mesa-6.5.1-r1
79 >=x11-base/xorg-server-1.1.1-r1
80 x11-libs/libX11[xcb]
81 x11-libs/libxcb
82 x11-libs/libXcomposite
83 x11-libs/libXdamage
84 x11-libs/libXinerama
85 x11-libs/libXrandr
86 x11-libs/libICE
87 x11-libs/libSM
88 >=x11-libs/libXrender-0.8.4
89 >=x11-libs/startup-notification-0.7
90 cairo? (
91 x11-libs/cairo[X]
92 )
93 dbus? ( >=sys-apps/dbus-1.0 )
94 fuse? ( sys-fs/fuse )
95 gnome? (
96 >=gnome-base/gnome-control-center-2.16.1:2
97 gnome-base/gnome-desktop
98 gnome-base/gconf:2
99 )
100 gtk? (
101 >=x11-libs/gtk+-2.8.0:2
102 >=x11-libs/libwnck-2.18.3
103 x11-libs/pango
104 )
105 kde? (
106 || (
107 >=kde-base/kwin-4.2.0
108 kde-base/kwin:live
109 )
110 )
111 svg? (
112 >=gnome-base/librsvg-2.14.0:2
113 >=x11-libs/cairo-1.0
114 )
115 "
116
117 RDEPEND="${DEPEND}
118 x11-apps/mesa-progs
119 x11-apps/xvinfo"
120
121 DEPEND="${DEPEND}
122 dev-util/pkgconfig
123 x11-proto/damageproto
124 x11-proto/xineramaproto"
125
126 src_prepare() {
127
128 echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
129 echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
130
131 if ! use gnome; then
132 epatch "${FILESDIR}"/${PN}-no-gconf.patch
133 fi
134 eautoreconf
135 }
136
137 src_configure() {
138 econf --disable-dependency-tracking \
139 --disable-gnome-keybindings \
140 --enable-librsvg \
141 --with-default-plugins \
142 $(use_enable cairo annotate) \
143 $(use_enable dbus) \
144 $(use_enable dbus dbus-glib) \
145 $(use_enable fuse) \
146 $(use_enable gnome) \
147 $(use_enable gnome gconf) \
148 $(use_enable gnome metacity) \
149 $(use_enable gtk) \
150 $(use_enable kde kde4) \
151 --disable-kde
152 }
153
154 src_install() {
155 emake DESTDIR="${D}" install || die "emake install failed"
156
157 # Install compiz-manager
158 dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
159
160 # Add the full-path to lspci
161 sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
162
163 # Fix the hardcoded lib paths
164 sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
165
166 # Create gentoo's config file
167 dodir /etc/xdg/compiz || die "dodir failed"
168
169 cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
170 COMPIZ_BIN_PATH="/usr/bin/"
171 PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
172 LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
173 LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
174 KWIN="$(type -p kwin)"
175 METACITY="$(type -p metacity)"
176 SKIP_CHECKS="yes"
177 EOF
178
179 dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
180
181 insinto "/usr/share/applications"
182 doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
183 }
184
185 pkg_preinst() {
186 use gnome && gnome2_gconf_savelist
187 }
188
189 pkg_postinst() {
190 use gnome && gnome2_gconf_install
191
192 ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
193 ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
194 }
195
196 pkg_prerm() {
197 use gnome && gnome2_gconf_uninstall
198 }
199
200
201
202 1.1 x11-wm/compiz/compiz-0.8.4-r3.ebuild
203
204 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.8.4-r3.ebuild?rev=1.1&view=markup
205 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.8.4-r3.ebuild?rev=1.1&content-type=text/plain
206
207 Index: compiz-0.8.4-r3.ebuild
208 ===================================================================
209 # Copyright 1999-2010 Gentoo Foundation
210 # Distributed under the terms of the GNU General Public License v2
211 # $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4-r3.ebuild,v 1.1 2010/04/03 06:03:27 jmbsvicetto Exp $
212
213 EAPI="2"
214
215 inherit autotools eutils gnome2-utils
216
217 DESCRIPTION="3D composite and windowmanager"
218 HOMEPAGE="http://www.compiz.org/"
219 SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
220
221 LICENSE="GPL-2 LGPL-2.1 MIT"
222 SLOT="0"
223 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
224 IUSE="+cairo dbus fuse gnome gtk kde +svg"
225
226 DEPEND="
227 dev-libs/glib:2
228 dev-libs/libxml2
229 dev-libs/libxslt
230 media-libs/libpng
231 >=media-libs/mesa-6.5.1-r1
232 >=x11-base/xorg-server-1.1.1-r1
233 x11-libs/libX11[xcb]
234 x11-libs/libxcb
235 x11-libs/libXcomposite
236 x11-libs/libXdamage
237 x11-libs/libXinerama
238 x11-libs/libXrandr
239 x11-libs/libICE
240 x11-libs/libSM
241 >=x11-libs/libXrender-0.8.4
242 >=x11-libs/startup-notification-0.7
243 cairo? (
244 x11-libs/cairo[X]
245 )
246 dbus? ( >=sys-apps/dbus-1.0 )
247 fuse? ( sys-fs/fuse )
248 gnome? (
249 >=gnome-base/gnome-control-center-2.16.1:2
250 gnome-base/gnome-desktop
251 gnome-base/gconf:2
252 )
253 gtk? (
254 >=x11-libs/gtk+-2.8.0:2
255 >=x11-libs/libwnck-2.18.3
256 x11-libs/pango
257 )
258 kde? (
259 || (
260 >=kde-base/kwin-4.2.0
261 kde-base/kwin:live
262 )
263 )
264 svg? (
265 >=gnome-base/librsvg-2.14.0:2
266 >=x11-libs/cairo-1.0
267 )
268 "
269
270 RDEPEND="${DEPEND}
271 x11-apps/mesa-progs
272 x11-apps/xvinfo"
273
274 DEPEND="${DEPEND}
275 dev-util/pkgconfig
276 x11-proto/damageproto
277 x11-proto/xineramaproto"
278
279 src_prepare() {
280
281 echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
282 echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
283
284 # Missing gconf flags, fix bug #282807
285 epatch "${FILESDIR}"/${PN}-0.8.2-gtk-gnome-missing-gconf-flags.patch
286
287 # 3 bugfixes, per bug #302308
288 epatch "${FILESDIR}"/${P}-crash-on-opening-windows.patch
289 epatch "${FILESDIR}"/${P}-place-plugin.patch
290 epatch "${FILESDIR}"/${P}-window-region-calculation.patch
291
292 epatch "${FILESDIR}/${P}-libpng14.patch"
293 epatch "${FILESDIR}/${P}-kde44.patch"
294
295 # Fixing GTK symbol - bug 311743.
296 epatch "${FILESDIR}/${P}-gtk+-2.20-build.patch"
297
298 if ! use gnome; then
299 epatch "${FILESDIR}"/${PN}-no-gconf.patch
300 fi
301 eautoreconf
302 }
303
304 src_configure() {
305 econf --disable-dependency-tracking \
306 --disable-gnome-keybindings \
307 --enable-librsvg \
308 --with-default-plugins \
309 $(use_enable cairo annotate) \
310 $(use_enable dbus) \
311 $(use_enable dbus dbus-glib) \
312 $(use_enable fuse) \
313 $(use_enable gnome) \
314 $(use_enable gnome gconf) \
315 $(use_enable gnome metacity) \
316 $(use_enable gtk) \
317 $(use_enable kde kde4) \
318 --disable-kde
319 }
320
321 src_install() {
322 emake DESTDIR="${D}" install || die "emake install failed"
323
324 # Install compiz-manager
325 dobin "${FILESDIR}/compiz-manager" || die "dobin failed"
326
327 # Add the full-path to lspci
328 sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed"
329
330 # Fix the hardcoded lib paths
331 sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed"
332
333 # Create gentoo's config file
334 dodir /etc/xdg/compiz || die "dodir failed"
335
336 cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager"
337 COMPIZ_BIN_PATH="/usr/bin/"
338 PLUGIN_PATH="/usr/$(get_libdir)/compiz/"
339 LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
340 LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2"
341 KWIN="$(type -p kwin)"
342 METACITY="$(type -p metacity)"
343 SKIP_CHECKS="yes"
344 EOF
345
346 dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
347
348 insinto "/usr/share/applications"
349 doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop"
350 }
351
352 pkg_preinst() {
353 use gnome && gnome2_gconf_savelist
354 }
355
356 pkg_postinst() {
357 use gnome && gnome2_gconf_install
358
359 ewarn "If you update to x11-wm/metacity-2.24 after you install ${P},"
360 ewarn "gtk-window-decorator will crash until you reinstall ${PN} again."
361 }
362
363 pkg_prerm() {
364 use gnome && gnome2_gconf_uninstall
365 }
Report Message
Find on MARC Find on Google Groups