Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: metadata.xml cairo-1.12.10-r2.ebuild ChangeLog cairo-1.12.2-r4.ebuild cairo-1.12.10-r1.ebuild cairo-1.12.6.ebuild cairo-1.12.2-r2.ebuild cairo-1.8.10.ebuild cairo-1.10.2-r2.ebuild cairo-1.12.2-r3.ebuild
Date: Thu, 31 Jan 2013 13:35:54
Message-Id: 20130131133551.521C52171D@flycatcher.gentoo.org
1 chithanh 13/01/31 13:35:51
2
3 Modified: metadata.xml ChangeLog
4 Added: cairo-1.12.10-r2.ebuild
5 Removed: cairo-1.12.2-r4.ebuild cairo-1.12.10-r1.ebuild
6 cairo-1.12.6.ebuild cairo-1.12.2-r2.ebuild
7 cairo-1.8.10.ebuild cairo-1.10.2-r2.ebuild
8 cairo-1.12.2-r3.ebuild
9 Log:
10 Add patch to fix graphics corruption, bug #454468.
11
12 (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
13
14 Revision Changes Path
15 1.22 x11-libs/cairo/metadata.xml
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.22&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.22&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?r1=1.21&r2=1.22
20
21 Index: metadata.xml
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/metadata.xml,v
24 retrieving revision 1.21
25 retrieving revision 1.22
26 diff -u -r1.21 -r1.22
27 --- metadata.xml 4 Nov 2012 09:54:57 -0000 1.21
28 +++ metadata.xml 31 Jan 2013 13:35:51 -0000 1.22
29 @@ -7,11 +7,6 @@
30 <name>Ben de Groot</name>
31 </maintainer>
32 <use>
33 - <flag name='cleartype'>Add ClearType-style behavior for sub-pixel hinting.
34 - Patch taken from Arch Linux</flag>
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' restrict="&gt;=x11-libs/cairo-1.10.0">
39 Use Mesa backend for acceleration</flag>
40 <flag name='drm'>Use Linux DRM for backend acceleration</flag>
41
42
43
44 1.325 x11-libs/cairo/ChangeLog
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.325&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.325&content-type=text/plain
48 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.324&r2=1.325
49
50 Index: ChangeLog
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
53 retrieving revision 1.324
54 retrieving revision 1.325
55 diff -u -r1.324 -r1.325
56 --- ChangeLog 27 Jan 2013 11:20:15 -0000 1.324
57 +++ ChangeLog 31 Jan 2013 13:35:51 -0000 1.325
58 @@ -1,6 +1,20 @@
59 # ChangeLog for x11-libs/cairo
60 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
61 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.324 2013/01/27 11:20:15 chithanh Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.325 2013/01/31 13:35:51 chithanh Exp $
63 +
64 +*cairo-1.12.10-r2 (31 Jan 2013)
65 +
66 + 31 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
67 + +cairo-1.12.10-r2.ebuild, +files/cairo-1.12.10-xshm-corruption.patch,
68 + -cairo-1.10.2-r2.ebuild, -cairo-1.12.10-r1.ebuild, -cairo-1.12.2-r2.ebuild,
69 + -cairo-1.12.2-r3.ebuild, -cairo-1.12.2-r4.ebuild, -cairo-1.12.6.ebuild,
70 + -cairo-1.8.10.ebuild, -files/cairo-1.12.2-fdr-nodl.patch,
71 + -files/cairo-1.12.2-sphinx-nodl.patch,
72 + -files/cairo-1.12.2-surfaceless-extension.patch,
73 + -files/cairo-1.2.4-lcd-cleartype-like.diff,
74 + -files/cairo-1.8.10-libpng14.patch, files/cairo-1.8.8-interix.patch,
75 + metadata.xml:
76 + Add patch to fix graphics corruption, bug #454468.
77
78 *cairo-1.12.10-r1 (27 Jan 2013)
79
80
81
82
83 1.1 x11-libs/cairo/cairo-1.12.10-r2.ebuild
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.10-r2.ebuild?rev=1.1&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.10-r2.ebuild?rev=1.1&content-type=text/plain
87
88 Index: cairo-1.12.10-r2.ebuild
89 ===================================================================
90 # Copyright 1999-2013 Gentoo Foundation
91 # Distributed under the terms of the GNU General Public License v2
92 # $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.10-r2.ebuild,v 1.1 2013/01/31 13:35:51 chithanh Exp $
93
94 EAPI=5
95
96 inherit eutils flag-o-matic autotools
97
98 if [[ ${PV} == *9999* ]]; then
99 inherit git-2
100 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
101 SRC_URI=""
102 KEYWORDS=""
103 else
104 SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
105 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
106 fi
107
108 DESCRIPTION="A vector graphics library with cross-device output support"
109 HOMEPAGE="http://cairographics.org/"
110 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
111 SLOT="0"
112 IUSE="X aqua debug directfb doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
113
114 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
115 RESTRICT="test"
116
117 RDEPEND="media-libs/fontconfig
118 media-libs/freetype:2
119 media-libs/libpng:0
120 sys-libs/zlib
121 >=x11-libs/pixman-0.22.0
122 directfb? ( dev-libs/DirectFB )
123 glib? ( >=dev-libs/glib-2.28.6:2 )
124 opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
125 openvg? ( media-libs/mesa[openvg] )
126 qt4? ( >=x11-libs/qt-gui-4.8:4 )
127 X? (
128 >=x11-libs/libXrender-0.6
129 x11-libs/libXext
130 x11-libs/libX11
131 drm? (
132 >=virtual/udev-136
133 gallium? ( media-libs/mesa[gallium] )
134 )
135 )
136 xcb? (
137 x11-libs/libxcb
138 x11-libs/xcb-util
139 )"
140 DEPEND="${RDEPEND}
141 virtual/pkgconfig
142 >=sys-devel/libtool-2
143 doc? (
144 >=dev-util/gtk-doc-1.6
145 ~app-text/docbook-xml-dtd-4.2
146 )
147 X? (
148 x11-proto/renderproto
149 drm? (
150 x11-proto/xproto
151 >=x11-proto/xextproto-7.1
152 )
153 )"
154
155 # drm module requires X
156 # for gallium we need to enable drm
157 REQUIRED_USE="
158 drm? ( X )
159 gallium? ( drm )
160 "
161
162 src_prepare() {
163 epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
164 use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
165 epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
166 epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
167 epatch "${FILESDIR}"/${P}-xlib-corruption.patch
168 epatch "${FILESDIR}"/${P}-xshm-corruption.patch
169 epatch_user
170
171 # Slightly messed build system YAY
172 if [[ ${PV} == *9999* ]]; then
173 touch boilerplate/Makefile.am.features
174 touch src/Makefile.am.features
175 touch ChangeLog
176 fi
177
178 # We need to run elibtoolize to ensure correct so versioning on FreeBSD
179 # upgraded to an eautoreconf for the above interix patch.
180 eautoreconf
181 }
182
183 src_configure() {
184 local myopts
185
186 # SuperH doesn't have native atomics yet
187 use sh && myopts+=" --disable-atomic"
188
189 [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
190 # http://bugs.freedesktop.org/show_bug.cgi?id=15463
191 [[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
192
193 #gets rid of fbmmx.c inlining warnings
194 append-flags -finline-limit=1200
195
196 use X && myopts+=" --enable-tee=yes"
197
198 use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
199
200 # --disable-xcb-lib:
201 # do not override good xlib backed by hardforcing rendering over xcb
202 econf \
203 --disable-dependency-tracking \
204 $(use_with X x) \
205 $(use_enable X xlib) \
206 $(use_enable X xlib-xrender) \
207 $(use_enable aqua quartz) \
208 $(use_enable aqua quartz-image) \
209 $(use_enable debug test-surfaces) \
210 $(use_enable directfb) \
211 $(use_enable glib gobject) \
212 $(use_enable doc gtk-doc) \
213 $(use_enable openvg vg) \
214 $(use_enable opengl gl) \
215 $(use_enable qt4 qt) \
216 $(use_enable static-libs static) \
217 $(use_enable svg) \
218 $(use_enable xcb) \
219 $(use_enable xcb xcb-shm) \
220 $(use_enable drm) \
221 $(use_enable gallium) \
222 --enable-ft \
223 --enable-pdf \
224 --enable-png \
225 --enable-ps \
226 --disable-xlib-xcb \
227 ${myopts}
228 }
229
230 src_install() {
231 # parallel make install fails
232 emake -j1 DESTDIR="${D}" install
233 find "${ED}" -name '*.la' -exec rm -f {} +
234 dodoc AUTHORS ChangeLog NEWS README
235 }