tetromino 14/05/02 21:51:12 Modified: metadata.xml ChangeLog cairo-9999.ebuild Added: cairo-1.12.16-r3.ebuild Log: Fix firefox crash (bug #507478, thanks to Jaak Ristioja and Patrice Levesque). Make lto optional (but enabled by default because cairo is a performance-critical library) and check for enough memory for it (bug #467278, thanks to Alex). Fix build with USE="opengl -X" (bug #483574, thanks to Sergey Popov). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path 1.29 x11-libs/cairo/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?r1=1.28&r2=1.29 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/metadata.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- metadata.xml 20 Apr 2014 18:00:01 -0000 1.28 +++ metadata.xml 2 May 2014 21:51:12 -0000 1.29 @@ -19,6 +19,9 @@ <flag name="gles2">Use OpenGL ES 2 backend for acceleration.</flag> <flag name="glib">Compile with GLib Object System support</flag> <flag name="legacy-drivers">Include the buggy gradients patch (for legacy drivers, such as nvidia-drivers older than 304.30)</flag> + <flag name="lto">Try to build with Link-Time Optimization if supported by + the compiler. This is recommended by upstream, but can cause build + failure in some environments and on machines with little memory.</flag> <flag name="openvg">Use OpenVG for backend acceleration</flag> <flag name="valgrind">Built-in support to mark memory regions</flag> <flag name="xlib-xcb">Use XCB renderer backend for acceleration over xlib</flag> 1.376 x11-libs/cairo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.376&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.376&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.375&r2=1.376 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v retrieving revision 1.375 retrieving revision 1.376 diff -u -r1.375 -r1.376 --- ChangeLog 2 May 2014 09:51:49 -0000 1.375 +++ ChangeLog 2 May 2014 21:51:12 -0000 1.376 @@ -1,6 +1,20 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.375 2014/05/02 09:51:49 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.376 2014/05/02 21:51:12 tetromino Exp $ + +*cairo-1.12.16-r3 (02 May 2014) + + 02 May 2014; Alexandre Rostovtsev <tetrom...@gentoo.org> + +cairo-1.12.16-r3.ebuild, cairo-9999.ebuild, + +files/cairo-1.12.16-all-clipped-1.patch, + +files/cairo-1.12.16-all-clipped-2.patch, + +files/cairo-1.12.16-all-clipped-3.patch, + +files/cairo-1.12.16-lto-optional.patch, metadata.xml: + Fix firefox crash (bug #507478, thanks to Jaak Ristioja and Patrice + Levesque). Make lto optional (but enabled by default because cairo is a + performance-critical library) and check for enough memory for it (bug + #467278, thanks to Alex). Fix build with USE="opengl -X" (bug #483574, thanks + to Sergey Popov). 02 May 2014; Thomas Sachau (Tommy[D]) <to...@gentoo.org> cairo-1.10.2-r3.ebuild, cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild, 1.42 x11-libs/cairo/cairo-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.41&r2=1.42 Index: cairo-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- cairo-9999.ebuild 2 May 2014 09:51:49 -0000 1.41 +++ cairo-9999.ebuild 2 May 2014 21:51:12 -0000 1.42 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.41 2014/05/02 09:51:49 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.42 2014/05/02 21:51:12 tetromino Exp $ EAPI=5 -inherit eutils flag-o-matic autotools multilib-minimal +inherit check-reqs eutils flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then inherit git-2 @@ -20,7 +20,7 @@ HOMEPAGE="http://cairographics.org/"; LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb" +IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -86,10 +86,37 @@ /usr/include/cairo/cairo-directfb.h ) +CHECKREQS_MEMORY="768M" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then + einfo "Checking for sufficient memory to build $PN with USE=lto" + check-reqs_pkg_pretend + fi +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then + check-reqs_pkg_setup + fi +} + src_prepare() { epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch + + # bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931 + epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch + + # allow the automagically injected -flto flag to be not injected + epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch + + # tests and perf tools require X, bug #483574 + if ! use X; then + sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die + fi + epatch_user # Slightly messed build system YAY @@ -139,6 +166,7 @@ $(use_enable gallium) \ $(use_enable gles2 glesv2) \ $(use_enable glib gobject) \ + $(use_enable lto) \ $(use_enable openvg vg) \ $(use_enable opengl gl) \ $(use_enable qt4 qt) \ 1.1 x11-libs/cairo/cairo-1.12.16-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild?rev=1.1&content-type=text/plain Index: cairo-1.12.16-r3.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.1 2014/05/02 21:51:12 tetromino Exp $ EAPI=5 inherit check-reqs eutils flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then inherit git-2 EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" SRC_URI="" KEYWORDS="" else SRC_URI="http://cairographics.org/releases/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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" fi DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="http://cairographics.org/"; LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers +lto opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it RESTRICT="test" RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] media-libs/freetype:2[${MULTILIB_USEDEP}] media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] >=x11-libs/pixman-0.28.0[${MULTILIB_USEDEP}] directfb? ( dev-libs/DirectFB ) gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] ) opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] ) qt4? ( >=dev-qt/qtgui-4.8:4 ) X? ( >=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] drm? ( >=virtual/udev-136[${MULTILIB_USEDEP}] gallium? ( media-libs/mesa[gallium,${MULTILIB_USEDEP}] ) ) ) xcb? ( x11-libs/libxcb[${MULTILIB_USEDEP}] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} virtual/pkgconfig >=sys-devel/libtool-2 X? ( x11-proto/renderproto[${MULTILIB_USEDEP}] drm? ( x11-proto/xproto[${MULTILIB_USEDEP}] >=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}] ) )" #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} # doc? ( # >=dev-util/gtk-doc-1.6 # ~app-text/docbook-xml-dtd-4.2 # )" # drm module requires X # for gallium we need to enable drm REQUIRED_USE=" drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2 opengl ) ) xlib-xcb? ( xcb ) " MULTILIB_WRAPPED_HEADERS=( /usr/include/cairo/cairo-features.h /usr/include/cairo/cairo-directfb.h ) CHECKREQS_MEMORY="768M" pkg_pretend() { if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then einfo "Checking for sufficient memory to build $PN with USE=lto" check-reqs_pkg_pretend fi } pkg_setup() { if [[ ${MERGE_TYPE} != "binary" ]] && use lto; then check-reqs_pkg_setup fi } src_prepare() { epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch # all-clipped handling from 1.13 epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-{1,2}.patch # bug #507478, https://bugs.freedesktop.org/show_bug.cgi?id=77931 epatch "${FILESDIR}"/${PN}-1.12.16-all-clipped-3.patch # allow the automagically injected -flto flag to be not injected epatch "${FILESDIR}"/${PN}-1.12.16-lto-optional.patch # tests and perf tools require X, bug #483574 if ! use X; then sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die fi epatch_user # Slightly messed build system YAY if [[ ${PV} == *9999* ]]; then touch boilerplate/Makefile.am.features touch src/Makefile.am.features touch ChangeLog fi # We need to run elibtoolize to ensure correct so versioning on FreeBSD # upgraded to an eautoreconf for the above interix patch. eautoreconf } multilib_src_configure() { local myopts [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" # TODO: remove this (and add USE-dep) when DirectFB is converted, # bug #484248 -- but beware of the circular dep. if ! multilib_is_native_abi; then myopts+=" --disable-directfb" fi # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010 if ! multilib_is_native_abi; then myopts+=" --disable-qt" fi # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" ECONF_SOURCE="${S}" \ econf \ --disable-dependency-tracking \ $(use_with X x) \ $(use_enable X tee) \ $(use_enable X xlib) \ $(use_enable X xlib-xrender) \ $(use_enable aqua quartz) \ $(use_enable aqua quartz-image) \ $(use_enable debug test-surfaces) \ $(use_enable drm) \ $(use_enable directfb) \ $(use_enable gallium) \ $(use_enable gles2 glesv2) \ $(use_enable glib gobject) \ $(use_enable lto) \ $(use_enable openvg vg) \ $(use_enable opengl gl) \ $(use_enable qt4 qt) \ $(use_enable static-libs static) \ $(use_enable svg) \ $(use_enable valgrind) \ $(use_enable xcb) \ $(use_enable xcb xcb-shm) \ $(use_enable xlib-xcb) \ --enable-ft \ --enable-pdf \ --enable-png \ --enable-ps \ ${myopts} } multilib_src_install() { # parallel make install fails emake -j1 DESTDIR="${D}" install } multilib_src_install_all() { prune_libtool_files --all einstalldocs } pkg_postinst() { if use !xlib-xcb; then if has_version net-misc/nxserver-freenx \ || has_version net-misc/x2goserver; then ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers." ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+" ewarn "applications that are running inside NX sessions. For details, see" ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"; fi fi }
