From: "Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/cogl: cogl-1.10.4.ebuild metadata.xml ChangeLog cogl-1.12.0.ebuild
Date: Sun, 16 Dec 2012 22:03:52 +0000 (UTC) [thread overview]
Message-ID: <20121216220352.17DC12171D@flycatcher.gentoo.org> (raw)
tetromino 12/12/16 22:03:52
Modified: cogl-1.10.4.ebuild metadata.xml ChangeLog
Added: cogl-1.12.0.ebuild
Log:
Version bump for gnome-3.6. Switch to global introspection USE flag.
(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Revision Changes Path
1.5 media-libs/cogl/cogl-1.10.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild?r1=1.4&r2=1.5
Index: cogl-1.10.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cogl-1.10.4.ebuild 5 Dec 2012 23:58:06 -0000 1.4
+++ cogl-1.10.4.ebuild 16 Dec 2012 22:03:51 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild,v 1.4 2012/12/05 23:58:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild,v 1.5 2012/12/16 22:03:51 tetromino Exp $
EAPI="5"
CLUTTER_LA_PUNT="yes"
@@ -46,7 +46,7 @@
src_prepare() {
DOCS="NEWS README"
EXAMPLES="examples/{*.c,*.jpg}"
- # XXX: think about kms-egl, gles, quartz, sdl, wayland
+ # XXX: think about kms-egl, quartz, sdl, wayland
G2CONF="${G2CONF}
--disable-examples-install
--disable-profile
@@ -62,6 +62,7 @@
$(use_enable introspection)
$(use_enable pango cogl-pango)
$(use_enable doc gtk-doc)"
+ # Really need --enable-gtk-doc for docs
# USE=doc build failure; in 1.12.x; bug #436308
epatch "${FILESDIR}/${PN}-1.10.4-cogl-clipping.xml.patch"
1.4 media-libs/cogl/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/metadata.xml?r1=1.3&r2=1.4
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/cogl/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml 14 Jun 2012 04:33:04 -0000 1.3
+++ metadata.xml 16 Dec 2012 22:03:51 -0000 1.4
@@ -4,8 +4,6 @@
<herd>gnome</herd>
<use>
<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
<flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
integration</flag>
</use>
1.17 media-libs/cogl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 5 Dec 2012 23:58:06 -0000 1.16
+++ ChangeLog 16 Dec 2012 22:03:51 -0000 1.17
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/cogl
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.16 2012/12/05 23:58:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.17 2012/12/16 22:03:51 tetromino Exp $
+
+*cogl-1.12.0 (16 Dec 2012)
+
+ 16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.10.4.ebuild,
+ +cogl-1.12.0.ebuild, +files/cogl-1.12.0-fix-experimental-doc-build.patch,
+ metadata.xml:
+ Version bump for gnome-3.6. Switch to global introspection USE flag.
05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.10.4.ebuild:
Accidentally set wrong subslot.
1.1 media-libs/cogl/cogl-1.12.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/cogl-1.12.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/cogl/cogl-1.12.0.ebuild?rev=1.1&content-type=text/plain
Index: cogl-1.12.0.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.0.ebuild,v 1.1 2012/12/16 22:03:51 tetromino Exp $
EAPI="5"
CLUTTER_LA_PUNT="yes"
# Inherit gnome2 after clutter to download sources from gnome.org
inherit eutils clutter gnome2 multilib virtualx
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
HOMEPAGE="http://www.clutter-project.org/"
LICENSE="LGPL-2.1+ FDL-1.1+"
SLOT="1.0/11"
IUSE="doc examples +introspection +opengl gles2 +pango"
KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
# XXX: need uprof for optional profiling support
COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
x11-libs/cairo:=
>=x11-libs/gdk-pixbuf-2:2
x11-libs/libdrm:=
x11-libs/libX11
>=x11-libs/libXcomposite-0.4
x11-libs/libXdamage
x11-libs/libXext
>=x11-libs/libXfixes-3
virtual/glu
virtual/opengl
gles2? ( media-libs/mesa[gles2] )
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
!<media-libs/clutter-1.7"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig
doc? ( app-text/docbook-xml-dtd:4.1.2
>=dev-util/gtk-doc-1.13 )
test? ( app-admin/eselect-opengl
media-libs/mesa[classic] )"
# Need classic mesa swrast for tests, llvmpipe causes a test failure
src_prepare() {
DOCS="NEWS README"
EXAMPLES="examples/{*.c,*.jpg}"
# XXX: think about kms-egl, quartz, sdl, wayland
G2CONF="${G2CONF}
--disable-examples-install
--disable-profile
--disable-maintainer-flags
--enable-cairo
--enable-gdk-pixbuf
$(use_enable opengl glx)
$(use_enable opengl gl)
$(use_enable gles2)
$(use_enable gles2 cogl-gles2)
$(use_enable gles2 xlib-egl-platform)
"$(usex gles2 --with-default-driver=gles2 "")"
--enable-glib
--enable-deprecated
$(use_enable introspection)
$(use_enable pango cogl-pango)
$(use_enable doc gtk-doc)"
# Really need --enable-gtk-doc for docs
# https://bugzilla.gnome.org/show_bug.cgi?id=684731
epatch "${FILESDIR}/${PN}-1.12.0-fix-experimental-doc-build.patch"
gnome2_src_prepare
}
src_test() {
# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
# NOTE: recheck if this is needed after every mesa bump
if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
ewarn "Skipping tests because a binary OpenGL library is enabled. To"
ewarn "run tests for ${PN}, you need to enable the Mesa library:"
ewarn "# eselect opengl set xorg-x11"
return
fi
LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
}
src_install() {
clutter_src_install
# Remove silly examples-data directory
rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
}
pkg_preinst() {
gnome2_pkg_preinst
preserve_old_lib /usr/$(get_libdir)/libcogl.so.9
}
pkg_postinst() {
gnome2_pkg_postinst
preserve_old_lib_notify /usr/$(get_libdir)/libcogl.so.9
}
reply other threads:[~2012-12-16 22:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20121216220352.17DC12171D@flycatcher.gentoo.org \
--to=tetromino@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