diff options
Diffstat (limited to 'media-libs/cogl')
| -rw-r--r-- | media-libs/cogl/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/cogl/Manifest | 12 | ||||
| -rw-r--r-- | media-libs/cogl/cogl-1.14.1_pre20130901-r1.ebuild | 106 | ||||
| -rw-r--r-- | media-libs/cogl/files/cogl-1.14.1-framebuffer-allocate.patch | 42 |
4 files changed, 163 insertions, 6 deletions
diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog index 722540443036..e42a60da308e 100644 --- a/media-libs/cogl/ChangeLog +++ b/media-libs/cogl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/cogl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.37 2013/09/14 09:08:34 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.38 2013/11/04 09:47:59 pacho Exp $ + +*cogl-1.14.1_pre20130901-r1 (04 Nov 2013) + + 04 Nov 2013; Pacho Ramos <pacho@gentoo.org> + +cogl-1.14.1_pre20130901-r1.ebuild, + +files/cogl-1.14.1-framebuffer-allocate.patch: + Try to prevent crashes with nvidia-drivers, upstream bug #703174 14 Sep 2013; Pacho Ramos <pacho@gentoo.org> cogl-1.14.1_pre20130901.ebuild: Profiling needs uprof, which is not available in portage yet, bug #484750; diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest index 77de539ccdf1..39405cc9b3b7 100644 --- a/media-libs/cogl/Manifest +++ b/media-libs/cogl/Manifest @@ -3,6 +3,7 @@ Hash: SHA256 AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24147a1791ca1c4ddc3321052d843512e1eb9d SHA512 ff0d47e5cb2e7533d8f909504c66e07ac405ffb7606675d4bb937201d97d49099e57d2a34522c287e68eff46397fe6e2822e64e0e04a84f40a166c08aea0970a WHIRLPOOL ec8750a39a06fd72ac4e3321a21107fd01702aeedf25d8984bac3ed039a9d388d40c97c87dbafb426d30ba9a090f32009b23a311704dcad56b4ceb40c1129f42 AUX cogl-1.12.2-dont-use-MSAA.patch 1565 SHA256 484e371b7d3b60af0c054bfe8fcd69870a3e1c30de6b1a155937b1da2b11d9cf SHA512 e145ccd45ad2b6e1859c031185d8c5d20a7b0b05bf3ff14cda77ea5822455b78c1324a77007c493a6a8d1670403ad75ab7051527222b5289cebb62bdfcb7411b WHIRLPOOL bf8a4596d4485ae6d61d84d63ed473c0aa5833ac7ca89ea538e8cd271c00f28637a376d805289978d5500c8f059cc6a66ab6cc125f266692048f502f075196a8 +AUX cogl-1.14.1-framebuffer-allocate.patch 1262 SHA256 ff62c540091022aacf65ef65c06c9a93a64a4e2ef0c4b37794e418e108f28a85 SHA512 0738dbad6a88cafa3ea8f500ae424946ac6f78fb4e25f0691eee2a25d7732a5f628de8348a7124cc875a23fe0d6e8c0635f1da07f9340d8a698639024c3288b9 WHIRLPOOL 9346e381d53bbb2c105a66cafef2497d48c4e04bdc138e9ebe192c0758c1e2370db11c07a53412e3183e39d8bad6eef6d3f5b8a7d1215d9b5ae441ba8c3faf4d DIST cogl-1.10.4.tar.xz 1253708 SHA256 0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9 SHA512 bbff0ae9731a12b5f9e493c7dacb8d02fe3289c30c4895fe277959b3e3155095b003b03e7c46a74ed0152916758484e3c305c599e73ceb81fd912ba491dda0ae WHIRLPOOL 65c11ee6eda657add0e0d5068cf8c055202901cb8bb19055d1f7bbe72c54373c3bed83ee3fb84edf6e0a37618d7517f3a38c3e521003c638e9850b09bdc39e82 DIST cogl-1.12.2.tar.xz 1301108 SHA256 31971d4c6543c589f6fc49ab1724dfbdc7062c58a7da842cb1935e32ca6e1d7e SHA512 5bf43434814be4d7beae9dedc0d2d8bc31c174a82386f581d705e2586da93cea930b5b66bb707036a8ed7b49147af003ab7dda125e86098fe3433e9418001b2d WHIRLPOOL f2c6e768f874c06e95c352fa23a3b7d8bacf3a0e05466cc508e690adfc97b9dc1c627f494078a76b883428d1b8b58cd5930be49385ad4c3867843bfe6a0e4b46 DIST cogl-1.14.0.tar.xz 1656520 SHA256 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 SHA512 9e9f34d6dd9954512322ad2478a6ca9bdad60462b1930b39421fdb5f10d3a71ef62ac70d58929fd8448d39dc5a6227f0a895a6f9113bc0ecc83b6c0f26bfb3cb WHIRLPOOL a4f550f722e3c8d748b7008f09d02de5647bcf2f261983ec0cc05eb63dedb8e4950b11ce141ada88506225ad4b4007b1a54e83f972fb80c297411affa7c6f9b5 @@ -10,13 +11,14 @@ DIST cogl-1.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9 EBUILD cogl-1.10.4.ebuild 2686 SHA256 01f3d78f7d9923c75a92b4b80646ed94baa58e044c01eaacb69a73461a9c2080 SHA512 f09233c6605cf2a75b3264c25ea0accfaf1be5715d90d17637bf721bde2fdd73791fb4dbaf589b3d48c8a92f0de299a8f5f52a03615b9148553d3b704b50a6da WHIRLPOOL 602db82a478d0010543d4930d5c77438f0d0d4594d3661895862b67cfed993e940ee0b5a7bb8bad6d1fa6ab2267b3914ee26396c4e35a24d10b7e906b103c5ab EBUILD cogl-1.12.2-r1.ebuild 3307 SHA256 2ad87b95ab76240ec2e825967f7bd9dff601c621276ef759981ab090e2fa688f SHA512 16f605cfc979e50d6fcd71443dee46222b63cfe0cd3bd9a0916acf3bcc5f8770ab670914c2fc9cbdc658f8baeda3bf7aee9e9f4d19fc9cc67c36da14a63c854f WHIRLPOOL 630ae3ecafa72e2e965383afb77c1ca25e41b2bca740591029037f3c0cfcb857ae98ab60c394d8414d10821f4ba4f951676ce7994e9f624fcb7dbe025ddb4e54 EBUILD cogl-1.14.0.ebuild 2832 SHA256 6c59424dc5a3a663a5e7d777793429ee631d7822fb5bce38b208aafba6b55dbb SHA512 dbea28d6816eea7862ea4710740f7e89af97bcde24228dc0bf1d2f9543765acf776119b41e44e07393f4beeefe2fdb8d4e2119992e31afb96eb81ff42eef18db WHIRLPOOL 83a8ff186fec083d12270ba8c3490f2c6e7aa08789ac3bd97fc3bb5db5dcfd82e84463964abcd85c35be0aac12120f66a528b7e35bb3696ff00e26326011ffc9 +EBUILD cogl-1.14.1_pre20130901-r1.ebuild 3344 SHA256 21d9e3d73c812c762968b1270f96cec8828635d52348ac6c065d533815ce0209 SHA512 043605ad80e3d9b331eff36e9acc72a43e94882bd499963e142daaa8c74a6f6900eb00093e6d18f81b2964d583ea01ae133e9cb1d9cf9afb762fe829409ce453 WHIRLPOOL d2e689febd2cc0c2c8c0f667491e6908a3b13638e6b736e8f93d8f2d95a12afdf4ed8e2561cfb4ccad79bfdbe6210cf712368a99a443f240d1773f7b36cbb9a2 EBUILD cogl-1.14.1_pre20130901.ebuild 3172 SHA256 75fa86080401ffb7a7438d7dc1129f71b2d15216062cc6fd4e2f09569b968d26 SHA512 d57f023503b2237c251a320a571d5fdd3c5855bff8eebcfdc8f5f607a5506530ef7033825149938330d8c6ab9a57f2b5f002150b4456b964fc6fb59b75f16887 WHIRLPOOL 2b8a9c31fb8cb8d9220f2ef60e33180af063bfc55a318db5b40b94c9b8351ab5e7ce9020e79798c752672c717bf0d3f7d83ac69ad1ce48379cc214cf8f80bc9b -MISC ChangeLog 5838 SHA256 ae6353fb47ac84fe3a576d5fee1ffc748b5d5be5b447daddc8de36e6f757ed00 SHA512 48b2e1e93e14a33026fe2675865b540f237a4faa7f44cfdf69df0efe52b879152ae713f86b024b70fef397d6a81514d209e153464373f69451a8175eeffa5e60 WHIRLPOOL 678f327d77c7edd0f8be464614b68de8a6ca8b787c58cfb83b4811af2a3458c124c6ba63f968f4f97fa285f5a0d199dd75dcbcd387d5df66cebf4ae13960f238 +MISC ChangeLog 6082 SHA256 00df22e63ad526ab2a3c2f8d14532bf9ba884039c4a9d0dcfae4cbe5d4fa966c SHA512 72746335de4a9705cbaf812c331b948690453794d0631b2aae361bc2a1fec7d3fa55cf05dbb9799a3a342af4e3cd50fc1db7013ea4a3dfd8a697f8b11d7d30a1 WHIRLPOOL 69f01012bf3b921710d697417cd91c53560ecefe16341c2d6e7afb038bb1158d4d4ad1be915c5feabb7a69b84e3b536b346bab4eea11d7f055f08a797f607090 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlI0J5MACgkQCaWpQKGI+9Q7hgCfcRpr2ykp72knh4xDqWEXA4D6 -vmoAn2WlHPHbMSynk3M3JxWgQ76auHYW -=DXTA +iEYEAREIAAYFAlJ3bVEACgkQCaWpQKGI+9Tz6ACeM5EDKBrMbe47SiaHv4DYzV+k +rT8AniBDYjOkxWx0lUWOABqiFBY4EvwQ +=HNRx -----END PGP SIGNATURE----- diff --git a/media-libs/cogl/cogl-1.14.1_pre20130901-r1.ebuild b/media-libs/cogl/cogl-1.14.1_pre20130901-r1.ebuild new file mode 100644 index 000000000000..3958dab29f54 --- /dev/null +++ b/media-libs/cogl/cogl-1.14.1_pre20130901-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.14.1_pre20130901-r1.ebuild,v 1.1 2013/11/04 09:47:59 pacho 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/" + +SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}.tar.xz" + +LICENSE="LGPL-2.1+ FDL-1.1+" +SLOT="1.0/12" # subslot = .so version +# doc and profile disable for now due bugs #484750 and #483332 +IUSE="examples +introspection +opengl gles2 +pango" # 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] ) + + 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 + +S="${WORKDIR}/${PN}-1.14.1" + +src_prepare() { + # Try to prevent crashes with nvidia-drivers, upstream bug #703174 + epatch "${FILESDIR}/${PN}-1.14.1-framebuffer-allocate.patch" + 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 introspection) \ + $(use_enable pango cogl-pango) \ + --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 +} diff --git a/media-libs/cogl/files/cogl-1.14.1-framebuffer-allocate.patch b/media-libs/cogl/files/cogl-1.14.1-framebuffer-allocate.patch new file mode 100644 index 000000000000..c6263a0a9f21 --- /dev/null +++ b/media-libs/cogl/files/cogl-1.14.1-framebuffer-allocate.patch @@ -0,0 +1,42 @@ +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 |