diff options
author | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 20:16:47 -0700 |
---|---|---|
committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 20:16:47 -0700 |
commit | 80b1210446f3c88ac669b85995c0b81a0cef4346 (patch) | |
tree | c3cc71763139685cb64358208ef796748ddbfff0 /media-libs | |
parent | media-libs/cogl-1.16.2-r1: revbump/merge (diff) | |
download | gmt-80b1210446f3c88ac669b85995c0b81a0cef4346.tar.gz gmt-80b1210446f3c88ac669b85995c0b81a0cef4346.tar.bz2 gmt-80b1210446f3c88ac669b85995c0b81a0cef4346.zip |
media-libs/clutter-1.16.4-r2: revbump/multilibutize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/clutter/ChangeLog | 31 | ||||
-rw-r--r-- | media-libs/clutter/Manifest | 9 | ||||
-rw-r--r-- | media-libs/clutter/clutter-1.16.2-r1.ebuild | 109 | ||||
-rw-r--r-- | media-libs/clutter/clutter-1.16.4-r2.ebuild (renamed from media-libs/clutter/clutter-1.14.6-r1.ebuild) | 29 | ||||
-rw-r--r-- | media-libs/clutter/files/clutter-1.16.4-buffer-age.patch | 34 |
5 files changed, 83 insertions, 129 deletions
diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog index af046fc..8098abf 100644 --- a/media-libs/clutter/ChangeLog +++ b/media-libs/clutter/ChangeLog @@ -1,6 +1,33 @@ # ChangeLog for media-libs/clutter -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.77 2013/12/24 17:22:19 pacho Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.84 2014/04/18 11:24:51 pacho Exp $ + + 18 Apr 2014; Pacho Ramos <pacho@gentoo.org> -clutter-1.12.2.ebuild, + -clutter-1.14.6.ebuild, -clutter-1.16.4.ebuild: + drop old + + 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> clutter-1.16.4-r1.ebuild: + x86 stable, bug 499954 + + 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> clutter-1.16.4-r1.ebuild: + amd64 stable, bug 499954 + +*clutter-1.16.4-r1 (08 Mar 2014) + + 08 Mar 2014; Pacho Ramos <pacho@gentoo.org> +clutter-1.16.4-r1.ebuild, + +files/clutter-1.16.4-buffer-age.patch, -clutter-1.16.2.ebuild: + Avoid screen flickering with nvidia drivers (#503560 by brutester), drop old. + + 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> clutter-1.16.4.ebuild: + Fix wrong commit, bug 502160 + + 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> clutter-1.16.4.ebuild: + arch stable, bug 888 + +*clutter-1.16.4 (06 Feb 2014) + + 06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +clutter-1.16.4.ebuild: + Version bump. *clutter-1.16.2 (24 Dec 2013) diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest index eaac665..2886681 100644 --- a/media-libs/clutter/Manifest +++ b/media-libs/clutter/Manifest @@ -1,6 +1,5 @@ -DIST clutter-1.14.6.tar.xz 5184056 SHA256 bbfac240e22f41a4f21dd0de6b697abcde198c911a612179ec52ecf11ded07fa SHA512 f6a31da5234f2a0369043bf6ac2fabdd20a3d27944c4514b887d4ca9e3a070a5db4e0fc3483eb250194e0e80af163fa44015b2d4cc114b8bbf23c093e8caa2c0 WHIRLPOOL 206210b471f1692c5f190f9a6d03a0f472fd2a841b041cc4e6cb07efca3745bb3d5a0ea9ec907745bc6fcdfcb45759cbfa0bc43bb4658f9e56577ca49e2c811f -DIST clutter-1.16.2.tar.xz 5214020 SHA256 0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42 SHA512 c2208f0b256e9d160e4a1c2339b3ca1a30b8e96c5e65b4f5413870b489c6e2058e2aa8dad4b763948aa44beeeb28ee7f3237701a249cf97c095e0119e439c9f9 WHIRLPOOL cc57ab0d65ad9027f8ef327fff0f76164c25689484075c54e37984269c5ae80e12098f278be896a5f7090d5fc924863b53e7dbd31b4f9064a62cb90281e68b8d -EBUILD clutter-1.14.6-r1.ebuild 3328 SHA256 9478fbca67ae9e4a0b2884e97d068de5e1201d35705f31ada5575c23fe7e3a71 SHA512 d8375431a844c20b3b2a6ee280e72367c9df3ec95cd6cd6235e29de38fd7313ce9a17bf58a2bae62ce88f37414dcdedad5d0cfc571de9153163638b84b4053ce WHIRLPOOL fdcf4ae6597cd078b8aac59f024f3bf347154a08bee10f7e5fc4c2f919605fe1a9d5981455ff01476be93bc5d1b50d2dba631335d1f29ad2a833af39753419bb -EBUILD clutter-1.16.2-r1.ebuild 2902 SHA256 4e467cdbd65944f842ca4b71ef327df6b92b508a273af288ad1441118ed9f705 SHA512 543aa5e5ee07fea7a85e80e6149f54000af87d3bd027c132c6c9184cc0f7f8afad8e876bf2ab2b9bf7a1e55dc56c16093754aeb0aaefd38e2025c323f45ef1fa WHIRLPOOL 4783eeb26ed56d1f86be63f23e0bc2345f91a9c78477c81b0038e0d1d3fb5c50b87633bb783f9dedb4967b32ff6ec2af62e15b5c596d6be15a9aa57e95f75af0 -MISC ChangeLog 12602 SHA256 c69e627794d6d7be94d6e54c9cd5682f7613886e5ffe4b6dfc711fb073046415 SHA512 c38d068e4af268d69746891ec45e7b9577d87cde6333ed1daaeadc3cc7eca8e0624aa9f389669325bd4ba2433cedeae13309b08d5eba0fef80976db6eefee8ca WHIRLPOOL d9553d09f8098b95ba88db6da24e546d64bb1972a1705dcac2a06b0d59e50ebc160a6bcc8a54376d7487445e39e5b6bc2b9f344b02a48df07057c4c7f74e3589 +AUX clutter-1.16.4-buffer-age.patch 1565 SHA256 e254b26663c88dfba756934f011451c0551e52bb70e2de037835aea267ed7bda SHA512 17c89a67f0d4db00cc0d9bb329b197b3a7ab08d4718d9b832644e482d6849b5dbcc82d494d911bcd39eaed1546c74a30fae23706c543906c41f67088251ec356 WHIRLPOOL 7ed910e52b47c878bfa456f039cb92ca1a3103224163f11575e8580511ed8ecc31e3767195c97a05112a94c8ec99de465ba87ed3d88357097a7631a45b560ad6 +DIST clutter-1.16.4.tar.xz 5224132 SHA256 cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65 SHA512 2629d3dd56af75066a42e71569b5a5bb1bb63c0ce1296d8fca20e04f44a339489f77c071a5afc38c19b8ae5206f69c05c940e865b222f766161d92ed48f144c8 WHIRLPOOL 045d61bb78f4350e5a7c40cbb591253a194361f96916e3aa28318f5560b71fcf838cb0e21e6cf91fe5d19ef19963cc7f82d72888f7b9b67e6cde3115794eece6 +EBUILD clutter-1.16.4-r2.ebuild 3415 SHA256 28d3ddf622b856d169897cbfd49f2e82e2a1f5a5f38dc379b0df179213b35622 SHA512 583c070e2d836cecf6df49ec911fb47c4d17fbc1ebfe9faaea08c494d80c86c37b997c457bb4b7d4736123e356d3ff050b0abd2f0b6093290ba6c4329bf0f997 WHIRLPOOL 9c6e0381612c6f7e5e0f35f30e780f3d2a4662ab828a8b7187371a8f9be875c1478ca374343718b05b17d2818130feb7a57057db5b951733675605d180a75623 +MISC ChangeLog 13506 SHA256 45909dddefe29666aa69df968ed4d48d07171e1f1e6cb026a38f7f5ca2b8680c SHA512 21a59c78af31b6e1839fc3270aa9cabcc3ac17fb648697802d467b2049a77a16bf5ce2ca928c3b7a46173b0021da7ea74bf4241f6349ee68276955a5a7422658 WHIRLPOOL 63fe723c05a6517714b743ecaacfdcc5e436534e826a6924ceef795ada70cee0925c0c49d8e96d1acfb2e87f491b052c856986fecc11e344e803ffa9a5ba7884 MISC metadata.xml 277 SHA256 7eb2ab11288fed65f3083eb88772f16ee9be5eb9d955aac3fdec7a22844e23b8 SHA512 b00a33228a347399f5ca4196f8c246663034543aaf2d6a285f33fb7c01ffed1304205e4316656177a28a730640b48b92290f84138cf2631ed8606c4320f3c372 WHIRLPOOL 7673455902c0e45cdc27b25661eecf106d65973590b6b82af90911a60d8f865b03ebb8e0f1292e23027b21f4c78dcc00d4abb9b47dc23785f5d60c9ef0c5ae22 diff --git a/media-libs/clutter/clutter-1.16.2-r1.ebuild b/media-libs/clutter/clutter-1.16.2-r1.ebuild deleted file mode 100644 index da4ee38..0000000 --- a/media-libs/clutter/clutter-1.16.2-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -CLUTTER_LA_PUNT="yes" - -# Inherit gnome2 after clutter to download sources from gnome.org -# since clutter-project.org doesn't provide .xz tarballs -inherit clutter gnome2 virtualx - -DESCRIPTION="Clutter is a library for creating graphical user interfaces" - -LICENSE="LGPL-2.1+ FDL-1.1+" -SLOT="1.0" -IUSE="debug doc gtk +introspection test" # evdev tslib -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -# NOTE: glx flavour uses libdrm + >=mesa-7.3 -# XXX: uprof needed for profiling -# >=libX11-1.3.1 needed for X Generic Event support -RDEPEND=" - >=dev-libs/glib-2.37.3:2 - >=dev-libs/atk-2.5.3[introspection?] - >=dev-libs/json-glib-0.12[introspection?] - >=media-libs/cogl-1.15.9:1.0=[introspection?,pango] - media-libs/fontconfig - >=x11-libs/cairo-1.10:=[glib] - >=x11-libs/pango-1.30[introspection?] - - virtual/opengl - x11-libs/libdrm:= - >=x11-libs/libX11-1.3.1 - x11-libs/libXext - x11-libs/libXdamage - x11-proto/inputproto - >=x11-libs/libXi-1.3 - >=x11-libs/libXcomposite-0.4 - - gtk? ( >=x11-libs/gtk+-3.3.18:3 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.15 - virtual/pkgconfig - >=sys-devel/gettext-0.17 - doc? ( - >=dev-util/gtk-doc-1.15 - >=app-text/docbook-sgml-utils-0.6.14[jadetex] - dev-libs/libxslt ) - test? ( x11-libs/gdk-pixbuf )" - -# Tests fail with both swrast and llvmpipe -# They pass under r600g or i965, so the bug is in mesa -#RESTRICT="test" - -src_prepare() { - # We only need conformance tests, the rest are useless for us - sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \ - -i tests/Makefile.am || die "am tests sed failed" - sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility data conform/g' \ - -i tests/Makefile.in || die "in tests sed failed" - - gnome2_src_prepare -} - -src_configure() { - DOCS="README NEWS ChangeLog*" - - # XXX: Conformance test suite (and clutter itself) does not work under Xvfb - # (GLX error blabla) - # XXX: Profiling, coverage disabled for now - # XXX: What about cex100/egl/osx/wayland/win32 backends? - # XXX: evdev/tslib input seem to be experimental? - gnome2_src_configure \ - --enable-xinput \ - --enable-x11-backend=yes \ - --disable-profile \ - --disable-maintainer-flags \ - --disable-gcov \ - --disable-cex100-backend \ - --disable-egl-backend \ - --disable-quartz-backend \ - --disable-wayland-backend \ - --disable-win32-backend \ - --disable-tslib-input \ - --disable-evdev-input \ - $(usex debug --enable-debug=yes --enable-debug=minimum) \ - $(use_enable doc docs) \ - $(use_enable gtk gdk-backend) \ - $(use_enable introspection) \ - $(use_enable test conformance) \ - $(use_enable test gdk-pixbuf) -} - -src_compile() { - default - if use test; then - emake -C tests/conform - fi -} - -src_test() { - Xemake check -} - -src_install() { - clutter_src_install -} diff --git a/media-libs/clutter/clutter-1.14.6-r1.ebuild b/media-libs/clutter/clutter-1.16.4-r2.ebuild index daa0042..cb5b7e1 100644 --- a/media-libs/clutter/clutter-1.14.6-r1.ebuild +++ b/media-libs/clutter/clutter-1.16.4-r2.ebuild @@ -5,9 +5,9 @@ EAPI="5" CLUTTER_LA_PUNT="yes" -# Inherit gnome2-multilib after clutter-multilib to download sources -# from gnome.org since clutter-project.org doesn't provide .xz tarballs -inherit clutter-multilib gnome2-multilib virtualx +# Inherit gnome2 after clutter to download sources from gnome.org +# since clutter-project.org doesn't provide .xz tarballs +inherit gtk-doc clutter-multilib eutils gnome2-multilib virtualx DESCRIPTION="Clutter is a library for creating graphical user interfaces" @@ -20,10 +20,10 @@ KEYWORDS="~amd64" # XXX: uprof needed for profiling # >=libX11-1.3.1 needed for X Generic Event support RDEPEND=" - >=dev-libs/glib-2.31.19:2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.37.3:2[${MULTILIB_USEDEP}] >=dev-libs/atk-2.5.3[introspection?,${MULTILIB_USEDEP}] >=dev-libs/json-glib-0.12[introspection?,${MULTILIB_USEDEP}] - >=media-libs/cogl-1.14.0:1.0=[introspection?,pango,${MULTILIB_USEDEP}] + >=media-libs/cogl-1.15.9:1.0=[introspection?,pango,${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.10:=[glib,${MULTILIB_USEDEP}] >=x11-libs/pango-1.30[introspection?,${MULTILIB_USEDEP}] @@ -35,7 +35,6 @@ RDEPEND=" x11-libs/libXdamage[${MULTILIB_USEDEP}] x11-proto/inputproto[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-3[${MULTILIB_USEDEP}] >=x11-libs/libXcomposite-0.4[${MULTILIB_USEDEP}] gtk? ( >=x11-libs/gtk+-3.3.18:3[${MULTILIB_USEDEP}] ) @@ -55,20 +54,21 @@ DEPEND="${RDEPEND} # They pass under r600g or i965, so the bug is in mesa RESTRICT="test" -AUTOTOOLS_TEST_MAKE=Xemake - src_prepare() { # We only need conformance tests, the rest are useless for us - sed -e 's/^\(SUBDIRS =\).*/\1/g' \ + sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \ -i tests/Makefile.am || die "am tests sed failed" - sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \ + sed -e 's/^\(SUBDIRS =\)[^\]*/\1 accessibility data conform/g' \ -i tests/Makefile.in || die "in tests sed failed" + # Fix buffer_age code-path, bug #503560 + epatch "${FILESDIR}/${P}-buffer-age.patch" + gnome2-multilib_src_prepare } src_configure() { - DOCS=(README NEWS ChangeLog*) + DOCS="README NEWS ChangeLog*" # XXX: Conformance test suite (and clutter itself) does not work under Xvfb # (GLX error blabla) @@ -89,9 +89,9 @@ src_configure() { --disable-tslib-input \ --disable-evdev-input \ $(usex debug --enable-debug=yes --enable-debug=minimum) \ + $(use_enable doc docs) \ $(use_enable gtk gdk-backend) \ $(use_enable introspection) \ - $(use_enable doc docs) \ $(use_enable test conformance) \ $(use_enable test gdk-pixbuf) } @@ -103,7 +103,10 @@ src_compile() { fi } +src_test() { + multilib_foreach_abi Xemake check +} + src_install() { clutter-multilib_src_install - gnome2-multilib_src_install } diff --git a/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch b/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch new file mode 100644 index 0000000..c42101e --- /dev/null +++ b/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch @@ -0,0 +1,34 @@ +From 6665f47d66a871b6e1a5f4200282f42da043a0e8 Mon Sep 17 00:00:00 2001 +From: Adel Gadllah <adel.gadllah@gmail.com> +Date: Sun, 16 Feb 2014 21:07:43 +0000 +Subject: stage-cogl: Fix buffer_age code path + +Currently we where checking whether the damage_history list contains +more or equal then buffer_age entries. This is wrong because we prepend +our current clip to the list just before the check. + +Fix that to check whether we have more entries instead of more or equal. + +https://bugzilla.gnome.org/show_bug.cgi?id=724788 +--- +diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c +index 86546b1..cff8444 100644 +--- a/clutter/cogl/clutter-stage-cogl.c ++++ b/clutter/cogl/clutter-stage-cogl.c +@@ -483,11 +483,12 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window) + + stage_cogl->damage_history = g_slist_prepend (stage_cogl->damage_history, current_damage); + +- if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) >= age) ++ if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) > age) + { + int i = 0; + GSList *tmp = NULL; +- for (tmp = stage_cogl->damage_history; tmp; tmp = tmp->next) ++ /* We skip the first entry because it is the clip_region itself */ ++ for (tmp = stage_cogl->damage_history->next; tmp; tmp = tmp->next) + { + _clutter_util_rectangle_union (clip_region, tmp->data, clip_region); + i++; +-- +cgit v0.9.2 |