[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ole Reifschneider" <tranquility@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/
Date: Sun, 13 Sep 2015 22:03:23 +0000 (UTC)	[thread overview]
Message-ID: <1442168422.9ef14574166a7576be006584ca5c6651a6652f77.tranquility@gentoo> (raw)

commit:     9ef14574166a7576be006584ca5c6651a6652f77
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 18:20:22 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> 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}
-	!<media-libs/clutter-1.7"
+	!<media-libs/clutter-1.7
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	sys-devel/gettext
@@ -67,17 +61,10 @@ 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
@@ -85,7 +72,7 @@ src_prepare() {
 		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
+			-i Makefile.am Makefile.in || die
 	fi
 
 	gnome2_src_prepare
@@ -133,10 +120,12 @@ src_test() {
 }
 
 src_install() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/{*.c,*.jpg}
+	fi
 
-	clutter_src_install
+	gnome2_src_install
 
 	# Remove silly examples-data directory
 	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die

diff --git a/media-libs/cogl/cogl-9999.ebuild b/media-libs/cogl/cogl-9999.ebuild
index df06afc..10d4c6d 100644
--- a/media-libs/cogl/cogl-9999.ebuild
+++ b/media-libs/cogl/cogl-9999.ebuild
@@ -42,7 +42,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:= )

next             reply	other threads:[~2015-09-13 22:03 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-13 22:03 Ole Reifschneider [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-01-12 14:00 [gentoo-commits] proj/gnome:master commit in: media-libs/cogl/ Dennis Lamm
2016-01-30 17:33 Priit Laes
2015-06-09  9:16 Gilles Dartiguelongue
2015-04-18  9:00 Ole Reifschneider
2014-12-26 21:47 Gilles Dartiguelongue
2014-12-08 21:57 Gilles Dartiguelongue
2014-12-07 23:08 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-04-15 22:05 Gilles Dartiguelongue
2013-12-19 23:40 Gilles Dartiguelongue
2013-03-15  7:38 Priit Laes
2013-01-19 21:38 Alexandre Rostovtsev
2012-12-19  0:39 Alexandre Rostovtsev
2012-10-27 19:40 Gilles Dartiguelongue
2012-09-16  7:44 Alexandre Rostovtsev
2012-09-15  7:53 Alexandre Rostovtsev
2011-10-29 19:41 Alexandre Restovtsev
2011-10-18  7:37 Alexandre Restovtsev
2011-10-01  4:39 Alexandre Restovtsev

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:df06afc dfblob:984b93d dfblob:df06afc dfblob:10d4c6d )
 OR (
bs:"[gentoo-commits] proj/gnome:master commit in: media-libs/cogl/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442168422.9ef14574166a7576be006584ca5c6651a6652f77.tranquility@gentoo \
    --to=tranquility@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox