From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 25031139B2A for ; Sun, 13 Sep 2015 22:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A37BD21C06C; Sun, 13 Sep 2015 22:03:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2378621C080 for ; Sun, 13 Sep 2015 22:03:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23CD5340A9C for ; Sun, 13 Sep 2015 22:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72BB1178 for ; Sun, 13 Sep 2015 22:03:23 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1442168422.9ef14574166a7576be006584ca5c6651a6652f77.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/ X-VCS-Repository: proj/gnome X-VCS-Files: media-libs/cogl/cogl-1.21.2.ebuild media-libs/cogl/cogl-9999.ebuild X-VCS-Directories: media-libs/cogl/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 9ef14574166a7576be006584ca5c6651a6652f77 X-VCS-Branch: master Date: Sun, 13 Sep 2015 22:03:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b98c9b00-e467-4a41-a50a-34eef1f927c0 X-Archives-Hash: 364a24f63631b459895752d1c35c4f87 commit: 9ef14574166a7576be006584ca5c6651a6652f77 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Sep 13 18:20:22 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sun Sep 13 18:20:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9ef14574 media-libs/cogl: Bump version to 1.21.2 Package-Manager: portage-2.2.20.1 Manifest-Sign-Key: 7E8B4D42 .../cogl/{cogl-9999.ebuild => cogl-1.21.2.ebuild} | 45 ++++++++-------------- media-libs/cogl/cogl-9999.ebuild | 2 +- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-1.21.2.ebuild similarity index 82% copy from media-libs/cogl/cogl-9999.ebuild copy to media-libs/cogl/cogl-1.21.2.ebuild index df06afc..984b93d 100644 --- a/media-libs/cogl/cogl-9999.ebuild +++ b/media-libs/cogl/cogl-1.21.2.ebuild @@ -3,28 +3,21 @@ # $Id$ EAPI="5" -CLUTTER_LA_PUNT="yes" +GCONF_DEBUG="yes" -# Inherit gnome2 after clutter to download sources from gnome.org -inherit clutter gnome2 multilib virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi +inherit gnome2 multilib virtualx DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" HOMEPAGE="http://www.cogl3d.org/" LICENSE="MIT BSD" -SLOT="2.0/0" # subslot = .so version +SLOT="1.0/20" # subslot = .so version + # doc and profile disable for now due bugs #484750 and #483332 IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile -REQUIRED_USE="wayland? ( gles2 )" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" - IUSE="${IUSE} doc" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -fi +REQUIRED_USE="wayland? ( gles2 ) + || ( gles2 opengl )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" COMMON_DEPEND=" >=dev-libs/glib-2.32:2 @@ -42,7 +35,7 @@ COMMON_DEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.34.2 ) + introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) @@ -53,7 +46,8 @@ COMMON_DEPEND=" " # before clutter-1.7, cogl was part of clutter RDEPEND="${COMMON_DEPEND} - !