From 7206f77e6c831f642b2a3548356eeeb6ede7f097 Mon Sep 17 00:00:00 2001 From: Dror Levin Date: Thu, 13 Jan 2011 19:07:12 +0000 Subject: Restore buggy_gradients.patch accidently removed by scarabeus. (Portage version: 2.2.0_alpha15/cvs/Linux x86_64) --- x11-libs/cairo/ChangeLog | 9 +- x11-libs/cairo/cairo-1.10.2-r1.ebuild | 147 +++++++++++++++++++++ x11-libs/cairo/cairo-1.10.2.ebuild | 146 -------------------- .../cairo/files/cairo-1.10.0-buggy_gradients.patch | 17 +++ 4 files changed, 172 insertions(+), 147 deletions(-) create mode 100644 x11-libs/cairo/cairo-1.10.2-r1.ebuild delete mode 100644 x11-libs/cairo/cairo-1.10.2.ebuild create mode 100644 x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch (limited to 'x11-libs/cairo') diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index b0edef273cea..733f7708fd15 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.266 2011/01/11 18:58:37 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.267 2011/01/13 19:07:12 spatz Exp $ + +*cairo-1.10.2-r1 (13 Jan 2011) + + 13 Jan 2011; Dror Levin + +files/cairo-1.10.0-buggy_gradients.patch, -cairo-1.10.2.ebuild, + +cairo-1.10.2-r1.ebuild: + Restore buggy_gradients.patch accidently removed by scarabeus. *cairo-1.10.2 (11 Jan 2011) diff --git a/x11-libs/cairo/cairo-1.10.2-r1.ebuild b/x11-libs/cairo/cairo-1.10.2-r1.ebuild new file mode 100644 index 000000000000..117ddab00a1d --- /dev/null +++ b/x11-libs/cairo/cairo-1.10.2-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.1 2011/01/13 19:07:12 spatz 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 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.18.4 + directfb? ( dev-libs/DirectFB ) + opengl? ( virtual/opengl ) + openvg? ( media-libs/mesa[gallium] ) + qt4? ( >=x11-libs/qt-gui-4.4:4 ) + 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/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 + epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.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+=" + --enable-tee=yes + $(use_enable drm) + " + + 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-gallium + --disable-xcb-drm + " + fi + + # --disable-xcb-lib: + # do not override good xlib backed by hardforcing rendering over xcb + 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 qt4 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 \ + --disable-xlib-xcb \ + ${myopts} +} + +src_install() { + # parallel make install fails + emake -j1 DESTDIR="${D}" install || die "Installation failed" + dodoc AUTHORS ChangeLog NEWS README || die +} diff --git a/x11-libs/cairo/cairo-1.10.2.ebuild b/x11-libs/cairo/cairo-1.10.2.ebuild deleted file mode 100644 index 59aae6499207..000000000000 --- a/x11-libs/cairo/cairo-1.10.2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2.ebuild,v 1.1 2011/01/11 18:58:37 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 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.18.4 - directfb? ( dev-libs/DirectFB ) - opengl? ( virtual/opengl ) - openvg? ( media-libs/mesa[gallium] ) - qt4? ( >=x11-libs/qt-gui-4.4:4 ) - 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/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+=" - --enable-tee=yes - $(use_enable drm) - " - - 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-gallium - --disable-xcb-drm - " - fi - - # --disable-xcb-lib: - # do not override good xlib backed by hardforcing rendering over xcb - 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 qt4 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 \ - --disable-xlib-xcb \ - ${myopts} -} - -src_install() { - # parallel make install fails - emake -j1 DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog NEWS README || die -} diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 000000000000..a58c2f8f4138 --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,17 @@ +http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch +http://bugs.gentoo.org/336696 + +--- src/cairo-xlib-display.c ++++ src/cairo-xlib-display.c +@@ -353,11 +353,7 @@ + /* Prior to Render 0.10, there is no protocol support for gradients and + * we call function stubs instead, which would silently consume the drawing. + */ +-#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 + display->buggy_gradients = TRUE; +-#else +- display->buggy_gradients = FALSE; +-#endif + display->buggy_pad_reflect = FALSE; + display->buggy_repeat = FALSE; + -- cgit v1.2.3-65-gdbad