# ChangeLog for media-libs/cogl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.52 2014/07/23 15:19:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.53 2014/12/23 22:25:58 eva Exp $
+
+*cogl-1.18.2-r1 (23 Dec 2014)
+
+ 23 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -cogl-1.16.2.ebuild,
+ -cogl-1.18.0.ebuild, +cogl-1.18.2-r1.ebuild,
+ -files/cogl-1.10.4-cogl-clipping.xml.patch,
+ -files/cogl-1.14.1-framebuffer-allocate.patch, metadata.xml:
+ Version bump for Gnome 3.14. Clean up old revisions.
23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> cogl-1.18.2.ebuild:
Stable for x86, wrt bug #512012
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24147a1791ca1c4ddc3321052d843512e1eb9d SHA512 ff0d47e5cb2e7533d8f909504c66e07ac405ffb7606675d4bb937201d97d49099e57d2a34522c287e68eff46397fe6e2822e64e0e04a84f40a166c08aea0970a WHIRLPOOL ec8750a39a06fd72ac4e3321a21107fd01702aeedf25d8984bac3ed039a9d388d40c97c87dbafb426d30ba9a090f32009b23a311704dcad56b4ceb40c1129f42
-AUX cogl-1.14.1-framebuffer-allocate.patch 1262 SHA256 ff62c540091022aacf65ef65c06c9a93a64a4e2ef0c4b37794e418e108f28a85 SHA512 0738dbad6a88cafa3ea8f500ae424946ac6f78fb4e25f0691eee2a25d7732a5f628de8348a7124cc875a23fe0d6e8c0635f1da07f9340d8a698639024c3288b9 WHIRLPOOL 9346e381d53bbb2c105a66cafef2497d48c4e04bdc138e9ebe192c0758c1e2370db11c07a53412e3183e39d8bad6eef6d3f5b8a7d1215d9b5ae441ba8c3faf4d
-DIST cogl-1.16.2.tar.xz 1647192 SHA256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7 SHA512 638aea5a12d5f33d481ac6af767af74acdfcbb3512e38740847f385b38b665a108ae616c5971a38f0055cae5b7d9054075f97e4b18af0464c1a5553c6bc3e815 WHIRLPOOL 7eee8f5dd6cd642d02014950d7263ff8cd766e80abef386f771833c017cd699dceb3cd9f2381a6a861048050ef86747d0bfcb7fe74c2a73f9e594b4e24ec7dbf
-DIST cogl-1.18.0.tar.xz 1665100 SHA256 a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e SHA512 2f338d4028f61038cf90f6f1fbe71c4c090084bb5598f9e70c7c46fa905f20c883bcf0522848f3a188187b6202ed496a8aa712276be0768a795a47c7ef1a6b2d WHIRLPOOL a5a051b7c8bd7dca99aff35a7452dcd9111be9c74d93141c62295558768fce155f07993e0020fb617942aae12762f892fe6e7e1ac39f891083c5993165f911c9
DIST cogl-1.18.2.tar.xz 1635384 SHA256 9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa SHA512 c8903a10c476850c77f71eba584854bccf26adae6f62a9232adf8baf728fe2b69273bd5cd5418e7cd72801a2c0e4c85ef8afc08e28ebd5016b81693aef2ecab8 WHIRLPOOL e7538b92af2efe2f3845fde5c97ba9744d53ddb7a05eadb3cf310c43a3536a41001e4a0596a593ae3cfede4a02115a1d9be8aa423e9c814675059f0f777ec4a5
-EBUILD cogl-1.16.2.ebuild 3774 SHA256 9e52a172bc5e918162ada9ac682dc4aaf9d8aac02936b636226304abb312a11f SHA512 9afd67d19f1e6a7dffe7a324dde22416e377e4d5fd546520dd1d275448d1de182b83314d2518557f3e596b7f30ec69d5fcec3a9ea7f3a8d04c628229833aad33 WHIRLPOOL 07a92d1ef6dc53bc37c4e5bac892dee758b59a69b559272a3a107063d9d080fbf5fe0e1ee492523496177e36a1aeae0e9a757b0bbb3579eab983b7dcbf99f608
-EBUILD cogl-1.18.0.ebuild 3728 SHA256 c4c2a6d107ff30791717eb3e247aa8ee030f7d22b058436172ff0fc633e12fe0 SHA512 c9d98449ce63fa7faa16fef454be918697ca79bb402724a04bef3be4f08d53bf69f18ab46d6a284ad4dd27f0bcdbc3ff2b0c30a7f6cdeecd15f06b4fd795fbaf WHIRLPOOL cc9bafef4b5890afd119eaa6c74b1d7d54b4c619a442fab5f445885e054cb57d431a25e9699ee26a17a848bc6a51e4abed88535ba58fe9bf7e1e5690825b01f2
+EBUILD cogl-1.18.2-r1.ebuild 3926 SHA256 f9a3f41c6b40d9417ee5485c2248c33c0440acc9f78122b3725d7614f79770da SHA512 063ace4b5c6fdb3695c4a3ffc8f6f762d8919011e1c254b3128ed88d7f3722289f96cbfe77e9a9f3a5e5c02d2d95937dfa1fb4e12dcc8c7b511b2da0958c5dc7 WHIRLPOOL b6cadbf548c7bda3d00064eb8aff0486f042bf5e3906c276cfadfb47dfa0cb18fa69ed757f27654ca9a2787d33dac501c067b0e454e2fd87749ad952b3c7c47a
EBUILD cogl-1.18.2.ebuild 3654 SHA256 4e24a256bfdd081e2c87e9c779cfd46a990eb7984c601eaef64df5a1efb89eea SHA512 bdf2d32659b337e073f4a7426fa4c044bacf2d0f7897c2da6600415b680e967d8d896a72209316c9afdfe55bf748e5998c6f35311ff8c449f5678e14502dc167 WHIRLPOOL 69cbffd166757f250d9d994699cb7b0c8b137a27721ac8b63275c5c0497b809ce43b48b09393ac99c124f14dd3cb48cebbfa5e8bf45970cf804f5c5c1ea5a184
-MISC ChangeLog 7831 SHA256 9ff49b08028426dce02658737bf4e16226eb6cadbb012fd0c52fb665819bb383 SHA512 6655bd67dc8041af094b4722d3dc0a7855a7c2791f59e4e36c654c52e5aab900e322216925c5bdda9bac4fa74782e83d94a30ce7a81e57c7c993e2e82fb933f2 WHIRLPOOL 89d859229be8fa32b6f1b624f3848b815a70d75657811686edc89dee7fd035b3047709655e8f4a2930c012123957fb109c2230289e75a75cb1fe8186ac0512f6
-MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
+MISC ChangeLog 8149 SHA256 f7be0872b169ccda9cb23bcc4fbc662d29891dc33f6f662a9a76d4873d78a518 SHA512 3569fd45b9c0d8b7b01789017a35e3033a88de37b3b5c62bf21b45aa7af5ec11d96697f3847bc5af9fae28f8fa454c8bf8c91e5d263a8b902136e8163a508b08 WHIRLPOOL b25bea02fc77d3b7b1d4743752ff920a1ce2712c6e13ee93035c27c6114eab8ca547ea37e7a762744c02c5b35a43697d3b14404dde27583f991296fdb5e3c19b
+MISC metadata.xml 373 SHA256 8e9f37c3be54bea2d3632fe948dfdf22a1675151dc6aeeecb89e1d1d5f62897b SHA512 36791939bb09dc32327dce19a19bd58ec23c5c9c3794f27a43b0e9573234ba5b87639e22357f7d6022b94f6715ba7807cad28a814b3edfd97fa0c9d71ddf0754 WHIRLPOOL cda22aa74f18c949a3d31b72a498a1a1ad6ef73817589ae6d418e92c713672a8175aa5cf459e91f5859dc754a3e3398934dab49fb3614735bc0a584ed92557a9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTz9JyAAoJELp701BxlEWfspwP/juLmUXt8UrPnEB/JBsFdxRo
-j/9n1cGN7JIOdo1grEyNu74PhKdEJemYdUBdEytr0gTyIjvJA3iXBKEmGimzMtJ2
-39Ic2v1qbNY4nUqfP/TJ9ChuERkn3W5OvGwk2X8mtbltzjHQQMLP3hRQXqzyL6NT
-FC2gXyhpnv7AlUgKRtA/F5eK0P/9VX7ilOWM64Ad2CepxPa/yOgrBwK0G9y8H7Vr
-Fj1cSlg77KGt7G8tHNs36Gh6Z8bxlN0GD6he4nIvazSdmUdE82VKSuyMI1HRTjuz
-Hu29t1ErutkfKdt5obW8DG0R+G30b9WB4NfH6ao6QpPLzLj+Z1yvP6jDxYtNsKo8
-CKoWSpZV/ifcjLjqDX1mc1lKAInHocvhzchpC9w3/WqsDm1XGBMRonFFxavNgUJ2
-1O9sYIyRSUoHcvwkIVLaMo6NWz7LYwTmNpqJS77g+gr5Ay6edgeBFxDi8reygUK2
-xc10MxlDYjAdm78MRA1jOr7cwPQ4a2/g+libT+ukoiflU8+xJBdM6gu8/Re00GYC
-V1QRzxAYH85EQbizxk32YUEC9+MVg34jl7R5MMqhXViGmGg7Q23OrLxNPaGBrrbq
-Giyn2BllDF/uXNhd/xRI6p4s3TgBJeR/gxsyzaqNU+smCnHgsA3TI/Dciti6dASu
-i0yEPHO033eeo8D1w1mb
-=oE+s
+iEYEAREIAAYFAlSZ6/cACgkQ1fmVwcYIWAZGfQCgnqpAON66EtVKHOhxclTj/vH4
+KNIAoIN4SqAWUVBYBT3Mvy6MQuM9fgSq
+=PnyN
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.16.2.ebuild,v 1.5 2014/03/09 12:02:08 pacho Exp $
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit 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/15" # subslot = .so version
-# doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.32: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
- >=x11-libs/libXrandr-1.2
- virtual/opengl
- gles2? ( media-libs/mesa[gles2] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0 )
-
- introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
- 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}
- >=dev-util/gtk-doc-am-1.13
- sys-devel/gettext
- virtual/pkgconfig
- test? (
- app-admin/eselect-opengl
- media-libs/mesa[classic] )
-"
-# doc? ( >=dev-util/gtk-doc-1.13 )
-
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# Fox some reason GL3 conformance test all fails again...
-RESTRICT="test"
-
-src_prepare() {
- # Do not build examples
- sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
- -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 Makefile.in || die
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # TODO: think about kms-egl, quartz, sdl, wayland
- # Prefer gl over gles2 if both are selected
- # Profiling needs uprof, which is not available in portage yet, bug #484750
- # FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
- gnome2_src_configure \
- --disable-examples-install \
- --disable-maintainer-flags \
- --enable-cairo \
- --enable-deprecated \
- --enable-gdk-pixbuf \
- --enable-glib \
- --disable-gtk-doc \
- $(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=$(usex opengl gl gles2)) \
- $(use_enable gstreamer cogl-gst) \
- $(use_enable introspection) \
- $(use_enable pango cogl-pango) \
- $(use_enable test unit-tests) \
- --disable-profile
-# $(use_enable doc gtk-doc) \
-# $(use_enable profile)
-}
-
-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() {
- DOCS="NEWS README"
- EXAMPLES="examples/{*.c,*.jpg}"
-
- clutter_src_install
-
- # Remove silly examples-data directory
- rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.0.ebuild,v 1.1 2014/04/27 17:30:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.18.2-r1.ebuild,v 1.1 2014/12/23 22:25:58 eva Exp $
EAPI="5"
CLUTTER_LA_PUNT="yes"
inherit clutter gnome2 multilib virtualx
DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
+HOMEPAGE="http://www.cogl3d.org/"
LICENSE="MIT BSD"
SLOT="1.0/20" # subslot = .so version
# doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+REQUIRED_USE="wayland? ( gles2 )"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
x11-libs/cairo:=
>=x11-libs/gdk-pixbuf-2:2
- x11-libs/libdrm:=
x11-libs/libX11
>=x11-libs/libXcomposite-0.4
x11-libs/libXdamage
media-libs/gst-plugins-base:1.0 )
introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
+ kms? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm:= )
pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+ wayland? (
+ >=dev-libs/wayland-1.1.90
+ media-libs/mesa[egl,wayland] )
"
# before clutter-1.7, cogl was part of clutter
RDEPEND="${COMMON_DEPEND}
"
# Need classic mesa swrast for tests, llvmpipe causes a test failure
-# Fox some reason GL3 conformance test all fails again...
+# For some reason GL3 conformance test all fails again...
RESTRICT="test"
src_prepare() {
}
src_configure() {
- # TODO: think about kms-egl, quartz, sdl, wayland
+ # TODO: think about quartz, sdl
# Prefer gl over gles2 if both are selected
# Profiling needs uprof, which is not available in portage yet, bug #484750
# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
--enable-deprecated \
--enable-gdk-pixbuf \
--enable-glib \
- --disable-gtk-doc \
$(use_enable opengl glx) \
$(use_enable opengl gl) \
$(use_enable gles2) \
$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
$(use_enable gstreamer cogl-gst) \
$(use_enable introspection) \
+ $(use_enable kms kms-egl-platform) \
$(use_enable pango cogl-pango) \
$(use_enable test unit-tests) \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
--disable-profile
-# $(use_enable doc gtk-doc) \
# $(use_enable profile)
}
+++ /dev/null
-From f5ca6733c4389de9a5bd55b51b016ce40b8e983e Mon Sep 17 00:00:00 2001
-From: Damien Lespiau <damien.lespiau@intel.com>
-Date: Fri, 11 May 2012 12:24:29 +0100
-Subject: [PATCH] doc: Remove the inclusion of non-existent cogl-clipping.xml
-
-The API is now gone, so cogl-clipping.xml is not generated.
-
-Reviewed-by: Robert Bragg <robert@linux.intel.com>
-
-(cherry picked from commit ff3956c25676c898948c5c7239c85154564c0e16)
----
- doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
-index 411503f..55c88f7 100644
---- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
-+++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
-@@ -113,7 +113,6 @@
- <xi:include href="xml/cogl-texture-rectangle.xml"/>
- </section>
-
-- <xi:include href="xml/cogl-clipping.xml"/>
- <section id="cogl-framebuffer-apis">
- <title>Framebuffers</title>
- <xi:include href="xml/cogl-framebuffer.xml"/>
---
-1.7.12
-
+++ /dev/null
-From 5efbcc10a3420e26859f8e915f0259a0103b7727 Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Wed, 3 Jul 2013 18:51:53 +0200
-Subject: [PATCH] offscreen: Allocate the framebuffer in
- cogl_offscreen_new_to_texture_full
-
-The API says that it should return NULL on failure but it does not do that
-due to the lazy allocation.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703174
----
- cogl/cogl-framebuffer.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
-index d9ec88d..9649e4d 100644
---- a/cogl/cogl-framebuffer.c
-+++ b/cogl/cogl-framebuffer.c
-@@ -618,6 +618,7 @@ _cogl_offscreen_new_to_texture_full (CoglTexture *texture,
- int level_width;
- int level_height;
- CoglOffscreen *ret;
-+ CoglError *error = NULL;
-
- _COGL_RETURN_VAL_IF_FAIL (cogl_is_texture (texture), NULL);
- _COGL_RETURN_VAL_IF_FAIL (level < _cogl_texture_get_n_levels (texture),
-@@ -649,6 +650,13 @@ _cogl_offscreen_new_to_texture_full (CoglTexture *texture,
-
- _cogl_texture_associate_framebuffer (texture, fb);
-
-+ if (!cogl_framebuffer_allocate (ret, &error))
-+ {
-+ cogl_object_unref (offscreen);
-+ cogl_error_free (error);
-+ ret = NULL;
-+ }
-+
- return ret;
- }
-
---
-1.8.3.1
\ No newline at end of file
<herd>gnome</herd>
<use>
<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+ <flag name="kms">Enable KMS support.</flag>
<flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
integration</flag>
</use>
projects / gentoo.git / commitdiff