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 66170138CA4 for ; Sat, 18 Apr 2015 09:00:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD866E092A; Sat, 18 Apr 2015 09:00:09 +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 35FEAE092A for ; Sat, 18 Apr 2015 09:00:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA7A5340ACF for ; Sat, 18 Apr 2015 09:00:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 102BE162D5 for ; Sat, 18 Apr 2015 09:00:02 +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: <1429045710.7c7793d044ddfb1884d09f18b6a4b171206e045f.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.20.0.ebuild media-libs/cogl/cogl-9999.ebuild media-libs/cogl/metadata.xml X-VCS-Directories: media-libs/cogl/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 7c7793d044ddfb1884d09f18b6a4b171206e045f X-VCS-Branch: master Date: Sat, 18 Apr 2015 09:00:02 +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: 068069c2-7f5f-46a2-b758-c8dc0406ff33 X-Archives-Hash: cc5c598ba29d2a7adb72cc1823101994 commit: 7c7793d044ddfb1884d09f18b6a4b171206e045f Author: Ole Reifschneider gentoo org> AuthorDate: Tue Apr 14 21:08:30 2015 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Tue Apr 14 21:08:30 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7c7793d0 Add media-libs/cogl version 1.20.0 Package-Manager: portage-2.2.14 Manifest-Sign-Key: 7E8B4D42 .../cogl/{cogl-9999.ebuild => cogl-1.20.0.ebuild} | 33 ++++++---------------- media-libs/cogl/cogl-9999.ebuild | 4 +-- media-libs/cogl/metadata.xml | 1 + 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild similarity index 85% copy from media-libs/cogl/cogl-9999.ebuild copy to media-libs/cogl/cogl-1.20.0.ebuild index b163549..4fb544e 100644 --- a/media-libs/cogl/cogl-9999.ebuild +++ b/media-libs/cogl/cogl-1.20.0.ebuild @@ -1,30 +1,22 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.2-r1.ebuild,v 1.3 2015/03/15 13:28:41 pacho Exp $ EAPI="5" CLUTTER_LA_PUNT="yes" # Inherit gnome2 after clutter to download sources from gnome.org inherit clutter gnome2 multilib virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi 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 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" COMMON_DEPEND=" >=dev-libs/glib-2.32:2 @@ -59,7 +51,7 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext virtual/pkgconfig test? ( - app-admin/eselect-opengl + app-eselect/eselect-opengl media-libs/mesa[classic] ) " @@ -67,25 +59,18 @@ DEPEND="${COMMON_DEPEND} # For some reason GL3 conformance test all fails again... RESTRICT="test" -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-1.13 )" -fi - src_prepare() { # Do not build examples sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \ - -i Makefile.am || die + -i Makefile.am Makefile.in || die if ! use test ; then # For some reason the configure switch will not completely disable # tests being built sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \ - -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ - -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ - -i Makefile.am || die + -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \ + -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \ + -i Makefile.am Makefile.in || die fi gnome2_src_prepare diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild index b163549..7cb2335 100644 --- a/media-libs/cogl/cogl-9999.ebuild +++ b/media-libs/cogl/cogl-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -59,7 +59,7 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext virtual/pkgconfig test? ( - app-admin/eselect-opengl + app-eselect/eselect-opengl media-libs/mesa[classic] ) " diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml index 8ba9687..e3cc855 100644 --- a/media-libs/cogl/metadata.xml +++ b/media-libs/cogl/metadata.xml @@ -4,6 +4,7 @@ gnome Enable OpenGL ES 2.0 support + Enable KMS support. Build cogl-pango library for x11-libs/pango integration