* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-1.12.12-r1.ebuild ChangeLog cairo-9999.ebuild
@ 2013-03-11 22:46 Remi Cardona (remi)
0 siblings, 0 replies; only message in thread
From: Remi Cardona (remi) @ 2013-03-11 22:46 UTC (permalink / raw
To: gentoo-commits
remi 13/03/11 22:46:15
Modified: ChangeLog cairo-9999.ebuild
Added: cairo-1.12.12-r1.ebuild
Log:
x11-libs/cairo: Disable automagic dependency on valgrind
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.329 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.329&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.329&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.328&r2=1.329
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- ChangeLog 2 Mar 2013 23:43:43 -0000 1.328
+++ ChangeLog 11 Mar 2013 22:46:15 -0000 1.329
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.328 2013/03/02 23:43:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.329 2013/03/11 22:46:15 remi Exp $
+
+*cairo-1.12.12-r1 (11 Mar 2013)
+
+ 11 Mar 2013; Rémi Cardona <remi@gentoo.org> +cairo-1.12.12-r1.ebuild,
+ cairo-9999.ebuild:
+ Disable automagic dependency on valgrind.
02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> cairo-1.10.2-r3.ebuild,
cairo-1.12.10-r2.ebuild, cairo-1.12.12.ebuild, cairo-1.12.8.ebuild,
1.29 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.28&r2=1.29
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cairo-9999.ebuild 2 Mar 2013 23:43:43 -0000 1.28
+++ cairo-9999.ebuild 11 Mar 2013 22:46:15 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.28 2013/03/02 23:43:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.29 2013/03/11 22:46:15 remi Exp $
EAPI=5
@@ -108,6 +108,8 @@
# --disable-xcb-lib:
# do not override good xlib backed by hardforcing rendering over xcb
+ # --disable-valgrind:
+ # valgrind code is busted as per upstream
econf \
--disable-dependency-tracking \
$(use_with X x) \
@@ -133,6 +135,7 @@
--enable-png \
--enable-ps \
--disable-xlib-xcb \
+ --disable-valgrind \
${myopts}
}
1.1 x11-libs/cairo/cairo-1.12.12-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.12-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.12-r1.ebuild?rev=1.1&content-type=text/plain
Index: cairo-1.12.12-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.12-r1.ebuild,v 1.1 2013/03/11 22:46:15 remi Exp $
EAPI=5
inherit eutils flag-o-matic autotools
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 doc drm gallium +glib legacy-drivers opengl openvg qt4 static-libs +svg xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
RESTRICT="test"
RDEPEND="media-libs/fontconfig
media-libs/freetype:2
media-libs/libpng:0
sys-libs/zlib
>=x11-libs/pixman-0.28.0
directfb? ( dev-libs/DirectFB )
glib? ( >=dev-libs/glib-2.28.6:2 )
opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
openvg? ( media-libs/mesa[openvg] )
qt4? ( >=dev-qt/qtgui-4.8:4 )
X? (
>=x11-libs/libXrender-0.6
x11-libs/libXext
x11-libs/libX11
drm? (
>=virtual/udev-136
gallium? ( media-libs/mesa[gallium] )
)
)
xcb? (
x11-libs/libxcb
x11-libs/xcb-util
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/libtool-2
doc? (
>=dev-util/gtk-doc-1.6
~app-text/docbook-xml-dtd-4.2
)
X? (
x11-proto/renderproto
drm? (
x11-proto/xproto
>=x11-proto/xextproto-7.1
)
)"
# drm module requires X
# for gallium we need to enable drm
REQUIRED_USE="
drm? ( X )
gallium? ( drm )
"
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}-1.10.2-qt-surface.patch
epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
epatch "${FILESDIR}"/${P}-disable-test-suite.patch
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
}
src_configure() {
local myopts
# SuperH doesn't have native atomics yet
use sh && myopts+=" --disable-atomic"
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
# http://bugs.freedesktop.org/show_bug.cgi?id=15463
[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
#gets rid of fbmmx.c inlining warnings
append-flags -finline-limit=1200
use X && myopts+=" --enable-tee=yes"
use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
# --disable-xcb-lib:
# do not override good xlib backed by hardforcing rendering over xcb
# --disable-valgrind:
# valgrind code is busted as per upstream
econf \
--disable-dependency-tracking \
$(use_with X x) \
$(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 directfb) \
$(use_enable glib gobject) \
$(use_enable doc gtk-doc) \
$(use_enable openvg vg) \
$(use_enable opengl gl) \
$(use_enable qt4 qt) \
$(use_enable static-libs static) \
$(use_enable svg) \
$(use_enable xcb) \
$(use_enable xcb xcb-shm) \
$(use_enable drm) \
$(use_enable gallium) \
--enable-ft \
--enable-pdf \
--enable-png \
--enable-ps \
--disable-xlib-xcb \
--disable-valgrind \
${myopts}
}
src_install() {
# parallel make install fails
emake -j1 DESTDIR="${D}" install
find "${ED}" -name '*.la' -exec rm -f {} +
dodoc AUTHORS ChangeLog NEWS README
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-11 22:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-11 22:46 [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-1.12.12-r1.ebuild ChangeLog cairo-9999.ebuild Remi Cardona (remi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox