Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog8
-rw-r--r--x11-libs/cairo/cairo-1.10.0.ebuild155
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild149
-rw-r--r--x11-libs/cairo/metadata.xml11
4 files changed, 260 insertions, 63 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 2ae77e1a5c1f..14f4dd1db422 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/cairo
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.253 2010/09/08 16:03:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.254 2010/09/08 19:58:39 scarabeus Exp $
+
+*cairo-9999 (08 Sep 2010)
+
+ 08 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> cairo-1.10.0.ebuild,
+ +cairo-9999.ebuild, metadata.xml:
+ Sync with x11 overlay. Move live ebuild here from overlay.
*cairo-1.10.0 (08 Sep 2010)
diff --git a/x11-libs/cairo/cairo-1.10.0.ebuild b/x11-libs/cairo/cairo-1.10.0.ebuild
index 658f42a538b1..bbdad9e599dd 100644
--- a/x11-libs/cairo/cairo-1.10.0.ebuild
+++ b/x11-libs/cairo/cairo-1.10.0.ebuild
@@ -1,71 +1,88 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild,v 1.1 2010/09/08 16:03:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0.ebuild,v 1.2 2010/09/08 19:58:39 scarabeus Exp $
-EAPI=2
+EAPI=3
-inherit eutils flag-o-matic autotools
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
+
+inherit eutils flag-o-matic autotools ${GIT_ECLASS}
DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua debug directfb doc drm gallium opengl openvg qt +svg X xcb"
+IUSE="X aqua debug directfb doc drm gallium opengl openvg qt 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-2.2.95
- >=media-libs/freetype-2.1.9
+RDEPEND="media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/libpng:0
sys-libs/zlib
- >=media-libs/libpng-1.2.43-r2:0
>=x11-libs/pixman-0.18.4
- directfb? ( >=dev-libs/DirectFB-0.9.24 )
- gallium? ( media-libs/mesa[gallium] )
- qt? ( >=x11-libs/qt-gui-4.4:4 )
+ directfb? ( dev-libs/DirectFB )
+ opengl? ( virtual/opengl )
+ qt? ( x11-libs/qt-gui )
svg? ( dev-libs/libxml2 )
- X? ( >=x11-libs/libXrender-0.6
+ X? (
+ >=x11-libs/libXrender-0.6
x11-libs/libXext
x11-libs/libX11
- x11-libs/libXft
- drm? ( >=sys-fs/udev-136
- >=x11-base/xorg-server-1.6 )
+ x11-libs/libXft
+ drm? (
+ >=sys-fs/udev-136
+ gallium? ( media-libs/mesa[gallium] )
)
- xcb? ( >=x11-libs/libxcb-1.4
- x11-libs/xcb-util )"
-# test? (
-# pdf test
-# x11-libs/pango
-# >=x11-libs/gtk+-2.0
-# >=app-text/poppler-bindings-0.9.2[gtk]
-# ps test
-# app-text/ghostscript-gpl
-# svg test
-# >=x11-libs/gtk+-2.0
-# >=gnome-base/librsvg-2.15.0
-
+ xcb? (
+ || (
+ <=x11-libs/libX11-1.3.5[xcb]
+ >x11-libs/libX11-1.3.5
+ )
+ )
+ )
+ xcb? (
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ )"
DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.19
+ dev-util/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 )
- )"
+ 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
+ )
+ )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+ # 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
+
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
# http://bugs.freedesktop.org/show_bug.cgi?id=15463
[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
@@ -73,40 +90,60 @@ src_configure() {
#gets rid of fbmmx.c inlining warnings
append-flags -finline-limit=1200
+ if use X; then
+ myopts+="
+ $(use_enable drm)
+ $(use_enable xcb xcb-shm)
+ "
+
+ if use drm; then
+ myopts+="
+ $(use_enable gallium)
+ $(use_enable xcb xcb-drm)
+ "
+ else
+ use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
+ myopts+="
+ --disable-gallium
+ --disable-xcb-drm
+ "
+ fi
+ else
+ use drm && ewarn "drm use requires X use enabled. So disabling for now."
+ myopts+="
+ --disable-drm
+ --disable-xcb-lib
+ "
+ fi
+
econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
$(use_enable X xlib) \
$(use_enable X xlib-xrender) \
- $(use_enable xcb) \
- $(use_enable svg) \
- $(use_enable doc gtk-doc) \
- $(use_enable directfb) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
$(use_enable debug test-surfaces) \
- $(use_enable opengl gl) \
+ $(use_enable directfb) \
+ $(use_enable doc gtk-doc) \
$(use_enable openvg vg) \
- $(use_enable drm) \
- $(use_enable gallium) \
+ $(use_enable opengl gl) \
+ $(use_enable qt) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ --enable-ft \
--enable-pdf \
--enable-png \
- --enable-ft \
--enable-ps \
- $(use_enable aqua quartz) \
- $(use_enable aqua quartz-image) \
- $(use_enable aqua quartz-font) \
- || die "configure failed"
+ ${myopts}
}
src_install() {
- make DESTDIR="${D}" install || die "Installation failed"
- dodoc AUTHORS ChangeLog NEWS README
-}
+ # parallel make install fails
+ emake -j1 DESTDIR="${D}" install || die "Installation failed"
+ dodoc AUTHORS ChangeLog NEWS README || die
-pkg_postinst() {
- if use xcb; then
- ewarn "You have enabled the Cairo XCB backend which is used only by"
- ewarn "a select few apps. The Cairo XCB backend is presently"
- ewarn "un-maintained and needs a lot of work to get it caught up"
- ewarn "to the Xrender and Xlib backends, which are the backends used"
- ewarn "by most applications. See:"
- ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
- fi
+ use static-libs || find "${D}" -type f -name '*.la' -exec rm -f '{}' \;
}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
new file mode 100644
index 000000000000..0416b63740bd
--- /dev/null
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2010 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.1 2010/09/08 19:58:39 scarabeus Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
+
+inherit eutils flag-o-matic autotools ${GIT_ECLASS}
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="X aqua debug directfb doc drm gallium opengl openvg qt 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.18.4
+ directfb? ( dev-libs/DirectFB )
+ opengl? ( virtual/opengl )
+ qt? ( x11-libs/qt-gui )
+ svg? ( dev-libs/libxml2 )
+ X? (
+ >=x11-libs/libXrender-0.6
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXft
+ drm? (
+ >=sys-fs/udev-136
+ gallium? ( media-libs/mesa[gallium] )
+ )
+ xcb? (
+ || (
+ <=x11-libs/libX11-1.3.5[xcb]
+ >x11-libs/libX11-1.3.5
+ )
+ )
+ )
+ xcb? (
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ )"
+DEPEND="${RDEPEND}
+ dev-util/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
+ )
+ )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+
+ # 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
+
+ [[ ${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
+
+ if use X; then
+ myopts+="
+ $(use_enable drm)
+ $(use_enable xcb xcb-shm)
+ "
+
+ if use drm; then
+ myopts+="
+ $(use_enable gallium)
+ $(use_enable xcb xcb-drm)
+ "
+ else
+ use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
+ myopts+="
+ --disable-gallium
+ --disable-xcb-drm
+ "
+ fi
+ else
+ use drm && ewarn "drm use requires X use enabled. So disabling for now."
+ myopts+="
+ --disable-drm
+ --disable-xcb-lib
+ "
+ fi
+
+ 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 doc gtk-doc) \
+ $(use_enable openvg vg) \
+ $(use_enable opengl gl) \
+ $(use_enable qt) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ ${myopts}
+}
+
+src_install() {
+ # parallel make install fails
+ emake -j1 DESTDIR="${D}" install || die "Installation failed"
+ dodoc AUTHORS ChangeLog NEWS README || die
+
+ use static-libs || find "${D}" -type f -name '*.la' -exec rm -f '{}' \;
+}
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 98a626c8050e..551af02c081c 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>no-herd</herd>
+<herd>x11</herd>
<maintainer>
<email>cardoe@gentoo.org</email>
<name>Doug Goldstein</name>
@@ -18,8 +18,13 @@
<flag name='lcdfilter'>Add FreeType LCD filtering, ClearType-style behavior
for sub-pixel-hinting. Overrides cleartype USE flag. Patch taken from
Ubuntu</flag>
- <flag name='opengl'>When used along with USE=glitz, enables glitz-glx usage.
- Requires hardware OpenGL support</flag>
+ <flag name='opengl' restrict="&gt;=x11-libs/cairo-1.10.0">
+ Use Mesa backend for acceleration
+ </flag>
+ <flag name='opengl' restrict="&lt;=x11-libs/cairo-1.10.0">
+ When used along with USE=glitz, enables glitz-glx usage.
+ Requires hardware OpenGL support
+ </flag>
<flag name='drm'>Use Linux DRM for backend acceleration</flag>
<flag name='gallium'>Use Mesa's Gallium backend for acceleration</flag>
<flag name='openvg'>Use OpenVG for backend acceleration</flag>