* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: ChangeLog metadata.xml cairo-9999.ebuild cairo-1.12.16-r2.ebuild cairo-1.12.16-r1.ebuild
@ 2014-04-20 17:55 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2014-04-20 17:55 UTC (permalink / raw
To: gentoo-commits
tetromino 14/04/20 17:55:37
Modified: ChangeLog metadata.xml cairo-9999.ebuild
Added: cairo-1.12.16-r2.ebuild
Removed: cairo-1.12.16-r1.ebuild
Log:
After talking with yngwin, make x11 team primary maintainer, add myself as maintainer for multilib problems. Punt useless doc flag. Add 1.12.16-r2 for wrapped header.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path
1.371 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.371&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.371&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.370&r2=1.371
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- ChangeLog 20 Apr 2014 08:31:23 -0000 1.370
+++ ChangeLog 20 Apr 2014 17:55:37 -0000 1.371
@@ -1,6 +1,15 @@
# 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.370 2014/04/20 08:31:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.371 2014/04/20 17:55:37 tetromino Exp $
+
+*cairo-1.12.16-r2 (20 Apr 2014)
+
+ 20 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -cairo-1.12.16-r1.ebuild, +cairo-1.12.16-r2.ebuild, cairo-9999.ebuild,
+ metadata.xml:
+ After talking with yngwin, make x11 team primary maintainer, add myself as
+ maintainer for multilib problems. Punt useless doc flag. Add 1.12.16-r2 for
+ wrapped header.
20 Apr 2014; Agostino Sarubbo <ago@gentoo.org> cairo-1.12.16.ebuild:
Stable for amd64, wrt bug #500368
1.27 x11-libs/cairo/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/metadata.xml?r1=1.26&r2=1.27
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/metadata.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- metadata.xml 22 Jul 2013 06:06:47 -0000 1.26
+++ metadata.xml 20 Apr 2014 17:55:37 -0000 1.27
@@ -5,6 +5,12 @@
<maintainer>
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
+ <description>Secondary maintainer (x11 team is primary)</description>
+ </maintainer>
+ <maintainer>
+ <email>tetromino@gentoo.org</email>
+ <name>Alexandre Rostovtsev</name>
+ <description>Multilib issues</description>
</maintainer>
<use>
<flag name="opengl" restrict=">=x11-libs/cairo-1.10.0">
1.38 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.37&r2=1.38
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cairo-9999.ebuild 28 Feb 2014 20:42:55 -0000 1.37
+++ cairo-9999.ebuild 20 Apr 2014 17:55:37 -0000 1.38
@@ -1,6 +1,6 @@
# 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.37 2014/02/28 20:42:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.38 2014/04/20 17:55:37 tetromino Exp $
EAPI=5
@@ -20,7 +20,9 @@
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb doc 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 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"
@@ -30,13 +32,13 @@
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}]
+ >=x11-libs/pixman-0.30.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[${MULTILIB_USEDEP}] )
+ qt4? ( >=dev-qt/qtgui-4.8:4 )
X? (
>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
@@ -48,14 +50,14 @@
)
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
- doc? (
- >=dev-util/gtk-doc-1.6
- ~app-text/docbook-xml-dtd-4.2
- )
X? (
x11-proto/renderproto[${MULTILIB_USEDEP}]
drm? (
@@ -63,6 +65,11 @@
>=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
@@ -74,6 +81,11 @@
xlib-xcb? ( xcb )
"
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cairo/cairo-features.h
+ /usr/include/cairo/cairo-directfb.h
+)
+
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
use legacy-drivers && epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
@@ -105,6 +117,13 @@
myopts+=" --disable-directfb"
fi
+ # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+ if ! multilib_build_binaries; then
+ myopts+=" --disable-qt"
+ fi
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
ECONF_SOURCE="${S}" \
econf \
--disable-dependency-tracking \
@@ -120,7 +139,6 @@
$(use_enable gallium) \
$(use_enable gles2 glesv2) \
$(use_enable glib gobject) \
- $(use_enable doc gtk-doc) \
$(use_enable openvg vg) \
$(use_enable opengl gl) \
$(use_enable qt4 qt) \
1.1 x11-libs/cairo/cairo-1.12.16-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild?rev=1.1&content-type=text/plain
Index: cairo-1.12.16-r2.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-r2.ebuild,v 1.1 2014/04/20 17:55:37 tetromino Exp $
EAPI=5
inherit 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 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
)
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
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_build_binaries; then
myopts+=" --disable-directfb"
fi
# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
if ! multilib_build_binaries; 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 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-04-20 17:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-20 17:55 [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: ChangeLog metadata.xml cairo-9999.ebuild cairo-1.12.16-r2.ebuild cairo-1.12.16-r1.ebuild Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox