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

Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: metadata.xml ChangeLog cairo-1.10.0.ebuild cairo-9999.ebuild
Date: Wed, 08 Sep 2010 19:58:44
Message-Id: 20100908195840.0BE2B20051@flycatcher.gentoo.org
1 scarabeus 10/09/08 19:58:40
2
3 Modified: metadata.xml ChangeLog cairo-1.10.0.ebuild
4 Added: cairo-9999.ebuild
5 Log:
6 Sync with x11 overlay. Move live ebuild here from overlay.
7
8 (Portage version: 2.2_rc75/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.15 x11-libs/cairo/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.15&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.15&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?r1=1.14&r2=1.15
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/metadata.xml,v
20 retrieving revision 1.14
21 retrieving revision 1.15
22 diff -u -r1.14 -r1.15
23 --- metadata.xml 8 Sep 2010 16:03:11 -0000 1.14
24 +++ metadata.xml 8 Sep 2010 19:58:39 -0000 1.15
25 @@ -1,7 +1,7 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 -<herd>no-herd</herd>
30 +<herd>x11</herd>
31 <maintainer>
32 <email>cardoe@g.o</email>
33 <name>Doug Goldstein</name>
34 @@ -18,8 +18,13 @@
35 <flag name='lcdfilter'>Add FreeType LCD filtering, ClearType-style behavior
36 for sub-pixel-hinting. Overrides cleartype USE flag. Patch taken from
37 Ubuntu</flag>
38 - <flag name='opengl'>When used along with USE=glitz, enables glitz-glx usage.
39 - Requires hardware OpenGL support</flag>
40 + <flag name='opengl' restrict="&gt;=x11-libs/cairo-1.10.0">
41 + Use Mesa backend for acceleration
42 + </flag>
43 + <flag name='opengl' restrict="&lt;=x11-libs/cairo-1.10.0">
44 + When used along with USE=glitz, enables glitz-glx usage.
45 + Requires hardware OpenGL support
46 + </flag>
47 <flag name='drm'>Use Linux DRM for backend acceleration</flag>
48 <flag name='gallium'>Use Mesa's Gallium backend for acceleration</flag>
49 <flag name='openvg'>Use OpenVG for backend acceleration</flag>
50
51
52
53 1.254 x11-libs/cairo/ChangeLog
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.254&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.254&content-type=text/plain
57 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.253&r2=1.254
58
59 Index: ChangeLog
60 ===================================================================
61 RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
62 retrieving revision 1.253
63 retrieving revision 1.254
64 diff -u -r1.253 -r1.254
65 --- ChangeLog 8 Sep 2010 16:03:11 -0000 1.253
66 +++ ChangeLog 8 Sep 2010 19:58:39 -0000 1.254
67 @@ -1,6 +1,12 @@
68 # ChangeLog for x11-libs/cairo
69 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
70 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.253 2010/09/08 16:03:11 cardoe Exp $
71 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.254 2010/09/08 19:58:39 scarabeus Exp $
72 +
73 +*cairo-9999 (08 Sep 2010)
74 +
75 + 08 Sep 2010; Tomáš Chvátal <scarabeus@g.o> cairo-1.10.0.ebuild,
76 + +cairo-9999.ebuild, metadata.xml:
77 + Sync with x11 overlay. Move live ebuild here from overlay.
78
79 *cairo-1.10.0 (08 Sep 2010)
80
81
82
83
84 1.2 x11-libs/cairo/cairo-1.10.0.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild?rev=1.2&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild?rev=1.2&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild?r1=1.1&r2=1.2
89
90 Index: cairo-1.10.0.ebuild
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild,v
93 retrieving revision 1.1
94 retrieving revision 1.2
95 diff -u -r1.1 -r1.2
96 --- cairo-1.10.0.ebuild 8 Sep 2010 16:03:11 -0000 1.1
97 +++ cairo-1.10.0.ebuild 8 Sep 2010 19:58:39 -0000 1.2
98 @@ -1,71 +1,88 @@
99 # Copyright 1999-2010 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild,v 1.1 2010/09/08 16:03:11 cardoe Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild,v 1.2 2010/09/08 19:58:39 scarabeus Exp $
103
104 -EAPI=2
105 +EAPI=3
106
107 -inherit eutils flag-o-matic autotools
108 +EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
109 +[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
110 +
111 +inherit eutils flag-o-matic autotools ${GIT_ECLASS}
112
113 DESCRIPTION="A vector graphics library with cross-device output support"
114 HOMEPAGE="http://cairographics.org/"
115 -SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
116 +[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
117
118 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
119 SLOT="0"
120 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
121 -IUSE="aqua debug directfb doc drm gallium opengl openvg qt +svg X xcb"
122 +IUSE="X aqua debug directfb doc drm gallium opengl openvg qt static-libs +svg xcb"
123
124 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
125 RESTRICT="test"
126
127 -RDEPEND=">=media-libs/fontconfig-2.2.95
128 - >=media-libs/freetype-2.1.9
129 +RDEPEND="media-libs/fontconfig
130 + media-libs/freetype:2
131 + media-libs/libpng:0
132 sys-libs/zlib
133 - >=media-libs/libpng-1.2.43-r2:0
134 >=x11-libs/pixman-0.18.4
135 - directfb? ( >=dev-libs/DirectFB-0.9.24 )
136 - gallium? ( media-libs/mesa[gallium] )
137 - qt? ( >=x11-libs/qt-gui-4.4:4 )
138 + directfb? ( dev-libs/DirectFB )
139 + opengl? ( virtual/opengl )
140 + qt? ( x11-libs/qt-gui )
141 svg? ( dev-libs/libxml2 )
142 - X? ( >=x11-libs/libXrender-0.6
143 + X? (
144 + >=x11-libs/libXrender-0.6
145 x11-libs/libXext
146 x11-libs/libX11
147 - x11-libs/libXft
148 - drm? ( >=sys-fs/udev-136
149 - >=x11-base/xorg-server-1.6 )
150 + x11-libs/libXft
151 + drm? (
152 + >=sys-fs/udev-136
153 + gallium? ( media-libs/mesa[gallium] )
154 )
155 - xcb? ( >=x11-libs/libxcb-1.4
156 - x11-libs/xcb-util )"
157 -# test? (
158 -# pdf test
159 -# x11-libs/pango
160 -# >=x11-libs/gtk+-2.0
161 -# >=app-text/poppler-bindings-0.9.2[gtk]
162 -# ps test
163 -# app-text/ghostscript-gpl
164 -# svg test
165 -# >=x11-libs/gtk+-2.0
166 -# >=gnome-base/librsvg-2.15.0
167 -
168 + xcb? (
169 + || (
170 + <=x11-libs/libX11-1.3.5[xcb]
171 + >x11-libs/libX11-1.3.5
172 + )
173 + )
174 + )
175 + xcb? (
176 + x11-libs/libxcb
177 + x11-libs/xcb-util
178 + )"
179 DEPEND="${RDEPEND}
180 - >=dev-util/pkgconfig-0.19
181 + dev-util/pkgconfig
182 >=sys-devel/libtool-2
183 - doc? ( >=dev-util/gtk-doc-1.6
184 - ~app-text/docbook-xml-dtd-4.2 )
185 - X? ( x11-proto/renderproto
186 - drm? ( x11-proto/xproto
187 - >=x11-proto/xextproto-7.1 )
188 - )"
189 + doc? (
190 + >=dev-util/gtk-doc-1.6
191 + ~app-text/docbook-xml-dtd-4.2
192 + )
193 + X? (
194 + x11-proto/renderproto
195 + drm? (
196 + x11-proto/xproto
197 + >=x11-proto/xextproto-7.1
198 + )
199 + )"
200
201 src_prepare() {
202 epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
203
204 + # Slightly messed build system YAY
205 + if [[ ${PV} == *9999* ]]; then
206 + touch boilerplate/Makefile.am.features
207 + touch src/Makefile.am.features
208 + touch ChangeLog
209 + fi
210 +
211 # We need to run elibtoolize to ensure correct so versioning on FreeBSD
212 # upgraded to an eautoreconf for the above interix patch.
213 eautoreconf
214 }
215
216 src_configure() {
217 + local myopts
218 +
219 [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
220 # http://bugs.freedesktop.org/show_bug.cgi?id=15463
221 [[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
222 @@ -73,40 +90,60 @@
223 #gets rid of fbmmx.c inlining warnings
224 append-flags -finline-limit=1200
225
226 + if use X; then
227 + myopts+="
228 + $(use_enable drm)
229 + $(use_enable xcb xcb-shm)
230 + "
231 +
232 + if use drm; then
233 + myopts+="
234 + $(use_enable gallium)
235 + $(use_enable xcb xcb-drm)
236 + "
237 + else
238 + use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
239 + myopts+="
240 + --disable-gallium
241 + --disable-xcb-drm
242 + "
243 + fi
244 + else
245 + use drm && ewarn "drm use requires X use enabled. So disabling for now."
246 + myopts+="
247 + --disable-drm
248 + --disable-xcb-lib
249 + "
250 + fi
251 +
252 econf \
253 + --disable-dependency-tracking \
254 + $(use_with X x) \
255 $(use_enable X xlib) \
256 $(use_enable X xlib-xrender) \
257 - $(use_enable xcb) \
258 - $(use_enable svg) \
259 - $(use_enable doc gtk-doc) \
260 - $(use_enable directfb) \
261 + $(use_enable aqua quartz) \
262 + $(use_enable aqua quartz-image) \
263 $(use_enable debug test-surfaces) \
264 - $(use_enable opengl gl) \
265 + $(use_enable directfb) \
266 + $(use_enable doc gtk-doc) \
267 $(use_enable openvg vg) \
268 - $(use_enable drm) \
269 - $(use_enable gallium) \
270 + $(use_enable opengl gl) \
271 + $(use_enable qt) \
272 + $(use_enable static-libs static) \
273 + $(use_enable svg) \
274 + $(use_enable xcb) \
275 + $(use_enable xcb xcb-shm) \
276 + --enable-ft \
277 --enable-pdf \
278 --enable-png \
279 - --enable-ft \
280 --enable-ps \
281 - $(use_enable aqua quartz) \
282 - $(use_enable aqua quartz-image) \
283 - $(use_enable aqua quartz-font) \
284 - || die "configure failed"
285 + ${myopts}
286 }
287
288 src_install() {
289 - make DESTDIR="${D}" install || die "Installation failed"
290 - dodoc AUTHORS ChangeLog NEWS README
291 -}
292 + # parallel make install fails
293 + emake -j1 DESTDIR="${D}" install || die "Installation failed"
294 + dodoc AUTHORS ChangeLog NEWS README || die
295
296 -pkg_postinst() {
297 - if use xcb; then
298 - ewarn "You have enabled the Cairo XCB backend which is used only by"
299 - ewarn "a select few apps. The Cairo XCB backend is presently"
300 - ewarn "un-maintained and needs a lot of work to get it caught up"
301 - ewarn "to the Xrender and Xlib backends, which are the backends used"
302 - ewarn "by most applications. See:"
303 - ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
304 - fi
305 + use static-libs || find "${D}" -type f -name '*.la' -exec rm -f '{}' \;
306 }
307
308
309
310 1.1 x11-libs/cairo/cairo-9999.ebuild
311
312 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.1&view=markup
313 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.1&content-type=text/plain
314
315 Index: cairo-9999.ebuild
316 ===================================================================
317 # Copyright 1999-2010 Gentoo Foundation
318 # Distributed under the terms of the GNU General Public License v2
319 # $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.1 2010/09/08 19:58:39 scarabeus Exp $
320
321 EAPI=3
322
323 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
324 [[ ${PV} == *9999 ]] && GIT_ECLASS="git"
325
326 inherit eutils flag-o-matic autotools ${GIT_ECLASS}
327
328 DESCRIPTION="A vector graphics library with cross-device output support"
329 HOMEPAGE="http://cairographics.org/"
330 [[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
331
332 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
333 SLOT="0"
334 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
335 IUSE="X aqua debug directfb doc drm gallium opengl openvg qt static-libs +svg xcb"
336
337 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
338 RESTRICT="test"
339
340 RDEPEND="media-libs/fontconfig
341 media-libs/freetype:2
342 media-libs/libpng:0
343 sys-libs/zlib
344 >=x11-libs/pixman-0.18.4
345 directfb? ( dev-libs/DirectFB )
346 opengl? ( virtual/opengl )
347 qt? ( x11-libs/qt-gui )
348 svg? ( dev-libs/libxml2 )
349 X? (
350 >=x11-libs/libXrender-0.6
351 x11-libs/libXext
352 x11-libs/libX11
353 x11-libs/libXft
354 drm? (
355 >=sys-fs/udev-136
356 gallium? ( media-libs/mesa[gallium] )
357 )
358 xcb? (
359 || (
360 <=x11-libs/libX11-1.3.5[xcb]
361 >x11-libs/libX11-1.3.5
362 )
363 )
364 )
365 xcb? (
366 x11-libs/libxcb
367 x11-libs/xcb-util
368 )"
369 DEPEND="${RDEPEND}
370 dev-util/pkgconfig
371 >=sys-devel/libtool-2
372 doc? (
373 >=dev-util/gtk-doc-1.6
374 ~app-text/docbook-xml-dtd-4.2
375 )
376 X? (
377 x11-proto/renderproto
378 drm? (
379 x11-proto/xproto
380 >=x11-proto/xextproto-7.1
381 )
382 )"
383
384 src_prepare() {
385 epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
386
387 # Slightly messed build system YAY
388 if [[ ${PV} == *9999* ]]; then
389 touch boilerplate/Makefile.am.features
390 touch src/Makefile.am.features
391 touch ChangeLog
392 fi
393
394 # We need to run elibtoolize to ensure correct so versioning on FreeBSD
395 # upgraded to an eautoreconf for the above interix patch.
396 eautoreconf
397 }
398
399 src_configure() {
400 local myopts
401
402 [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
403 # http://bugs.freedesktop.org/show_bug.cgi?id=15463
404 [[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
405
406 #gets rid of fbmmx.c inlining warnings
407 append-flags -finline-limit=1200
408
409 if use X; then
410 myopts+="
411 $(use_enable drm)
412 $(use_enable xcb xcb-shm)
413 "
414
415 if use drm; then
416 myopts+="
417 $(use_enable gallium)
418 $(use_enable xcb xcb-drm)
419 "
420 else
421 use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
422 myopts+="
423 --disable-gallium
424 --disable-xcb-drm
425 "
426 fi
427 else
428 use drm && ewarn "drm use requires X use enabled. So disabling for now."
429 myopts+="
430 --disable-drm
431 --disable-xcb-lib
432 "
433 fi
434
435 econf \
436 --disable-dependency-tracking \
437 $(use_with X x) \
438 $(use_enable X xlib) \
439 $(use_enable X xlib-xrender) \
440 $(use_enable aqua quartz) \
441 $(use_enable aqua quartz-image) \
442 $(use_enable debug test-surfaces) \
443 $(use_enable directfb) \
444 $(use_enable doc gtk-doc) \
445 $(use_enable openvg vg) \
446 $(use_enable opengl gl) \
447 $(use_enable qt) \
448 $(use_enable static-libs static) \
449 $(use_enable svg) \
450 $(use_enable xcb) \
451 $(use_enable xcb xcb-shm) \
452 --enable-ft \
453 --enable-pdf \
454 --enable-png \
455 --enable-ps \
456 ${myopts}
457 }
458
459 src_install() {
460 # parallel make install fails
461 emake -j1 DESTDIR="${D}" install || die "Installation failed"
462 dodoc AUTHORS ChangeLog NEWS README || die
463
464 use static-libs || find "${D}" -type f -name '*.la' -exec rm -f '{}' \;
465 }
Report Message
Find on MARC Find on Google Groups