* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2013-07-22 1:21 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; 7+ messages in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2013-07-22 1:21 UTC (permalink / raw
To: gentoo-commits
chithanh 13/07/22 01:21:15
Modified: cairo-9999.ebuild ChangeLog
Log:
Sync live and non-live ebuilds.
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.33 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.32&r2=1.33
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cairo-9999.ebuild 26 Jun 2013 16:52:41 -0000 1.32
+++ cairo-9999.ebuild 22 Jul 2013 01:21:15 -0000 1.33
@@ -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.32 2013/06/26 16:52:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.33 2013/07/22 01:21:15 chithanh Exp $
EAPI=5
@@ -20,7 +20,7 @@
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
+IUSE="X aqua debug directfb doc drm gallium gles2 +glib legacy-drivers opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
RESTRICT="test"
@@ -29,8 +29,9 @@
media-libs/freetype:2
media-libs/libpng:0=
sys-libs/zlib
- >=x11-libs/pixman-0.22.0
+ >=x11-libs/pixman-0.28.0
directfb? ( dev-libs/DirectFB )
+ gles2? ( media-libs/mesa[gles2] )
glib? ( >=dev-libs/glib-2.28.6:2 )
opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
openvg? ( media-libs/mesa[openvg] )
@@ -68,10 +69,17 @@
REQUIRED_USE="
drm? ( X )
gallium? ( drm )
+ gles2? ( !opengl )
+ openvg ( || ( gles2 opengl ) )
+ xlib-xcb? ( xcb )
"
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 "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
+ epatch "${FILESDIR}"/${PN}-1.12.14-libpng16.patch
epatch_user
# Slightly messed build system YAY
@@ -89,31 +97,23 @@
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-valgrind:
- # valgrind code is busted as per upstream
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 doc gtk-doc) \
$(use_enable openvg vg) \
@@ -121,15 +121,14 @@
$(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 drm) \
- $(use_enable gallium) \
+ $(use_enable xlib-xcb) \
--enable-ft \
--enable-pdf \
--enable-png \
--enable-ps \
- --disable-valgrind \
${myopts}
}
1.343 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.343&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.343&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.342&r2=1.343
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- ChangeLog 22 Jul 2013 01:19:31 -0000 1.342
+++ ChangeLog 22 Jul 2013 01:21:15 -0000 1.343
@@ -1,6 +1,10 @@
# 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.342 2013/07/22 01:19:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.343 2013/07/22 01:21:15 chithanh Exp $
+
+ 22 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ cairo-9999.ebuild:
+ Sync live and non-live ebuilds.
*cairo-1.12.14-r4 (22 Jul 2013)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2013-08-03 0:21 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; 7+ messages in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2013-08-03 0:21 UTC (permalink / raw
To: gentoo-commits
chithanh 13/08/03 00:21:07
Modified: cairo-9999.ebuild ChangeLog
Log:
Drop failing patches, bug #478248.
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.35 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.34&r2=1.35
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cairo-9999.ebuild 22 Jul 2013 06:06:47 -0000 1.34
+++ cairo-9999.ebuild 3 Aug 2013 00:21:07 -0000 1.35
@@ -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.34 2013/07/22 06:06:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.35 2013/08/03 00:21:07 chithanh Exp $
EAPI=5
@@ -78,8 +78,6 @@
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 "${FILESDIR}"/${PN}-1.12.12-disable-test-suite.patch
- epatch "${FILESDIR}"/${PN}-1.12.14-libpng16.patch
epatch_user
# Slightly messed build system YAY
1.345 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.345&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.345&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.344&r2=1.345
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- ChangeLog 22 Jul 2013 06:06:47 -0000 1.344
+++ ChangeLog 3 Aug 2013 00:21:07 -0000 1.345
@@ -1,6 +1,10 @@
# 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.344 2013/07/22 06:06:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.345 2013/08/03 00:21:07 chithanh Exp $
+
+ 03 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ cairo-9999.ebuild:
+ Drop failing patches, bug #478248.
22 Jul 2013; Justin Lecher <jlec@gentoo.org> cairo-1.12.14-r4.ebuild,
cairo-9999.ebuild, metadata.xml:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2014-05-08 2:31 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; 7+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2014-05-08 2:31 UTC (permalink / raw
To: gentoo-commits
tetromino 14/05/08 02:31:31
Modified: cairo-9999.ebuild ChangeLog
Log:
Patch applied upstream, thanks to Yannick Schaeffer (bug #509770).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path
1.44 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.43&r2=1.44
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cairo-9999.ebuild 4 May 2014 17:51:45 -0000 1.43
+++ cairo-9999.ebuild 8 May 2014 02:31:30 -0000 1.44
@@ -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.43 2014/05/04 17:51:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.44 2014/05/08 02:31:30 tetromino Exp $
EAPI=5
@@ -106,9 +106,6 @@
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
1.378 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.378&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.378&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.377&r2=1.378
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -r1.377 -r1.378
--- ChangeLog 4 May 2014 17:51:45 -0000 1.377
+++ ChangeLog 8 May 2014 02:31:31 -0000 1.378
@@ -1,6 +1,10 @@
# 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.377 2014/05/04 17:51:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.378 2014/05/08 02:31:31 tetromino Exp $
+
+ 08 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org> cairo-9999.ebuild,
+ files/cairo-1.12.16-all-clipped-3.patch:
+ Patch applied upstream, thanks to Yannick Schaeffer (bug #509770).
04 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
cairo-1.12.16-r3.ebuild, cairo-9999.ebuild:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2014-08-19 21:01 Matt Turner (mattst88)
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner (mattst88) @ 2014-08-19 21:01 UTC (permalink / raw
To: gentoo-commits
mattst88 14/08/19 21:01:35
Modified: cairo-9999.ebuild ChangeLog
Log:
Drop LTO, bugs 517258 and 517884.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Revision Changes Path
1.49 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.48&r2=1.49
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cairo-9999.ebuild 26 Jul 2014 08:57:55 -0000 1.48
+++ cairo-9999.ebuild 19 Aug 2014 21:01:35 -0000 1.49
@@ -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.48 2014/07/26 08:57:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.49 2014/08/19 21:01:35 mattst88 Exp $
EAPI=5
-inherit check-reqs eutils flag-o-matic autotools multilib-minimal
+inherit eutils flag-o-matic autotools multilib-minimal
if [[ ${PV} == *9999* ]]; then
inherit git-2
@@ -19,7 +19,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 lto 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
@@ -85,29 +85,11 @@
/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
- # 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
@@ -162,7 +144,6 @@
$(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.384 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.384&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.384&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.383&r2=1.384
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- ChangeLog 26 Jul 2014 08:57:55 -0000 1.383
+++ ChangeLog 19 Aug 2014 21:01:35 -0000 1.384
@@ -1,6 +1,9 @@
# 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.383 2014/07/26 08:57:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.384 2014/08/19 21:01:35 mattst88 Exp $
+
+ 19 Aug 2014; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+ Drop LTO, bugs 517258 and 517884.
26 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> cairo-1.10.2-r3.ebuild,
cairo-1.12.14-r4.ebuild, cairo-1.12.16-r2.ebuild, cairo-1.12.16-r3.ebuild,
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2014-12-08 19:19 Matt Turner (mattst88)
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner (mattst88) @ 2014-12-08 19:19 UTC (permalink / raw
To: gentoo-commits
mattst88 14/12/08 19:19:48
Modified: cairo-9999.ebuild ChangeLog
Log:
Reenable parallel make, and drop legacy-drivers USE.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Revision Changes Path
1.51 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.50&r2=1.51
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cairo-9999.ebuild 20 Nov 2014 09:29:25 -0000 1.50
+++ cairo-9999.ebuild 8 Dec 2014 19:19:48 -0000 1.51
@@ -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.50 2014/11/20 09:29:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.51 2014/12/08 19:19:48 mattst88 Exp $
EAPI=5
@@ -19,7 +19,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 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
@@ -87,7 +87,6 @@
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
# tests and perf tools require X, bug #483574
@@ -160,11 +159,6 @@
${myopts}
}
-multilib_src_install() {
- # parallel make install fails
- emake -j1 DESTDIR="${D}" install
-}
-
multilib_src_install_all() {
prune_libtool_files --all
einstalldocs
1.387 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.387&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.387&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.386&r2=1.387
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- ChangeLog 29 Nov 2014 23:37:46 -0000 1.386
+++ ChangeLog 8 Dec 2014 19:19:48 -0000 1.387
@@ -1,6 +1,9 @@
# 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.386 2014/11/29 23:37:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.387 2014/12/08 19:19:48 mattst88 Exp $
+
+ 08 Dec 2014; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+ Reenable parallel make, and drop legacy-drivers USE.
*cairo-1.12.16-r4 (29 Nov 2014)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2015-02-22 19:02 Matt Turner (mattst88)
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner (mattst88) @ 2015-02-22 19:02 UTC (permalink / raw
To: gentoo-commits
mattst88 15/02/22 19:02:54
Modified: cairo-9999.ebuild ChangeLog
Log:
Drop openvg, drm, and gallium USE flags, bug 504230.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Revision Changes Path
1.57 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.56&r2=1.57
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cairo-9999.ebuild 21 Feb 2015 18:58:50 -0000 1.56
+++ cairo-9999.ebuild 22 Feb 2015 19:02:54 -0000 1.57
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.56 2015/02/21 18:58:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.57 2015/02/22 19:02:54 mattst88 Exp $
EAPI=5
@@ -19,7 +19,7 @@
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb gles2 +glib opengl 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
@@ -36,16 +36,11 @@
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
- openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- drm? (
- >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
- gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
- )
)
xcb? (
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
@@ -59,10 +54,6 @@
>=sys-devel/libtool-2
X? (
>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
- drm? (
- >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
- )
)"
#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
# doc? (
@@ -70,13 +61,8 @@
# ~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 )
"
@@ -135,12 +121,9 @@
$(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) \
@@ -153,6 +136,9 @@
--enable-pdf \
--enable-png \
--enable-ps \
+ --disable-drm \
+ --disable-gallium \
+ --disable-vg \
${myopts}
}
1.401 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.401&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.401&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.400&r2=1.401
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- ChangeLog 21 Feb 2015 18:58:50 -0000 1.400
+++ ChangeLog 22 Feb 2015 19:02:54 -0000 1.401
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.400 2015/02/21 18:58:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.401 2015/02/22 19:02:54 mattst88 Exp $
+
+ 22 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+ Drop openvg, drm, and gallium USE flags, bug 504230.
21 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> cairo-9999.ebuild:
Also don't wrap cairo-features.h in live ebuild
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog
@ 2015-02-23 5:44 Matt Turner (mattst88)
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner (mattst88) @ 2015-02-23 5:44 UTC (permalink / raw
To: gentoo-commits
mattst88 15/02/23 05:44:06
Modified: cairo-9999.ebuild ChangeLog
Log:
Drop the qt4 USE flag, like the previous commit.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
Revision Changes Path
1.58 x11-libs/cairo/cairo-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild?r1=1.57&r2=1.58
Index: cairo-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- cairo-9999.ebuild 22 Feb 2015 19:02:54 -0000 1.57
+++ cairo-9999.ebuild 23 Feb 2015 05:44:06 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.57 2015/02/22 19:02:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.58 2015/02/23 05:44:06 mattst88 Exp $
EAPI=5
@@ -19,7 +19,7 @@
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb gles2 +glib opengl qt4 static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb gles2 +glib opengl 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
@@ -36,7 +36,6 @@
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
- qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -125,7 +124,6 @@
$(use_enable gles2 glesv2) \
$(use_enable glib gobject) \
$(use_enable opengl gl) \
- $(use_enable qt4 qt) \
$(use_enable static-libs static) \
$(use_enable svg) \
$(use_enable valgrind) \
@@ -138,6 +136,7 @@
--enable-ps \
--disable-drm \
--disable-gallium \
+ --disable-qt4 \
--disable-vg \
${myopts}
}
1.402 x11-libs/cairo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.402&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?rev=1.402&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/cairo/ChangeLog?r1=1.401&r2=1.402
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- ChangeLog 22 Feb 2015 19:02:54 -0000 1.401
+++ ChangeLog 23 Feb 2015 05:44:06 -0000 1.402
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.401 2015/02/22 19:02:54 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.402 2015/02/23 05:44:06 mattst88 Exp $
+
+ 23 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
+ Drop the qt4 USE flag, like the previous commit.
22 Feb 2015; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
Drop openvg, drm, and gallium USE flags, bug 504230.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-02-23 5:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-03 0:21 [gentoo-commits] gentoo-x86 commit in x11-libs/cairo: cairo-9999.ebuild ChangeLog Chi-Thanh Christopher Nguyen (chithanh)
-- strict thread matches above, loose matches on Subject: below --
2015-02-23 5:44 Matt Turner (mattst88)
2015-02-22 19:02 Matt Turner (mattst88)
2014-12-08 19:19 Matt Turner (mattst88)
2014-08-19 21:01 Matt Turner (mattst88)
2014-05-08 2:31 Alexandre Rostovtsev (tetromino)
2013-07-22 1:21 Chi-Thanh Christopher Nguyen (chithanh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox