1 |
mgorny 14/11/29 23:37:46 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cairo-1.12.16-r4.ebuild |
5 |
Log: |
6 |
Stop wrapping cairo-features.h. Now that we pass consistent configure options, it should be the same on all ABIs. Fixes compatibility with dev-haskell/cairo hackery, bug #531120. |
7 |
|
8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.386 x11-libs/cairo/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.386&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.386&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.385&r2=1.386 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v |
20 |
retrieving revision 1.385 |
21 |
retrieving revision 1.386 |
22 |
diff -u -r1.385 -r1.386 |
23 |
--- ChangeLog 20 Nov 2014 09:29:25 -0000 1.385 |
24 |
+++ ChangeLog 29 Nov 2014 23:37:46 -0000 1.386 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for x11-libs/cairo |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.385 2014/11/20 09:29:25 mgorny Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.386 2014/11/29 23:37:46 mgorny Exp $ |
30 |
+ |
31 |
+*cairo-1.12.16-r4 (29 Nov 2014) |
32 |
+ |
33 |
+ 29 Nov 2014; Michał Górny <mgorny@g.o> +cairo-1.12.16-r4.ebuild: |
34 |
+ Stop wrapping cairo-features.h. Now that we pass consistent configure options, |
35 |
+ it should be the same on all ABIs. Fixes compatibility with dev-haskell/cairo |
36 |
+ hackery, bug #531120. |
37 |
|
38 |
20 Nov 2014; Michał Górny <mgorny@g.o> cairo-1.12.16-r3.ebuild, |
39 |
cairo-9999.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 x11-libs/cairo/cairo-1.12.16-r4.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: cairo-1.12.16-r4.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r4.ebuild,v 1.1 2014/11/29 23:37:46 mgorny Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
|
56 |
inherit check-reqs eutils flag-o-matic autotools multilib-minimal |
57 |
|
58 |
if [[ ${PV} == *9999* ]]; then |
59 |
inherit git-2 |
60 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" |
61 |
SRC_URI="" |
62 |
else |
63 |
SRC_URI="http://cairographics.org/releases/${P}.tar.xz" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
65 |
fi |
66 |
|
67 |
DESCRIPTION="A vector graphics library with cross-device output support" |
68 |
HOMEPAGE="http://cairographics.org/" |
69 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
70 |
SLOT="0" |
71 |
IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb" |
72 |
# gtk-doc regeneration doesn't seem to work with out-of-source builds |
73 |
#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate |
74 |
|
75 |
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it |
76 |
RESTRICT="test" |
77 |
|
78 |
RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] |
79 |
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
80 |
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] |
81 |
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] |
82 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
83 |
>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] |
84 |
directfb? ( dev-libs/DirectFB ) |
85 |
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) |
86 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
87 |
opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) |
88 |
openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] ) |
89 |
qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] ) |
90 |
X? ( |
91 |
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
92 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
93 |
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
94 |
drm? ( |
95 |
>=virtual/libudev-208:=[${MULTILIB_USEDEP}] |
96 |
gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] ) |
97 |
) |
98 |
) |
99 |
xcb? ( |
100 |
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
101 |
) |
102 |
abi_x86_32? ( |
103 |
!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 |
104 |
!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] |
105 |
)" |
106 |
DEPEND="${RDEPEND} |
107 |
virtual/pkgconfig |
108 |
>=sys-devel/libtool-2 |
109 |
X? ( |
110 |
>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}] |
111 |
drm? ( |
112 |
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] |
113 |
>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] |
114 |
) |
115 |
)" |
116 |
#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} |
117 |
# doc? ( |
118 |
# >=dev-util/gtk-doc-1.6 |
119 |
# ~app-text/docbook-xml-dtd-4.2 |
120 |
# )" |
121 |
|
122 |
# drm module requires X |
123 |
# for gallium we need to enable drm |
124 |
REQUIRED_USE=" |
125 |
drm? ( X ) |
126 |
gallium? ( drm ) |
127 |
gles2? ( !opengl ) |
128 |
openvg? ( || ( gles2 opengl ) ) |
129 |
xlib-xcb? ( xcb ) |
130 |
" |
131 |
|
132 |
MULTILIB_WRAPPED_HEADERS=( |
133 |
/usr/include/cairo/cairo-directfb.h |
134 |
) |
135 |
|
136 |
CHECKREQS_MEMORY="768M" |
137 |
|
138 |
pkg_pretend() { |
139 |
if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then |
140 |
einfo "Checking for sufficient memory to build $PN with USE=lto" |
141 |
check-reqs_pkg_pretend |
142 |
fi |
143 |
} |
144 |
|
145 |
pkg_setup() { |
146 |
if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then |
147 |
check-reqs_pkg_setup |
148 |
fi |
149 |
} |
150 |
|
151 |
src_prepare() { |
152 |
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch |
153 |
use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch |
154 |
epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch |
155 |
|
156 |
# all-clipped handling from 1.13 |
157 |
epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-{1,2}.patch |
158 |
# bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931 |
159 |
epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch |
160 |
|
161 |
# allow the automagically injected -flto flag to be not injected |
162 |
epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch |
163 |
|
164 |
# tests and perf tools require X, bug #483574 |
165 |
if ! use X; then |
166 |
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die |
167 |
fi |
168 |
|
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 |
multilib_src_configure() { |
184 |
local myopts |
185 |
|
186 |
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT |
187 |
|
188 |
use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" |
189 |
|
190 |
# TODO: remove this (and add USE-dep) when DirectFB is converted, |
191 |
# bug #484248 -- but beware of the circular dep. |
192 |
if ! multilib_is_native_abi; then |
193 |
myopts+=" --disable-directfb" |
194 |
fi |
195 |
|
196 |
# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010 |
197 |
if ! multilib_is_native_abi; then |
198 |
myopts+=" --disable-qt" |
199 |
fi |
200 |
|
201 |
# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" |
202 |
|
203 |
ECONF_SOURCE="${S}" \ |
204 |
econf \ |
205 |
--disable-dependency-tracking \ |
206 |
$(use_with X x) \ |
207 |
$(use_enable X tee) \ |
208 |
$(use_enable X xlib) \ |
209 |
$(use_enable X xlib-xrender) \ |
210 |
$(use_enable aqua quartz) \ |
211 |
$(use_enable aqua quartz-image) \ |
212 |
$(use_enable debug test-surfaces) \ |
213 |
$(use_enable drm) \ |
214 |
$(use_enable directfb) \ |
215 |
$(use_enable gallium) \ |
216 |
$(use_enable gles2 glesv2) \ |
217 |
$(use_enable glib gobject) \ |
218 |
$(use_enable lto) \ |
219 |
$(use_enable openvg vg) \ |
220 |
$(use_enable opengl gl) \ |
221 |
$(use_enable qt4 qt) \ |
222 |
$(use_enable static-libs static) \ |
223 |
$(use_enable svg) \ |
224 |
$(use_enable valgrind) \ |
225 |
$(use_enable xcb) \ |
226 |
$(use_enable xcb xcb-shm) \ |
227 |
$(use_enable xlib-xcb) \ |
228 |
--enable-ft \ |
229 |
--enable-pdf \ |
230 |
--enable-png \ |
231 |
--enable-ps \ |
232 |
${myopts} |
233 |
} |
234 |
|
235 |
multilib_src_install() { |
236 |
# parallel make install fails |
237 |
emake -j1 DESTDIR="${D}" install |
238 |
} |
239 |
|
240 |
multilib_src_install_all() { |
241 |
prune_libtool_files --all |
242 |
einstalldocs |
243 |
} |
244 |
|
245 |
pkg_postinst() { |
246 |
if use !xlib-xcb; then |
247 |
if has_version net-misc/nxserver-freenx \ |
248 |
|| has_version net-misc/x2goserver; then |
249 |
ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers." |
250 |
ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+" |
251 |
ewarn "applications that are running inside NX sessions. For details, see" |
252 |
ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173" |
253 |
fi |
254 |
fi |
255 |
} |