diff options
author | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-08-14 10:52:25 +0000 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-08-14 10:52:25 +0000 |
commit | 3896b28d73b793cb81ba4ec11e66fb5026cbf1b5 (patch) | |
tree | d548c2efbfa7480eb11ba86f1130a29c71311760 /media-libs/grilo | |
parent | Revision bump. Fixes underlinking, bug 370025 by flameeyes; Adds alsa patches... (diff) | |
download | historical-3896b28d73b793cb81ba4ec11e66fb5026cbf1b5.tar.gz historical-3896b28d73b793cb81ba4ec11e66fb5026cbf1b5.tar.bz2 historical-3896b28d73b793cb81ba4ec11e66fb5026cbf1b5.zip |
Bump to 0.1.16, bug 377651
Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64
Diffstat (limited to 'media-libs/grilo')
-rw-r--r-- | media-libs/grilo/ChangeLog | 10 | ||||
-rw-r--r-- | media-libs/grilo/Manifest | 23 | ||||
-rw-r--r-- | media-libs/grilo/files/grilo-0.1.16-constants.py | 50 | ||||
-rw-r--r-- | media-libs/grilo/files/grilo-0.1.16-fix-automagic-test-ui.patch | 32 | ||||
-rw-r--r-- | media-libs/grilo/files/grilo-0.1.16-media-source-infinite-loop.patch | 48 | ||||
-rw-r--r-- | media-libs/grilo/grilo-0.1.16.ebuild | 83 |
6 files changed, 241 insertions, 5 deletions
diff --git a/media-libs/grilo/ChangeLog b/media-libs/grilo/ChangeLog index 3165c16d2561..6d662427e9ec 100644 --- a/media-libs/grilo/ChangeLog +++ b/media-libs/grilo/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/grilo # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/ChangeLog,v 1.2 2011/06/15 16:37:18 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/ChangeLog,v 1.3 2011/08/14 10:52:25 nirbheek Exp $ + +*grilo-0.1.16 (14 Aug 2011) + + 14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +grilo-0.1.16.ebuild, + +files/grilo-0.1.16-constants.py, + +files/grilo-0.1.16-fix-automagic-test-ui.patch, + +files/grilo-0.1.16-media-source-infinite-loop.patch: + Bump to 0.1.16, bug 377651 15 Jun 2011; Pacho Ramos <pacho@gentoo.org> grilo-0.1.15.ebuild: Prepare to set 'xz' as default compressor for eapi4. diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest index a251916330bc..22c1c66bd8fa 100644 --- a/media-libs/grilo/Manifest +++ b/media-libs/grilo/Manifest @@ -1,15 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX grilo-0.1.16-constants.py 1731 RMD160 212ad196e9ea6cd8723428cc81c8ae566ce9162b SHA1 c095f4d6bb2c74369b150d4b6540cbfb72f5f7d0 SHA256 78bd7ea665746149f8ee3a5919837fbd70a7bab5767f56d905b03af12a72ec9e +AUX grilo-0.1.16-fix-automagic-test-ui.patch 1085 RMD160 6f7b424e3de5d1e9a427794e1a050be086c113a0 SHA1 b478bf98af30e52ccd3a9259494688577bc1600e SHA256 ed4d2d2a907898837db2764cffa79b8a0a119e0bdd301a80936c2464c6a7d7d1 +AUX grilo-0.1.16-media-source-infinite-loop.patch 1757 RMD160 0b44a616e510cb7b0d47c1bed852f9d88e961be8 SHA1 26878a0175e3b6306321498336c8d8dd89339951 SHA256 12baacea54dc8d98482af57daa6f0bb9b6fb7bc8671409c013623bb13ec341e7 DIST grilo-0.1.15-patches-0.1.tar.xz 5836 RMD160 377e94f25ea9acf317f0d8e0d25594f7bfdb1f9f SHA1 57556385753d5aaaf29e7eb3c0997af34f5b0c2f SHA256 13c49a91eab01ba73eb1faf5e2253e0c51c6906eb0dd6e5395963f85176c9e03 DIST grilo-0.1.15.tar.bz2 484976 RMD160 a8f5775632adc1120f6d2c16f77083dd5530dc46 SHA1 2b9905fd308c5bc1fa714d7dbe8841653c2fdd9d SHA256 4276337b56f09c3a448a26e0f41a72812b72faa0e4dbdcc9ab1a314e2c5c7264 +DIST grilo-0.1.16.tar.xz 475812 RMD160 caf93ba9c3cb4f9730bc1051ba27fbcebb7acca9 SHA1 4c3c04a8712882da53457a9d41e6d59a3774e1f8 SHA256 b652ccc6f5693203a46b58f3b6b0449545f38b4f98390b4be8ca0a9434108fa2 EBUILD grilo-0.1.15.ebuild 1690 RMD160 fa13e9c2644266ef17ecf4d080cf770bd17cc79f SHA1 1821bebbd30bcc818caad40672b75728adeecff5 SHA256 bdfb7c6bbae491c131f86991341475795018ab40e4ace4e02cf06b563300e0d5 -MISC ChangeLog 517 RMD160 1e2424f75b635d6da40a862723b3985493976485 SHA1 33b27a0253a0696f5326b897e68630321f0d9422 SHA256 db13e183caa5bf170289b66dfdf136745d4fd6d4686cceedc9b575973d232c68 +EBUILD grilo-0.1.16.ebuild 2091 RMD160 c836f038fa306db3b9bf8db39439be84cc25c0da SHA1 f10104826561bd2c5eb5d4b9be9e14c931e7c3a2 SHA256 6f75f9a69db1a4c6e9d276a86acc2d690aa0baac93f247b7ef3ff3c3075d9cf6 +MISC ChangeLog 798 RMD160 00004ad16c7ec074332106f99ca81c6d4ffce794 SHA1 85df745ceb633ee00f1b63da346d28abc812f6f0 SHA256 3282c9bf5d4cca82e36c6f909b7a9ff2ba94cb8b8ea4c5e1399d8ce0c207e5ca MISC metadata.xml 463 RMD160 49494b01dab885727f79469ad0dd99dda5cb66e1 SHA1 f912806be62fb79ee96241c7c85a91e0f7a21aea SHA256 c59761bb44a453a2db84b13804a4551c1d0c28e262ef90c7ce394b414a0a5ffd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3438MACgkQCaWpQKGI+9RpwwCfTZWPLfYNxsHnFybp8qUfGycQ -9mwAn3a1rYHOJXKILXiP7ZNgiMMBgJeA -=0BIY +iQIcBAEBAgAGBQJOR6juAAoJEO/kOhxWD91kS64QAIMBRns/4Ej0J7p22+jbzwcv +N7hiIVVgbfYi0KMG0xWvjLOryaPhYJQWJQUuOW4cMxcvax8u9p/itmqiDAdftLkc +/ItLl3mAm1FL9VTsYLXG0u2N7xoNG6PB80HWoWiyvnkkbh3a4k7Wr9a5yQ68ohuQ +4d3KxkdynwhjPYoFMNuEhkeWtpwUWnKm/EeRO2wR0Fb327q9APbBH/YupSvhRZVu +YuG7848ZK9gBnLwL+T028IwOniyCNjZjrHzSvfm5LzOxG6INW3Ih2kIRz7dcr98A +orOPVLjiyM+VCXg7/ZaNv+S452kI5tId6/fospNgwZOf0AEiveZLgzsFNt66bCkT +tQSFbu3zxUBecVfQ0dDuqh2WCZRlr1dlux+AMLEi0HltEhgDp5hA7by7OQARDyid +lTObf6Q+vmo2Gq2iOkxnnqoceiobRAV5nNef+dadt9BrB3wb4UZSR3dAtmU9+Pgm +c1r1JL/0AII9nalDTb/oaRt3cg4BihJ96qApK2DpX7Fy2bSoJGTMLKgqiwdz/DTb +Z/xbiSpFe4Eq5dIp+voBgEPpJvaB78dWQb30Q7C1sG4ZFg5GSj87ig9aDE8pTSdz +YlPne/Gv0Z4SzKCtpIgaeYxcNHK1cju9p5HArtQXj4Lc+3ALRi8vYNpPwur1VJXW +hAXL9rTf6QU4ApEFUk1N +=wBAT -----END PGP SIGNATURE----- diff --git a/media-libs/grilo/files/grilo-0.1.16-constants.py b/media-libs/grilo/files/grilo-0.1.16-constants.py new file mode 100644 index 000000000000..e8e26906a79f --- /dev/null +++ b/media-libs/grilo/files/grilo-0.1.16-constants.py @@ -0,0 +1,50 @@ +KEY_NONEXISTING = 'nonexisting-key' +KEY_ALBUM = 'album' +KEY_ARTIST = 'artist' +KEY_AUTHOR = 'author' +KEY_BITRATE = 'bitrate' +KEY_CERTIFICATE = 'certificate' +KEY_CHILDCOUNT = 'childcount' +KEY_DATE = 'date' +KEY_DESCRIPTION = 'description' +KEY_DURATION = 'duration' +KEY_EXTERNAL_PLAYER = 'external-player' +KEY_EXTERNAL_URL = 'external-url' +KEY_FRAMERATE = 'framerate' +KEY_GENRE = 'genre' +KEY_HEIGHT = 'height' +KEY_ID = 'id' +KEY_LAST_PLAYED = 'last-played' +KEY_LAST_POSITION = 'last-position' +KEY_LICENSE = 'license' +KEY_LYRICS = 'lyrics' +KEY_MIME = 'mime' +KEY_PLAY_COUNT = 'play-count' +KEY_RATING = 'rating' +KEY_SITE = 'site' +KEY_SOURCE = 'source' +KEY_STUDIO = 'studio' +KEY_THUMBNAIL = 'thumbnail' +KEY_TITLE = 'title' +KEY_URL = 'url' +KEY_WIDTH = 'width' + +REGISTERED_KEYS = [KEY_ALBUM, KEY_ARTIST, KEY_AUTHOR, KEY_BITRATE, + KEY_CERTIFICATE, KEY_CHILDCOUNT, KEY_DATE, + KEY_DESCRIPTION, KEY_DURATION, KEY_EXTERNAL_PLAYER, + KEY_EXTERNAL_URL, KEY_FRAMERATE, KEY_GENRE, KEY_HEIGHT, + KEY_ID, KEY_LAST_PLAYED, KEY_LAST_POSITION, KEY_LICENSE, + KEY_LYRICS, KEY_MIME, KEY_PLAY_COUNT, KEY_RATING, + KEY_SITE, KEY_SOURCE, KEY_STUDIO, KEY_THUMBNAIL, + KEY_TITLE, KEY_URL, KEY_WIDTH] + +SUPPORTED_OPS = [] +try: + from gi.repository import Grl + SUPPORTED_OPS = [Grl.SupportedOps.NONE, Grl.SupportedOps.METADATA, + Grl.SupportedOps.RESOLVE, Grl.SupportedOps.BROWSE, + Grl.SupportedOps.SEARCH, Grl.SupportedOps.QUERY, + Grl.SupportedOps.STORE, Grl.SupportedOps.STORE_PARENT, + Grl.SupportedOps.REMOVE, Grl.SupportedOps.SET_METADATA] +except: + pass diff --git a/media-libs/grilo/files/grilo-0.1.16-fix-automagic-test-ui.patch b/media-libs/grilo/files/grilo-0.1.16-fix-automagic-test-ui.patch new file mode 100644 index 000000000000..64ae0c3b31c2 --- /dev/null +++ b/media-libs/grilo/files/grilo-0.1.16-fix-automagic-test-ui.patch @@ -0,0 +1,32 @@ +--- configure.ac ++++ configure.ac +@@ -104,12 +104,25 @@ + # UI Tool + # ---------------------------------------------------------- + +-gtkver="gtk+-3.0" +-PKG_CHECK_EXISTS([gtk+-3.0 >= 3.0], [gtkver="gtk+-3.0"], [gtkver="gtk+-2.0"]) +- +-PKG_CHECK_MODULES([GTU], [ ${gtkver} ], ++PKG_CHECK_MODULES([GTU], [ gtk+-3.0 >= 3.0 ], + [ BUILD_GRILO_TEST_UI=yes ], + [ BUILD_GRILO_TEST_UI=no ]) ++AC_ARG_ENABLE([test_ui], ++ AS_HELP_STRING([--enable-test-ui], ++ [Enable Grilo Test UI (default: auto)]), ++ [ ++ case "$enableval" in ++ yes) ++ if test "x$BUILD_GRILO_TEST_UI" = "xno"; then ++ AC_MSG_ERROR([gtk+-3.0 >= 3.0 not found, install it ++ or use --disable-test-ui]) ++ fi ++ ;; ++ no) ++ BUILD_GRILO_TEST_UI=no ++ ;; ++ esac ++ ]) + + AM_CONDITIONAL(BUILD_GRILO_TEST_UI, test "x$BUILD_GRILO_TEST_UI" = "xyes") + diff --git a/media-libs/grilo/files/grilo-0.1.16-media-source-infinite-loop.patch b/media-libs/grilo/files/grilo-0.1.16-media-source-infinite-loop.patch new file mode 100644 index 000000000000..755faac9d2af --- /dev/null +++ b/media-libs/grilo/files/grilo-0.1.16-media-source-infinite-loop.patch @@ -0,0 +1,48 @@ +From df228459d4332f3cb675d28d1d4185ae22929b81 Mon Sep 17 00:00:00 2001 +From: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com> +Date: Wed, 29 Jun 2011 13:13:38 +0000 +Subject: media-source: manage end of search/browse with splitted sources + +When running in splitted modes (usually when dealing with websites), +if you get less results than what the user would like to get, we +currently end up in an infinite loop with the core of grilo keeping +asking for new items from a source which can't deliver anymore. + +To manage this specific case, we just check whether the plugin has +returned a remaining results number equals to 0 as well as a null +item. + +Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com> +--- +diff --git a/src/grl-media-source.c b/src/grl-media-source.c +index 459e29c..00494c3 100644 +--- a/src/grl-media-source.c ++++ b/src/grl-media-source.c +@@ -643,8 +643,6 @@ browse_result_relay_cb (GrlMediaSource *source, + + brc = (struct BrowseRelayCb *) user_data; + +- plugin_remaining = remaining; +- + /* --- operation cancel management --- */ + + /* Check if operation is still valid , otherwise do not emit the result +@@ -697,9 +695,13 @@ browse_result_relay_cb (GrlMediaSource *source, + as_info->count--; + as_info->chunk_consumed++; + +- /* FIXME: If we received less than we requested we should +- not do an extra query */ +- remaining = as_info->count; ++ /* When auto split, if less results than what a chunk should give, ++ * that means we've reached the end of the results. */ ++ if ((plugin_remaining == 0) && ++ (as_info->chunk_consumed < as_info->chunk_requested)) ++ remaining = 0; ++ else ++ remaining = as_info->count; + } + + /* --- relay operation --- */ +-- +cgit v0.9 diff --git a/media-libs/grilo/grilo-0.1.16.ebuild b/media-libs/grilo/grilo-0.1.16.ebuild new file mode 100644 index 000000000000..685275adafcf --- /dev/null +++ b/media-libs/grilo/grilo-0.1.16.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/grilo/grilo-0.1.16.ebuild,v 1.1 2011/08/14 10:52:25 nirbheek Exp $ + +EAPI="4" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="A framework for easy media discovery and browsing" +HOMEPAGE="https://live.gnome.org/Grilo" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples +introspection +network test test-ui vala" + +RDEPEND=" + >=dev-libs/glib-2.22:2 + dev-libs/libxml2:2 + network? ( >=net-libs/libsoup-2.33.4:2.4 ) + test-ui? ( >=x11-libs/gtk+-3.0:3 ) + introspection? ( >=dev-libs/gobject-introspection-0.9 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1.10 ) + vala? ( dev-lang/vala:0.12[vapigen] ) + test? ( + dev-python/pygobject:2[introspection?] + media-plugins/grilo-plugins )" + +# Tests fail horribly, but return 0 +RESTRICT="test" + +pkg_setup() { + DOCS="AUTHORS NEWS README TODO" + # --enable-debug only changes CFLAGS, useless for us + G2CONF="${G2CONF} + --disable-maintainer-mode + --disable-static + --disable-debug + VALAC=$(type -P valac-0.12) + VALA_GEN_INTROSPECT=$(type -P vala-gen-introspect-0.12) + VAPIGEN=$(type -P vapigen-0.12) + $(use_enable introspection) + $(use_enable network grl-net) + $(use_enable test tests) + $(use_enable test-ui) + $(use_enable vala)" +} + +src_prepare() { + # Don't build examples + sed -e '/SUBDIRS/s/examples//' \ + -i Makefile.am -i Makefile.in || die + + # Various patches from upstream trunk + epatch "${FILESDIR}/${P}-media-source-infinite-loop.patch" + + # Fix Test-UI automagic gtk2/gtk3 selection + epatch "${FILESDIR}/${PN}-0.1.16-fix-automagic-test-ui.patch" + + # Build system doesn't install this file with the tarball + cp "${FILESDIR}/${PN}-0.1.16-constants.py" "${S}/tests/python/constants.py" + eautoreconf + + gnome2_src_prepare +} + +src_test() { + cd tests/ + emake check +} + +src_install() { + gnome2_src_install + + if use examples; then + # Install example code + insinto /usr/share/doc/${PF}/examples + doins "${S}"/examples/*.c + fi +} |