summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2007-06-15 19:00:22 +0000
committerDoug Goldstein <cardoe@gentoo.org>2007-06-15 19:00:22 +0000
commit57484ed874a55525a435153f62d0b908178a3e81 (patch)
tree1a9b59e74705380812e1dd6dbb823a7d2aa18b44 /x11-libs
parentStable on amd64 wrt security bug 180436 (diff)
downloadhistorical-57484ed874a55525a435153f62d0b908178a3e81.tar.gz
historical-57484ed874a55525a435153f62d0b908178a3e81.tar.bz2
historical-57484ed874a55525a435153f62d0b908178a3e81.zip
Add support for using libglitz-glx instead of plain libglitz via USE='glitz opengl'
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog6
-rw-r--r--x11-libs/cairo/Manifest22
-rw-r--r--x11-libs/cairo/cairo-1.4.8.ebuild8
3 files changed, 22 insertions, 14 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index e78c36173ea5..ff96a07afc6a 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/cairo
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.130 2007/06/14 14:21:20 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.131 2007/06/15 19:00:22 cardoe Exp $
+
+ 15 Jun 2007; Doug Goldstein <cardoe@gentoo.org> cairo-1.4.8.ebuild:
+ Add support for using libglitz-glx instead of plain libglitz via USE='glitz
+ opengl'
14 Jun 2007; Daniel Gryniewicz <dang@gentoo.org> cairo-1.4.6.ebuild:
Marked stable on amd64 for bug #176367
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 91ca4fc276a7..efe01dd52074 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -21,14 +21,14 @@ EBUILD cairo-1.4.6.ebuild 1890 RMD160 0467792d1ee0deaa1cd0e1da5d26997f5b54688f S
MD5 f80a3e96f4657de47611b472a7d2a961 cairo-1.4.6.ebuild 1890
RMD160 0467792d1ee0deaa1cd0e1da5d26997f5b54688f cairo-1.4.6.ebuild 1890
SHA256 8ae787fb66296f677b2320ae63c3bf6c96800e804958b16a77135ffb3ca2dc69 cairo-1.4.6.ebuild 1890
-EBUILD cairo-1.4.8.ebuild 1943 RMD160 f6ed7111162c2ea7be05851ec017ecb7e1ae1563 SHA1 b713080afd2ddd1cbcc5b18c7e471cd8d55e32f5 SHA256 c94645eaf11e2332b89c5f90915e1686db25bdd0edd32a15001c0334d40ab4d0
-MD5 45b64a2807a01124d90fccb465441abd cairo-1.4.8.ebuild 1943
-RMD160 f6ed7111162c2ea7be05851ec017ecb7e1ae1563 cairo-1.4.8.ebuild 1943
-SHA256 c94645eaf11e2332b89c5f90915e1686db25bdd0edd32a15001c0334d40ab4d0 cairo-1.4.8.ebuild 1943
-MISC ChangeLog 18434 RMD160 26d52699f37c1071c2e88276ce181fcf37693eb5 SHA1 f71e39eb58d238c794b76de068a54db21fdb491e SHA256 3d34d1d2c32ab357e44d29c71ed09568229fb09b2d41d0d53eb35483dfb2a63b
-MD5 204dcd973b7d00b9096c895392892ef3 ChangeLog 18434
-RMD160 26d52699f37c1071c2e88276ce181fcf37693eb5 ChangeLog 18434
-SHA256 3d34d1d2c32ab357e44d29c71ed09568229fb09b2d41d0d53eb35483dfb2a63b ChangeLog 18434
+EBUILD cairo-1.4.8.ebuild 2021 RMD160 ca2521670c764739160ac32999d5c2e1042c2aff SHA1 3ac989902754f6933f66a5b3e27f537556690e16 SHA256 f820826267d4985f9df66563274d5afa744a657063e39031788431fb47e08329
+MD5 f46811fa7261fbbe07456bc3fd2dc34e cairo-1.4.8.ebuild 2021
+RMD160 ca2521670c764739160ac32999d5c2e1042c2aff cairo-1.4.8.ebuild 2021
+SHA256 f820826267d4985f9df66563274d5afa744a657063e39031788431fb47e08329 cairo-1.4.8.ebuild 2021
+MISC ChangeLog 18595 RMD160 f6a002ea5aa76933c43b33115deea9a131aaf2dd SHA1 7f16f8b5eb21d273ec154f49b9b1e6ebaf15db1b SHA256 721f828e57c6ecad061132282e15ce7c0b51f4eba7bbc447a45244e41157001b
+MD5 b9876bf69416eb0a2c359a6672842338 ChangeLog 18595
+RMD160 f6a002ea5aa76933c43b33115deea9a131aaf2dd ChangeLog 18595
+SHA256 721f828e57c6ecad061132282e15ce7c0b51f4eba7bbc447a45244e41157001b ChangeLog 18595
MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
MD5 b11544cc1116038b149ab213e9d56262 metadata.xml 316
RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 metadata.xml 316
@@ -48,7 +48,7 @@ SHA256 7669cf859fcac6c89e7fc116ca6b22c5ef461e6850c0e40a2b80b814b6de6b9b files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGcsBvoeSe8B0zEfwRAhFSAJ0WjLyo8JJR7+57qZg//qpZwQz1xwCfQILt
-6kai3euMW12ruz3qWnvNOO0=
-=4sdY
+iD8DBQFGcuHVoeSe8B0zEfwRAm4JAJ41g3bBtPZ2IS2uyoztHTZW6Jlr7ACcCsB+
+MdoZh1qC+A8wjuuQLenvvSU=
+=fcnN
-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.4.8.ebuild b/x11-libs/cairo/cairo-1.4.8.ebuild
index 7bd97a47ea50..423b06862412 100644
--- a/x11-libs/cairo/cairo-1.4.8.ebuild
+++ b/x11-libs/cairo/cairo-1.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.8.ebuild,v 1.2 2007/06/15 16:36:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.8.ebuild,v 1.3 2007/06/15 19:00:22 cardoe Exp $
inherit eutils flag-o-matic libtool
@@ -11,7 +11,7 @@ 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"
-IUSE="debug directfb doc glitz svg X xcb"
+IUSE="debug directfb doc glitz opengl svg X xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
RESTRICT="test"
@@ -54,6 +54,10 @@ src_compile() {
#gets rid of fbmmx.c inlining warnings
append-flags -finline-limit=1200
+ if use glitz && use opengl; then
+ export glitz_LIBS=-lglitz-glx
+ fi
+
econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
$(use_enable svg) $(use_enable glitz) \
$(use_enable debug test-surfaces) --enable-pdf --enable-png \