summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/clutter/ChangeLog8
-rw-r--r--media-libs/clutter/Manifest7
-rw-r--r--media-libs/clutter/clutter-1.2.14.ebuild6
-rw-r--r--media-libs/clutter/files/clutter-1.0.0-disable-tests.patch53
-rw-r--r--media-libs/clutter/metadata.xml2
5 files changed, 14 insertions, 62 deletions
diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 022447cbea85..6b5d77e60f90 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/clutter
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.6 2010/09/25 22:41:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.7 2010/09/25 22:51:29 nirbheek Exp $
+
+ 25 Sep 2010; <nirbheek@gentoo.org>
+ -files/clutter-1.0.0-disable-tests.patch, clutter-1.2.14.ebuild,
+ metadata.xml:
+ Try to directly use gdk-pixbuf instead of gtk+. Remove unused patch and
+ unused local-use-flag description.
*clutter-1.2.14 (25 Sep 2010)
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 0ed5f60245c2..7c410fd45644 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,9 +1,8 @@
-AUX clutter-1.0.0-disable-tests.patch 1445 RMD160 95018f8fce1d4c2d47ebd16402a02f2c86e0fdbc SHA1 f355cb8f13cb8fd4e192c925ea23efb8ac64f40b SHA256 5e168f0854c0883fc96ae489947b5b4e3b3f5ca36b6b0b461b5acfcd36e0c815
DIST clutter-1.2.10.tar.bz2 2388873 RMD160 d780f30876f5ac577b2be89cd5630dcc20a803c2 SHA1 15f122315194a09b21fccbc31de6a1ce56918975 SHA256 26cdee7a528eb1346553d16ae8d8d87f35a8a46c0a86829eabd227067e84da5d
DIST clutter-1.2.12.tar.bz2 2396325 RMD160 6fc93feda3dcdd5f17ff7c40661211b078210b34 SHA1 70feff8c3c2bbf2d4ed7ed6ecae6ad04a464d499 SHA256 4582e6579897374d1f8ce51daa330311ebb90033fad95d5f076c1e9392b4ae68
DIST clutter-1.2.14.tar.bz2 2405660 RMD160 2498feed53d78946b6336b501711493d99abfe74 SHA1 bd8f770c3f3b48954652e87a100d2659bee2176d SHA256 f9b7e6b8338662f8b0961579f6ad0f56b6696e65f2f122353fa0390959acc744
EBUILD clutter-1.2.10.ebuild 1752 RMD160 7f74771118544579110c1845dad5acc74d581cdb SHA1 f41e9aae496f521afcbbec5bf755d09055797852 SHA256 82fda7839af7e847dcd314bfd10ab5f558cf86dc960e0a697af0574a49b06340
EBUILD clutter-1.2.12.ebuild 1773 RMD160 70d5d7df4c602855057275b43cf120ddf38ceb94 SHA1 9249b2c44f527b34913d4038d0a5990704b314a5 SHA256 2a2b5a8c662513a9804f4d06b09a4e37c4b500c653f8d14b23ca32ccd937ae94
-EBUILD clutter-1.2.14.ebuild 1744 RMD160 8ceb9d6c5df472041da772d8bc0f87197514d751 SHA1 e0fd33c8ae350deaf6a148ece105f54d620d79f5 SHA256 4e6f6e681784517a916b29ca47ea30f068f4ed499bf410c96c4b0704f4c8cfc6
-MISC ChangeLog 1318 RMD160 06f58b7c7de35f077e7b32e13711e65650ea1883 SHA1 fce981e91ad57881e0940b00c8951f8860a6900c SHA256 f0574bade140f81ce38bc02da57e9e9a2353e6d40a5420346eca2753ca8e6729
-MISC metadata.xml 520 RMD160 c0f6ddaffda6e5e12509cd861547dcacdcccf60b SHA1 f39089709d1b316288bf92aef43aafed23687dfc SHA256 713ccd6e3437e50e71c23aa71d88fccd02b32d739681d12d65a84eeded3f9aad
+EBUILD clutter-1.2.14.ebuild 1776 RMD160 f40a1401df55f1ea2a7d2d8d8561145f9a09ad69 SHA1 df0b110527f78f0fc32cdf1329edaf91b0ee26fa SHA256 936ad741c1d0c224626c8134dbe46ce8ce4ecb5eb9c945474b25e3c6de67e947
+MISC ChangeLog 1550 RMD160 1e4da08b4f1a56c87624d7b4c7ef6c8ef0a505bc SHA1 c86fa413966f5c55d3d12f5a1e0146ef31d689cb SHA256 f0382e9384790891a11c151fd6e74bbc1ea9fee32a5765e78ebfb69f06303ce5
+MISC metadata.xml 369 RMD160 e3e3636a5afeb148f237e04d5fdbbcd59290d615 SHA1 7d2624a645199395fc46f07da920dc024dc7918e SHA256 32aaa1d48a8c5b7837ada4c3d705d4a4d58280b4454d53cc6ef34f43e0675696
diff --git a/media-libs/clutter/clutter-1.2.14.ebuild b/media-libs/clutter/clutter-1.2.14.ebuild
index c0df71fe236f..0f598a9db724 100644
--- a/media-libs/clutter/clutter-1.2.14.ebuild
+++ b/media-libs/clutter/clutter-1.2.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.2.14.ebuild,v 1.1 2010/09/25 22:41:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.2.14.ebuild,v 1.2 2010/09/25 22:51:29 nirbheek Exp $
EAPI="2"
@@ -26,7 +26,9 @@ RDEPEND=">=dev-libs/glib-2.16
>=x11-libs/libXfixes-3
>=x11-libs/libXcomposite-0.4
- gtk? ( >=x11-libs/gtk+-2.0 )
+ gtk? ( || (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.0 ) )
"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/media-libs/clutter/files/clutter-1.0.0-disable-tests.patch b/media-libs/clutter/files/clutter-1.0.0-disable-tests.patch
deleted file mode 100644
index d47855d0b1fd..000000000000
--- a/media-libs/clutter/files/clutter-1.0.0-disable-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Interactive Tests.
-
-http://bugzilla.o-hand.com/show_bug.cgi?id=1618
-
---
---- configure.ac
-+++ configure.ac
-@@ -718,6 +718,18 @@
-
- AM_CONDITIONAL(ENABLE_MANUAL, [test "x$enable_manual" = "xyes"])
-
-+dnl = tests ================================================================
-+AC_ARG_ENABLE(tests,
-+ AS_HELP_STRING([--enable-tests],[Enable building of tests and examples]),
-+ [case "${enableval}" in
-+ yes) ENABLE_TESTS=yes ;;
-+ no) ENABLE_TESTS=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-tests) ;;
-+ esac],
-+ [ENABLE_TESTS=no])
-+
-+AM_CONDITIONAL([ENABLE_TESTS], [test "x$ENABLE_TESTS" = "xyes"])
-+
- dnl === I18N ==================================================================
-
- GETTEXT_PACKAGE="clutter-$CLUTTER_API_VERSION"
-@@ -803,6 +815,7 @@
- echo " Compiler flags: ${CPPFLAGS} ${MAINTAINER_CFLAGS}"
- echo " Build API documentation: ${enable_gtk_doc}"
- echo " Build manual documentation: ${enable_manual}"
-+echo " Enable tests: ${enable_tests}"
- echo " Build introspection data: ${enable_introspection}"
- echo ""
-
---- Makefile.am
-+++ Makefile.am
-@@ -1,11 +1,15 @@
- NULL =
-
--SUBDIRS = build clutter tests po
-+SUBDIRS = build clutter po
-
- if BUILD_GTK_DOC
- SUBDIRS += doc
- endif
-
-+if ENABLE_TESTS
-+SUBDIRS += tests
-+endif
-+
- DIST_SUBDIRS = build clutter tests doc po
-
- ACLOCAL_AMFLAGS = -I build/autotools
diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index d116e9a19e27..470e6fcbaad7 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/metadata.xml
@@ -6,7 +6,5 @@
<flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
introspection</flag>
- <flag name="opengl">Use <pkg>virtual/opengl</pkg> as the backend for
- rendering (default). If disabled, <pkg>media-libs/libsdl</pkg> is used.</flag>
</use>
</pkgmetadata>