diff options
author | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 20:03:08 -0700 |
---|---|---|
committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 20:03:08 -0700 |
commit | 5af9c64990a3123c5089b2a1d7ccbc7efda9f9a7 (patch) | |
tree | c3829fd01a2f4b158258e690246cae8015075ba0 /media-libs | |
parent | drop kde-base/cantor as upstream no longer has python dependency and version ... (diff) | |
download | gmt-5af9c64990a3123c5089b2a1d7ccbc7efda9f9a7.tar.gz gmt-5af9c64990a3123c5089b2a1d7ccbc7efda9f9a7.tar.bz2 gmt-5af9c64990a3123c5089b2a1d7ccbc7efda9f9a7.zip |
media-libs/cogl-1.16.2-r1: revbump/merge
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/clutter-gst/clutter-gst-2.0.10-r1.ebuild (renamed from media-libs/clutter-gst/clutter-gst-2.0.8-r1.ebuild) | 0 | ||||
-rw-r--r-- | media-libs/cogl/ChangeLog | 30 | ||||
-rw-r--r-- | media-libs/cogl/Manifest | 8 | ||||
-rw-r--r-- | media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild | 115 | ||||
-rw-r--r-- | media-libs/cogl/cogl-1.16.2-r1.ebuild (renamed from media-libs/cogl/cogl-1.16.0-r1.ebuild) | 18 |
5 files changed, 43 insertions, 128 deletions
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.8-r1.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.10-r1.ebuild index 1d82273..1d82273 100644 --- a/media-libs/clutter-gst/clutter-gst-2.0.8-r1.ebuild +++ b/media-libs/clutter-gst/clutter-gst-2.0.10-r1.ebuild diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog index fc7da13..32d0d8e 100644 --- a/media-libs/cogl/ChangeLog +++ b/media-libs/cogl/ChangeLog @@ -1,6 +1,32 @@ # 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.41 2013/12/23 23:28:44 eva Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.48 2014/04/18 11:19:48 pacho Exp $ + + 18 Apr 2014; Pacho Ramos <pacho@gentoo.org> -cogl-1.10.4.ebuild, + -cogl-1.14.1_pre20130901-r1.ebuild, -cogl-1.16.0.ebuild: + Drop old + + 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> cogl-1.16.2.ebuild: + x86 stable, bug 499954 + + 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> cogl-1.16.2.ebuild: + amd64 stable, bug 499954 + + 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> cogl-1.14.1_pre20130901-r1.ebuild, + cogl-1.16.2.ebuild: + Fix wrong commit, bug 502160 + + 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> cogl-1.14.1_pre20130901-r1.ebuild, + cogl-1.16.2.ebuild: + arch stable, bug 888 + +*cogl-1.16.2 (06 Feb 2014) + + 06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +cogl-1.16.2.ebuild: + Version bump. + + 21 Jan 2014; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.16.0.ebuild: + Fix subslot. *cogl-1.16.0 (23 Dec 2013) diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest index e1635be..0394978 100644 --- a/media-libs/cogl/Manifest +++ b/media-libs/cogl/Manifest @@ -1,8 +1,6 @@ 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.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9699a1da21c60fd4c17ff2858060f24642af SHA512 528c799398920804c8f9e7b649822a0b2af7e34ef6ab884be000d7e32d0b1d1134ccbbc824c712b4a1457249bcdf73abe3c6196858be1008b1536447d907bb3e WHIRLPOOL e35ac2db1f16a20f5b6fb125c603587bd217247a0c5971464619434195c1f61e5eafde778931761a68b7abc25c5ed23fddda2e2b6ae0e9354431a65f66bcfc5a -DIST cogl-1.16.0.tar.xz 1653292 SHA256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094 SHA512 d4e65216ad37680a58cd0a018bb2cb53b11d1e51baa2cd10e615812cbe5e1f9cd3365e248be6d84c8266cd3996039fcfb80e315bcc58f59a290555f57c013358 WHIRLPOOL 4fab497e0b7ab771a34dd53749b635bc87f16f8a2298a057497d60f9951ccaa17df200f2c120c57767007bd31c28e020ea58a7f12e2738ed5051f1d5deef164c -EBUILD cogl-1.14.1_pre20130901-r2.ebuild 3885 SHA256 5bc62dcd34c3e3e39d64e3c1a973eb1b113b48bd55bb92d3b4c12605f80ce1cd SHA512 353af1d97503cee193e0f131334c4910693eda462032b04940f4c4bd5f26c1f1eb6bc87e3ed3b965d9f9e4f61af516d009ce5e742983d867c664de7892d18f48 WHIRLPOOL dbbec8b49efe5b38b6e2741f0554ec7f6ab04449cd441c797a5021365255ae0e5e375c3b9ac25d625f89fefa45e31127723abb841469ca394f015a65ff8c3f99 -EBUILD cogl-1.16.0-r1.ebuild 4324 SHA256 9e43900e5d27027c217e660ee65106fa9f77d2af39f7643a0f152b2da119e172 SHA512 2e04ef0c113d7e89a6cf671d543149d2727a4de4e1871e46302dbb9b60e77c8e4ab8dfda1746f8bb44dffd5decf3a5c43b94ee080495afd4327f9547053c6d0f WHIRLPOOL 18bdad270842b83c3f65ae35fee832e5d361e68505b454ec233d6eca187e5f5aee734eb664d936798d88442721a852e7247a009e8c9ffdcc73cde4ba8ffc4224 -MISC ChangeLog 6579 SHA256 d8d0e84f0f23c02215150519c1b553de10b364618fee840fb66d5f0a79cdd117 SHA512 bc6e2e8d8d6b26dc266dd04916f82131211e9c782fc9162eab3cc8b1f5a68290008d685734e0d75fead973dd5ecb17bddf5253ca811487399f10b54c1d8792ef WHIRLPOOL 6fc5795307420aa721c897c17820f3ad6dff011ff31caa0061c76394c715c901b774a00ec2006047948537ab8ca7019608067292f5ad0584a581e4577b32476c +DIST cogl-1.16.2.tar.xz 1647192 SHA256 65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7 SHA512 638aea5a12d5f33d481ac6af767af74acdfcbb3512e38740847f385b38b665a108ae616c5971a38f0055cae5b7d9054075f97e4b18af0464c1a5553c6bc3e815 WHIRLPOOL 7eee8f5dd6cd642d02014950d7263ff8cd766e80abef386f771833c017cd699dceb3cd9f2381a6a861048050ef86747d0bfcb7fe74c2a73f9e594b4e24ec7dbf +EBUILD cogl-1.16.2-r1.ebuild 4562 SHA256 26170bcc0555ea4b081cdb8435ddebaea6b1766d6cf93a4ed7b9ab5226d430fb SHA512 6926dea64c35d5063c09bb8f558754bc4d564773375e0d2e9322f745e56acb093771bb72eb588fed735673fe087b6f658ee6e459d7111e602d103427dfc02a42 WHIRLPOOL 49de9324d82ea47ad1e208fb13158a702881cbdd0ca8e191e81df5c6eca2765e5aa063a467aefad10171752954bc93fbd9ebe975795640cd51fd3c50f8d364c4 +MISC ChangeLog 7377 SHA256 66091bfe60aafe259f3d0f3357ad200ca0fb01a1a0a1bfdb96a213e7bc049f3e SHA512 6ab614be6b1eee478258bd6a7c31011244e0ef2a2ae9e3a5087441f846a6438b2155ec510d97ff7e0dd4fd983a7541d8676e44fbe0239e2ac2100b6d78dc83c4 WHIRLPOOL 64bce75446ec2c6bd8e03e1f01c1f966d4b5d2af01a820a6e8e66992fab7d2c2720180ac14ca76d01b8f0a92db51b6c0e9013a94d3a258515d81b801a63909a5 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c diff --git a/media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild b/media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild deleted file mode 100644 index ca678cb..0000000 --- a/media-libs/cogl/cogl-1.14.1_pre20130901-r2.ebuild +++ /dev/null @@ -1,115 +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 -inherit eutils clutter-multilib gnome2-multilib multilib gtk-doc 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[${MULTILIB_USEDEP}] - x11-libs/cairo:=[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2:2[${MULTILIB_USEDEP}] - x11-libs/libdrm:=[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXcomposite-0.4[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-3[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.2[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] ) - - introspection? ( >=dev-libs/gobject-introspection-1.34.2[${MULTILIB_USEDEP}] ) - pango? ( >=x11-libs/pango-1.20.0[introspection?,${MULTILIB_USEDEP}] ) -" -# 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[${MULTILIB_USEDEP}] - virtual/pkgconfig - test? ( app-admin/eselect-opengl - media-libs/mesa[classic,${MULTILIB_USEDEP}] ) -" -# doc? ( >=dev-util/gtk-doc-1.13 a -# 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-multilib_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-multilib_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 -} - -ehook gnome2-multilib-per-abi-pre_src_test my_abi_src_test -my_abi_src_test() { - LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check - # return one to prevent the normal gnome2-multilib_src_test from occuring - return 1 -} - -src_install() { - DOCS="NEWS" - EXAMPLES="examples/{*.c,*.jpg}" - - clutter-multilib_src_install - - # README is generated so we need to get it from a per-abi build dir - multilib_for_best_abi run_in_build_dir dodoc README - - # Remove silly examples-data directory - rm -rvf "${ED}/usr/share/cogl/examples-data/" || die -} diff --git a/media-libs/cogl/cogl-1.16.0-r1.ebuild b/media-libs/cogl/cogl-1.16.2-r1.ebuild index 1725c30..2626a3b 100644 --- a/media-libs/cogl/cogl-1.16.0-r1.ebuild +++ b/media-libs/cogl/cogl-1.16.2-r1.ebuild @@ -12,7 +12,7 @@ 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/12" # subslot = .so version +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="~amd64" @@ -50,6 +50,8 @@ DEPEND="${COMMON_DEPEND} " # doc? ( >=dev-util/gtk-doc-1.13 ) # Need classic mesa swrast for tests, llvmpipe causes a test failure +# For some reason GL3 conformance tests all fail again... +RESTRICT="test" DOCS=(NEWS) EXAMPLES="examples/{*.c,*.jpg}" @@ -101,12 +103,12 @@ src_configure() { ehook gnome2-multilib-global-pre_src_test maybe_skip_src_test maybe_skip_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 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" - ewarn return 1 fi return 0 @@ -120,13 +122,17 @@ abi_src_test() { return 1 } -ehook clutter-multilib-global-post_src_install remove_silly_examples -remove_silly_examples() { +src_install() { + clutter-multilib_src_install +} + +ehook clutter-multilib-global-post_src_install global_post_install +global_post_install() { # Remove silly examples-data directory rm -rvf "${ED}usr/share/cogl/examples-data/" || die } -ehook clutter-multilib-per-abi-post_src_install install_generated_readme +ehook clutter-multilib-best-abi-post_src_install install_generated_readme install_generated_readme() { dodoc README } |