diff options
Diffstat (limited to 'media-video/totem')
16 files changed, 128 insertions, 960 deletions
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index bc5474c09c6a..a1aab0f4350a 100644 --- a/media-video/totem/ChangeLog +++ b/media-video/totem/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for media-video/totem # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.302 2010/10/17 15:36:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.303 2010/11/19 19:04:22 eva Exp $ + +*totem-2.32.0 (19 Nov 2010) + + 19 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> + -files/totem-2.26.3-youtube-plugin-404-error.patch, + -files/totem-2.26.4-youtube-plug-play-vids.patch, -totem-2.26.5-r1.ebuild, + -files/totem-2.26.5-firefox-plugin-apple-trailers.patch, + -totem-2.28.5-r3.ebuild, -totem-2.28.6.ebuild, -totem-2.30.0-r1.ebuild, + -files/totem-2.30.1-fix-constant-buffering.patch, + -files/totem-2.30.1-fix-gmp-plugin.patch, + -files/totem-2.30.1-fix-pygtk-include.patch, + -files/totem-2.30.1-fix-qt-eos.patch, totem-2.30.2.ebuild, + +totem-2.32.0.ebuild, +files/totem-2.32.0-smclient-target-detection.patch, + metadata.xml: + Version bump for Gnome 2.32. Youtube plugin updates, de-interlacing support, + support for WebM, RGBA gtk+ themes support. Update various API usage. Clean + up old revisions. Update dbus-glib dependency, bug #340295. 17 Oct 2010; Raúl Porcel <armin76@gentoo.org> totem-2.30.2.ebuild: alpha/ia64/sparc stable wrt #324077 diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index 6595a84f8ba5..5df92d64c7e5 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,24 +1,11 @@ AUX totem-2.26.1-smclient-target-detection.patch 1420 RMD160 4808f108ff486f5dc992ce3ea7aa1ac5d0e463da SHA1 d56ea9d8bbe96cd2edf0c68607732d4a8345c29e SHA256 5270fdce107cf60566bcd3a3eac49edeb85307503cc5228bad8ddbfbfcb695b3 -AUX totem-2.26.3-youtube-plugin-404-error.patch 1050 RMD160 4c570c8d9a8479cb483826cee7e638cb857d6004 SHA1 038aa80f3ab24130987e8d329dca931147e931c9 SHA256 c9e3e054c3e220281e457c39e1a5b0a4f352b4bd9baac557c5c5d5f5c4e3cb6a -AUX totem-2.26.4-youtube-plug-play-vids.patch 888 RMD160 b4e28b2818aa588e257cf5b6ddfb4955e22fad69 SHA1 18148eaaef258e57d7327a538bb3320cf530b09a SHA256 c123f6d9693ad2ace3154771e2e935b361ed7d43b5139a9748754f0782a118b7 -AUX totem-2.26.5-firefox-plugin-apple-trailers.patch 2690 RMD160 647f88df1373c20b1034caa746b456f910afd34f SHA1 a925115dcc1c33b397c0cb2ea561c5a48f402471 SHA256 e89197f6c20c6a525f3c60ade071b918efeaba4fb9178f859a733a72e8bd6e85 -AUX totem-2.30.1-fix-constant-buffering.patch 3505 RMD160 18fb37136caba330089fa93ee8fdda4c2deb210a SHA1 615a9575f78f9b33712cc0d15e77ac5a35ee9310 SHA256 e338bb7de097452b5a78ecd74ea94a9d81c4f82eb914ca761c1b76cc452421a9 -AUX totem-2.30.1-fix-gmp-plugin.patch 2659 RMD160 98ea3e484960fb15edc2df76842427bfd70d0a5b SHA1 d4d69b338aa476cc77ec802530376b42ca9ef3f9 SHA256 21dde71ce2807841f369d600f5d0e1369af9ad580e9396c66d4d0fd3d922ccd0 -AUX totem-2.30.1-fix-pygtk-include.patch 1426 RMD160 e4a186bafe7b00340f82937c145e6412021e485e SHA1 10464e94e1b77c2489d6ff5a667f80cdf6dc1d4b SHA256 b72260c8993860d6639e5524445b653b41bc4b756378b66a06e343c65f700345 -AUX totem-2.30.1-fix-qt-eos.patch 1199 RMD160 1d4e0d09ea5581a2c0670eca85a2b7a8e10743b3 SHA1 a0d7fcd8fbed625b31458b65cc63710dbe810ed0 SHA256 eb5bf9646e12b980e2fc0ab44338cddf1bd7be6058c4afe6d2413907f708de1a AUX totem-2.30.2-init-gtype.patch 1151 RMD160 28bd7af45d8c60116376f033826cc210749be37b SHA1 7a673ff6ea08c12c5feb732c6689a24943c19223 SHA256 dc4b416de302517259806906ae232540b1d70ebe425876b7fe8c531f4a2a5da3 AUX totem-2.30.2-mp2t-support.patch 522 RMD160 098ad431572647b1f84fa53d79e599dd68db479f SHA1 c1f437b3dd864589b2a8d45aa5b58087ad164edb SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963 AUX totem-2.30.2-webm-support.patch 1066 RMD160 8d93785ff22c688ec8698f32f6a0d6f5ad5c33b7 SHA1 2c5610c985d1b763eef1509fb32cad5d2b9a7c1e SHA256 d2de14ada3573eb055c9987676e60d83365b43d114fb7ace84443c5da473cceb -DIST totem-2.26.5.tar.bz2 3198042 RMD160 174e91dad2f51c908e4b777e93003c6888fd2829 SHA1 34c4a701f1cee440b397ead761de56e08ce97da1 SHA256 33c69497eff649d86b0a710aee7a3b3cbc7cb79c55267bac88a591d62a6ffb3c -DIST totem-2.28.5-patches.tar.bz2 11640 RMD160 aad39ff2ae08afef567150c9f1500083de9972c6 SHA1 e59c0f614a24741e7b0095cee7a5e5563b4db3c4 SHA256 e2fb840164b2be1bbcf18d97e52e5606cf280306373305b58d128e899367eaf0 -DIST totem-2.28.5.tar.bz2 3083946 RMD160 20fa09187a82380d7b7d19c2fb5e8a5a4475307e SHA1 1653528d66a1f11da4bc8f66746828c4a31343d6 SHA256 c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063 -DIST totem-2.28.6.tar.bz2 3086945 RMD160 cae977bf11f512855ab4abbeb055edc149035eb9 SHA1 94037b3b55c241ae7471a746ed9713f714211088 SHA256 224608c9340f7b3839641327feaa41c4941970f085d5cbec5020d968555d06cb -DIST totem-2.30.0.tar.bz2 3212210 RMD160 4444cbd39ba448a392c089c36d47d865410e5206 SHA1 d8456c879e5858464cf81a5ac973e44c19ade863 SHA256 9d8edd266bd2546e4c8034de1196b79855e24a3634d05cc4f8a07fd3edc7b1af +AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c819fa0be5844b2797d7fdbd SHA1 103b3182229b54e5b11ab6e941af110ee2761483 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63 DIST totem-2.30.2.tar.bz2 3223073 RMD160 78ab8d58eb8e0349190042c34434c3ce8ac8f3e0 SHA1 78b59e0e61a620718b2e87c82046ea1f1fe4607d SHA256 c50da5479c57b2791c3c1bfc05f815d5ee06082fcd1bacc49f4d88c11ed02b6d -EBUILD totem-2.26.5-r1.ebuild 4651 RMD160 1cfed0494d514d1ef3dc321a7dc0a5e8d0969ae7 SHA1 122a11c2cf1cc9abd5081fca3e4e7f722ff48b51 SHA256 ac70d3099e9fbe613e27d1d8c40e3ac97be42b6b023752e3b9b64e9c54cd984d -EBUILD totem-2.28.5-r3.ebuild 4880 RMD160 62836b556f1b10de0fe9b005ccaa9aa4490e1a51 SHA1 505651d112bcbbc51246d95396d8b4025ffd9ba9 SHA256 0b583f53b4317ca52f3039b3aefb42bb69f3b5da91fddd33e21594daeca40e4e -EBUILD totem-2.28.6.ebuild 4885 RMD160 aaf94cf0eac79dcac247fb2ffa0ac236d08b634b SHA1 2fb9e941511dfa14f991e2419220c81aff76c1bc SHA256 5b5fdf573c5579fc769301c0af28ee06716bd09272884cf566697116780b4d71 -EBUILD totem-2.30.0-r1.ebuild 5100 RMD160 86e58f97874ad765347c8fba4899f9e3d31979d0 SHA1 a2186de453e8046beb5622b5903db5d8855f5a28 SHA256 5f87095b30e1b7940692a456c0a993f994bf2058ad65cfc2db8fc25133c56c4b -EBUILD totem-2.30.2.ebuild 5161 RMD160 6f9085f8168ade36fa0b8171be439f2d7c81d86c SHA1 c005b63172f395da4a4856a1304a527439ae23fa SHA256 8b2ed41335f848463a964684dc091c0c58cb304f7ae3cd75d193b7774d70c6f1 -MISC ChangeLog 43514 RMD160 6419103b37894c7b09a8c4f89e03daa90cf5e33c SHA1 ce4a55157bf192d2bfec01e32dc2190b2996e2e3 SHA256 13661633f7d7c809616a67405683f544e41496d07f63aab61bf00c32474b8113 -MISC metadata.xml 1476 RMD160 fbee6439fe2b0f2af87ab4c727213c7c24a768a5 SHA1 941eb1253660067ddd9d5bd3d2282f131d652a48 SHA256 46516740003dded53eb5a259a4068cb7e50044f2727c42a5a9f22bc0f6f6b1f1 +DIST totem-2.32.0.tar.bz2 3278758 RMD160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d SHA1 46589181aee29e021d686a4804bbbb04149a61dc SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47 +EBUILD totem-2.30.2.ebuild 5157 RMD160 af4dfd53a5b7c2a715d86d5a98e9a2347602f9fe SHA1 7c21a03930a2f116000feb23a43fcbb54e48e10f SHA256 758d8174a6f7b60d359ca7edb4b906594552b452286c2caa5741fe89db5ff934 +EBUILD totem-2.32.0.ebuild 5216 RMD160 c7afb05d45750e1cad275f0dcd09b18e7d1c0eff SHA1 8dbe5807b75502c07c2a45a8d3e77b2f45e7b92a SHA256 4903f6868f29021ac3766d91465c8156d24e185525aaa2de8fa148b8a2af9147 +MISC ChangeLog 44374 RMD160 24313d1c5a66c9988ca749466092f5e7795bbcaa SHA1 d9b4167843cab23a03083aaad7ff8a3f1e553560 SHA256 0a5b35a3b8e0f02b47dcbe70ad6fb20121fe8b9d947e5374a4d9bc3eeca18fa0 +MISC metadata.xml 1399 RMD160 c61f89b5dbb8f7abd73a80837bd8c848c1a5cb88 SHA1 72d3f98212c3ecdce00a048558ce32b67e9bfcd0 SHA256 0abbcbe8749025bed45c0ada8a502c2a9e8a77c546d7740e58d81608a23c4bf7 diff --git a/media-video/totem/files/totem-2.26.3-youtube-plugin-404-error.patch b/media-video/totem/files/totem-2.26.3-youtube-plugin-404-error.patch deleted file mode 100644 index 7ee12945687e..000000000000 --- a/media-video/totem/files/totem-2.26.3-youtube-plugin-404-error.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 72ee356863aac922bbe3fc4fe16e7dfbf32ae647 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Tue, 15 Sep 2009 13:25:21 +0000 -Subject: Bug 594320 - Playing youtube videos results in 404 in gst_soup_http_src_parse_status() - -The "t" parameter is a bit too escaped (it's escaped in the gdata -xml, and again by urllib. ---- -diff --git a/src/plugins/youtube/youtube.py b/src/plugins/youtube/youtube.py -index 1a9046f..11d47ea 100644 ---- a/src/plugins/youtube/youtube.py -+++ b/src/plugins/youtube/youtube.py -@@ -334,7 +334,7 @@ class YouTube (totem.Plugin): - t_param = self.resolve_t_param (youtube_id) - - if t_param != "": -- mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + urllib.quote (t_param) + self.get_fmt_string () -+ mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + t_param + self.get_fmt_string () - - gobject.idle_add (self._append_to_liststore, treeview_name, pixbuf, entry.title.text, mrl, youtube_id, search_token) - --- -cgit v0.8.2 diff --git a/media-video/totem/files/totem-2.26.4-youtube-plug-play-vids.patch b/media-video/totem/files/totem-2.26.4-youtube-plug-play-vids.patch deleted file mode 100644 index 5b9aa3fe955c..000000000000 --- a/media-video/totem/files/totem-2.26.4-youtube-plug-play-vids.patch +++ /dev/null @@ -1,22 +0,0 @@ -Date: Sat, 14 Nov 2009 18:15:55 +0100 -Subject: Fix a problem in the youtube plugin when we try to play a video (in the search panel or by giving it a url). -Bug: https://bugs.gentoo.org/show_bug.cgi?id=292839 - -Mainly due to a malformed regexp. - ---- - src/plugins/youtube/youtube.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/src/plugins/youtube/youtube.py -+++ b/src/plugins/youtube/youtube.py -@@ -204,7 +204,7 @@ class YouTube (totem.Plugin): - def resolve_t_param (self, youtube_id): - """We have to get the t parameter from the actual video page, since Google changed how their URLs work""" - stream = urllib.urlopen ("http://youtube.com/watch?v=" + urllib.quote (youtube_id)) -- regexp1 = re.compile ("swfArgs.*\"t\": \"([^\"]+)\"") -+ regexp1 = re.compile ("'SWF_ARGS'.*\"t\": \"([^\"]+)\"") - regexp2 = re.compile ("</head>") - - contents = stream.read () - diff --git a/media-video/totem/files/totem-2.26.5-firefox-plugin-apple-trailers.patch b/media-video/totem/files/totem-2.26.5-firefox-plugin-apple-trailers.patch deleted file mode 100644 index b9d129c02a46..000000000000 --- a/media-video/totem/files/totem-2.26.5-firefox-plugin-apple-trailers.patch +++ /dev/null @@ -1,86 +0,0 @@ -Fixes playing of apple trailers using the firefox plugin by changing the UA - -Patch backported by Ryan May - -http://bugs.gentoo.org/show_bug.cgi?id=292852 - ---- ---- browser-plugin/totemPlugin.cpp -+++ browser-plugin/totemPlugin.cpp -@@ -156,6 +156,15 @@ - "The <a href=\"http://www.gnome.org/projects/totem/\">Totem</a> " PACKAGE_VERSION " plugin handles video and audio streams."; - #endif - -+static const char kPluginUserAgent[] = -+#if defined(TOTEM_NARROWSPACE_PLUGIN) -+ "Quicktime/"TOTEM_NARROWSPACE_VERSION; -+#elif defined(TOTEM_GMP_PLUGIN) -+ "Windows-Media-Player/10.00.00.4019"; -+#else -+ ""; -+#endif -+ - #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H) - nsTArray<totemPlugin*> *totemPlugin::sPlugins; - -@@ -463,10 +472,13 @@ - return NPERR_NO_ERROR; - #endif /* TOTEM_COMPLEX_PLUGIN */ - -- const char *userAgent = NPN_UserAgent (mNPP); -- if (!userAgent) { -- /* See https://bugzilla.mozilla.org/show_bug.cgi?id=328778 */ -- D ("User agent has more than 127 characters; fix your browser!"); -+ const char *userAgent = kPluginUserAgent; -+ if (*kPluginUserAgent == '\0') { -+ userAgent = NPN_UserAgent (mNPP); -+ if (!userAgent) { -+ /* See https://bugzilla.mozilla.org/show_bug.cgi?id=328778 */ -+ D ("User agent has more than 127 characters; fix your browser!"); -+ } - } - - GPtrArray *arr = g_ptr_array_new (); ---- browser-plugin/totem-plugin-viewer.c -+++ browser-plugin/totem-plugin-viewer.c -@@ -2336,7 +2336,7 @@ - /* FIXME: this won't work with gvfs: - * http://bugzilla.gnome.org/show_bug.cgi?id=534482 */ - if (arg_user_agent != NULL) { -- g_setenv ("GNOME_VFS_HTTP_USER_AGENT", arg_user_agent, TRUE); -+ g_setenv ("BACON_VIDEO_WIDGET_HTTP_USER_AGENT", arg_user_agent, TRUE); - g_free (arg_user_agent); - arg_user_agent = NULL; - } ---- src/backend/bacon-video-widget-gst-0.10.c -+++ src/backend/bacon-video-widget-gst-0.10.c -@@ -1686,6 +1686,21 @@ - } - - static void -+bvw_set_user_agent_on_element (BaconVideoWidget * bvw, GstElement * element) -+{ -+ const char *ua; -+ -+ ua = g_getenv ("BACON_VIDEO_WIDGET_HTTP_USER_AGENT"); -+ if (ua == NULL) -+ return; -+ -+ if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "user-agent")) { -+ GST_DEBUG ("Setting HTTP user-agent to '%s'", ua); -+ g_object_set (element, "user-agent", ua, NULL); -+ } -+} -+ -+static void - playbin_source_notify_cb (GObject *play, GParamSpec *p, BaconVideoWidget *bvw) - { - GObject *source = NULL; -@@ -1709,6 +1724,7 @@ - if (source) { - GST_DEBUG ("Got source of type %s", G_OBJECT_TYPE_NAME (source)); - bvw_set_device_on_element (bvw, GST_ELEMENT (source)); -+ bvw_set_user_agent_on_element (bvw, GST_ELEMENT (source)); - g_object_unref (source); - } - } diff --git a/media-video/totem/files/totem-2.30.1-fix-constant-buffering.patch b/media-video/totem/files/totem-2.30.1-fix-constant-buffering.patch deleted file mode 100644 index c4f9d6d06cae..000000000000 --- a/media-video/totem/files/totem-2.30.1-fix-constant-buffering.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 261b53120fea3ba2e1959ce56533e7a4d207ae45 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 06 May 2010 09:43:34 +0000 -Subject: Fix constant buffering when playing live streams - -When playing Ogg Theora live streams, we should wait until the -buffer reaches 100% before we start the actual playback. -Otherwise the buffer will be consumed as it is downloaded, and -we'll be constantly buffering, which is problematic visually, -and could cause hiccups during playback. - -Fixes constant buffering with the streams at: -http://dir.xiph.org/by_format/Ogg_Theora - -https://bugzilla.gnome.org/show_bug.cgi?id=617791 ---- -diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c -index 96b841e..ebd6e8f 100644 ---- a/src/backend/bacon-video-widget-gst-0.10.c -+++ b/src/backend/bacon-video-widget-gst-0.10.c -@@ -1956,7 +1956,7 @@ text_tags_changed_cb (GstElement *playbin2, gint stream_id, gpointer user_data) - } - - static gboolean --bvw_buffering_done (BaconVideoWidget *bvw) -+bvw_download_buffering_done (BaconVideoWidget *bvw) - { - /* When we set buffering left to 0, that means it's ready to play */ - if (bvw->priv->buffering_left == 0) { -@@ -2021,20 +2021,17 @@ bvw_handle_buffering_message (GstMessage * message, BaconVideoWidget *bvw) - /* if the desired state is playing, go back */ - if (bvw->priv->target_state == GST_STATE_PLAYING) { - GST_DEBUG ("Buffering done, setting pipeline back to PLAYING"); -- gst_element_set_state (bvw->priv->play, GST_STATE_PLAYING); -+ bacon_video_widget_play (bvw, NULL); - } else { - GST_DEBUG ("Buffering done, keeping pipeline PAUSED"); - } -- } else if (bvw->priv->buffering == FALSE && -- bvw->priv->target_state == GST_STATE_PLAYING) { -+ } else if (bvw->priv->target_state == GST_STATE_PLAYING) { - GstState cur_state; - - gst_element_get_state (bvw->priv->play, &cur_state, NULL, 0); -- if (cur_state == GST_STATE_PLAYING) { -+ if (cur_state != GST_STATE_PAUSED) { - GST_DEBUG ("Buffering ... temporarily pausing playback"); - gst_element_set_state (bvw->priv->play, GST_STATE_PAUSED); -- } else { -- GST_DEBUG ("Buffering ... prerolling, not doing anything"); - } - bvw->priv->buffering = TRUE; - } else { -@@ -2503,7 +2500,7 @@ bvw_query_buffering_timeout (BaconVideoWidget *bvw) - bvw->priv->buffering_left = 0; - - /* Start playing when we've downloaded enough */ -- if (bvw_buffering_done (bvw) != FALSE && -+ if (bvw_download_buffering_done (bvw) != FALSE && - bvw->priv->target_state == GST_STATE_PLAYING) { - GST_DEBUG ("Starting playback because the download buffer is filled enough"); - bacon_video_widget_play (bvw, NULL); -@@ -3848,11 +3845,17 @@ bacon_video_widget_play (BaconVideoWidget * bvw, GError ** error) - - /* Lie when trying to play a file whilst we're download buffering */ - if (bvw->priv->download_buffering != FALSE && -- bvw_buffering_done (bvw) == FALSE) { -+ bvw_download_buffering_done (bvw) == FALSE) { - GST_DEBUG ("download buffering in progress, not playing"); - return TRUE; - } - -+ /* Or when we're buffering */ -+ if (bvw->priv->buffering != FALSE) { -+ GST_DEBUG ("buffering in progress, not playing"); -+ return TRUE; -+ } -+ - /* just lie and do nothing in this case */ - if (bvw->priv->plugin_install_in_progress && cur_state != GST_STATE_PAUSED) { - GST_DEBUG ("plugin install in progress and nothing to play, not playing"); --- -cgit v0.8.3.1 diff --git a/media-video/totem/files/totem-2.30.1-fix-gmp-plugin.patch b/media-video/totem/files/totem-2.30.1-fix-gmp-plugin.patch deleted file mode 100644 index df13ef1d5123..000000000000 --- a/media-video/totem/files/totem-2.30.1-fix-gmp-plugin.patch +++ /dev/null @@ -1,87 +0,0 @@ -From d3b494595f7be012c400a4426bc89dcca1528f66 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 05 May 2010 16:50:52 +0000 -Subject: Fix URL parameter usage in GMP plugin - -The URL parameter is never the baseURI, it's the same as the SRC -parameter, so some websites use both. - -Add support for the actual "baseURL" parameter instead. - -Fixes playback at: -http://www.ta3.com/sk/relacie/23_hlavne-spravy/9167_hlavne-spravy-z-27-aprila - -https://bugzilla.gnome.org/show_bug.cgi?id=617639 ---- -diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp -index a30ffcc..25cf7ff 100644 ---- a/browser-plugin/totemPlugin.cpp -+++ b/browser-plugin/totemPlugin.cpp -@@ -1042,7 +1042,6 @@ totemPlugin::RequestStream (bool aForceViewer) - /* Prefer filename over src */ - if (mURLURI) { - requestURI = mURLURI; -- baseURI = mSrcURI; /* FIXME: that correct? */ - } - #endif /* TOTEM_GMP_PLUGIN */ - -@@ -1655,7 +1654,23 @@ totemPlugin::SetURL (const char* aURL) - - mURLURI = g_strdup (aURL); - -- /* FIXME: what is the correct base for the URL param? mSrcURI or mBaseURI? */ -+ /* FIXME: security checks? */ -+ /* FIXMEchpe: resolve the URI here? */ -+} -+ -+void -+totemPlugin::SetBaseURL (const char *aBaseURL) -+{ -+ g_free (mBaseURI); -+ -+ /* Don't allow empty URL */ -+ if (!aBaseURL || !aBaseURL[0]) { -+ mBaseURI = NULL; -+ return; -+ } -+ -+ mBaseURI = g_strdup (aBaseURL); -+ - /* FIXME: security checks? */ - /* FIXMEchpe: resolve the URI here? */ - } -@@ -2006,6 +2021,12 @@ totemPlugin::Init (NPMIMEType mimetype, - if (filename) { - SetURL (filename); - } -+ -+ /* http://msdn.microsoft.com/en-us/library/dd564090(v=VS.85).aspx */ -+ const char *base = (const char *) g_hash_table_lookup (args, "baseurl"); -+ if (base) -+ SetBaseURL (base); -+ - #endif /* TOTEM_GMP_PLUGIN */ - - #ifdef TOTEM_NARROWSPACE_PLUGIN -@@ -2141,6 +2162,7 @@ totemPlugin::Init (NPMIMEType mimetype, - - /* Dump some disagnostics */ - D ("mSrcURI: %s", mSrcURI ? mSrcURI : ""); -+ D ("mBaseURI: %s", mBaseURI ? mBaseURI : ""); - D ("mCache: %d", mCache); - D ("mControllerHidden: %d", mControllerHidden); - D ("mShowStatusbar: %d", mShowStatusbar); -diff --git a/browser-plugin/totemPlugin.h b/browser-plugin/totemPlugin.h -index 1cd33d1..d42b9e1 100644 ---- a/browser-plugin/totemPlugin.h -+++ b/browser-plugin/totemPlugin.h -@@ -284,6 +284,7 @@ class totemPlugin { - #ifdef TOTEM_GMP_PLUGIN - public: - void SetURL (const char* aURL); -+ void SetBaseURL (const char* aBaseURL); - const char* URL() const { return mURLURI; } - - private: --- -cgit v0.8.3.1 diff --git a/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch b/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch deleted file mode 100644 index 8980dad8becd..000000000000 --- a/media-video/totem/files/totem-2.30.1-fix-pygtk-include.patch +++ /dev/null @@ -1,41 +0,0 @@ -From aeeb165117a80080b044d54d5dc8b64df3128c26 Mon Sep 17 00:00:00 2001 -From: Jonathan Matthew <jonathan@kaolin.wh9.net> -Date: Fri, 07 May 2010 12:23:17 +0000 -Subject: Fix version requirements for PyGTK - -pygtk.require() actually needs the major GTK+ version, and -doesn't use the minor version in the require. - -Also make sure to check for the return value to avoid surprises. - -https://bugzilla.gnome.org/show_bug.cgi?id=617821 ---- -diff --git a/src/plugins/totem-python-module.c b/src/plugins/totem-python-module.c -index 5db787d..7eee97c 100644 ---- a/src/plugins/totem-python-module.c -+++ b/src/plugins/totem-python-module.c -@@ -151,7 +151,7 @@ totem_python_module_init_python (void) - - PySys_SetArgv (1, argv); - -- /* pygtk.require("2.8") */ -+ /* pygtk.require("2.0") */ - pygtk = PyImport_ImportModule ("pygtk"); - if (pygtk == NULL) { - g_warning ("Could not import pygtk, check your installation"); -@@ -161,7 +161,12 @@ totem_python_module_init_python (void) - - mdict = PyModule_GetDict (pygtk); - require = PyDict_GetItemString (mdict, "require"); -- PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.8"))); -+ PyObject_CallObject (require, Py_BuildValue ("(S)", PyString_FromString ("2.0"))); -+ if (PyErr_Occurred ()) { -+ g_warning ("Could not get required pygtk version, check your installation"); -+ PyErr_Print(); -+ return; -+ } - - /* import gobject */ - init_pygobject (); --- -cgit v0.8.3.1 diff --git a/media-video/totem/files/totem-2.30.1-fix-qt-eos.patch b/media-video/totem/files/totem-2.30.1-fix-qt-eos.patch deleted file mode 100644 index 36147aa35e79..000000000000 --- a/media-video/totem/files/totem-2.30.1-fix-qt-eos.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f6fa6e869330bb2e64b67f966f6873412c3ca081 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Fri, 07 May 2010 09:10:55 +0000 -Subject: Fix position when QT gets to EOS - -When QuickTime reaches the end of a stream, the expected behaviour -is for the position to stay at the end of the file, rather than -back at 0. ---- -diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp -index 25cf7ff..5382bb2 100644 ---- a/browser-plugin/totemPlugin.cpp -+++ b/browser-plugin/totemPlugin.cpp -@@ -1276,9 +1276,12 @@ totemPlugin::TickCallback (DBusGProxy *proxy, - scriptable->mPluginState = totemNarrowSpacePlayer::eState_Playable; - break; - case TOTEM_STATE_STOPPED: -- if (scriptable->mPluginState == totemNarrowSpacePlayer::eState_Playable) -+ if (scriptable->mPluginState == totemNarrowSpacePlayer::eState_Playable) { - scriptable->mPluginState = totemNarrowSpacePlayer::eState_Complete; -- else -+ /* The QuickTime plugin expects the duration to be the -+ * length of the file on EOS */ -+ plugin->mTime = plugin->mDuration; -+ } else - scriptable->mPluginState = totemNarrowSpacePlayer::eState_Waiting; - break; - default: --- -cgit v0.8.3.1 diff --git a/media-video/totem/files/totem-2.32.0-smclient-target-detection.patch b/media-video/totem/files/totem-2.32.0-smclient-target-detection.patch new file mode 100644 index 000000000000..d7876fbe27f4 --- /dev/null +++ b/media-video/totem/files/totem-2.32.0-smclient-target-detection.patch @@ -0,0 +1,48 @@ +--- + Fixing passing any kind of argument to --with-smclient + +Problem with configure.in of the tarball is that it does not seem to work at all with any --with-smclient variation. + + configure.in | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +Index: b/configure.in +=================================================================== +--- a/configure.in ++++ b/configure.in +@@ -226,18 +226,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar + SMCLIENT_PKGS= + AC_MSG_CHECKING([which smclient backend to use]) + AC_ARG_WITH([smclient], +- [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])], ++ [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])], + [], +- [case "$GDK_TARGET" in +- x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;; ++ [$with_smclient=auto]) ++ ++ ++if test "$with_smclient" != "no"; then ++ ++ if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then ++ GDK_TARGET="$with_smclient" ++ fi ++ ++ case "$GDK_TARGET" in ++ x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;; + win32|quartz) with_smclient=$GDK_TARGET ;; + *) with_smclient=no ;; +- esac]) +-AC_MSG_RESULT([$with_smclient]) ++ esac ++ ++ AC_MSG_RESULT([$with_smclient]) + +-if test "$with_smclient" != "no"; then + PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS]) + AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled]) ++else ++ AC_MSG_RESULT([$with_smclient]) + fi + + AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"]) diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml index b1663d40c043..55541ef7aba1 100644 --- a/media-video/totem/metadata.xml +++ b/media-video/totem/metadata.xml @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>gnome</herd> - <herd>video</herd> - <herd>gstreamer</herd> - <longdescription> +<herd>gnome</herd> +<herd>video</herd> +<herd>gstreamer</herd> +<longdescription> Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility. </longdescription> - <use> - <flag name="bluetooth">Enable support for user-presence detection via the +<use> + <flag name="bluetooth">Enable support for user-presence detection via the user's bluetooth handset using <pkg>net-wireless/bluez</pkg></flag> - <flag name="galago">Allow Totem to set your IM client to "away" when a movie + <flag name="galago">Allow Totem to set your IM client to "away" when a movie is playing in fullscreen using <pkg>dev-libs/libgalago</pkg></flag> - <flag name="lirc">Enable support for controlling Totem with a remote control - using <pkg>app-misc/lirc</pkg></flag> - <flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag> - <flag name="tracker">Enable support for searching media files using the - indexer <pkg>app-misc/tracker</pkg></flag> - <flag name="galago">Enable the galago plugin</flag> - <flag name="nautilus">Enable the nautilus extension</flag> - <flag name="tracker">Enable the search plugin using app-misc/tracker</flag> <flag name="iplayer">Enable BBC player support</flag> + <flag name="lirc">Enable support for controlling Totem with a remote control + using <pkg>app-misc/lirc</pkg></flag> + <flag name="nautilus">Enable the nautilus extension</flag> + <flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag> + <flag name="tracker">Enable support for searching media files using the + indexer <pkg>app-misc/tracker</pkg></flag> + <flag name="upnp">Enable DLNA support through + <pkg>media-video/coherence</pkg></flag> <flag name="youtube">Enable youtube plugin</flag> - </use> +</use> </pkgmetadata> diff --git a/media-video/totem/totem-2.26.5-r1.ebuild b/media-video/totem/totem-2.26.5-r1.ebuild deleted file mode 100644 index 3266da3507f0..000000000000 --- a/media-video/totem/totem-2.26.5-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.5-r1.ebuild,v 1.9 2010/07/20 01:40:23 jer Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 multilib python - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="http://gnome.org/projects/totem/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" - -IUSE="bluetooth debug doc galago lirc nautilus nsplugin python tracker" - -# TODO: -# easy-publish-and-consume is not in tree (epc) -# Cone (VLC) plugin needs someone with the right setup (remi ?) -# check gmyth requirement ? -> waiting for updates in tree -# coherence plugin not enabled until we have deps in tree - -# youtube plugin depends on gst-plugins-soup -RDEPEND=">=dev-libs/glib-2.15 - >=x11-libs/gtk+-2.13.0 - >=gnome-base/gconf-2.0 - >=dev-libs/totem-pl-parser-2.23.91 - >=x11-themes/gnome-icon-theme-2.16 - x11-libs/cairo - app-text/iso-codes - >=dev-libs/libxml2-2.6 - >=dev-libs/dbus-glib-0.71 - >=media-libs/gstreamer-0.10.16 - >=media-libs/gst-plugins-good-0.10 - >=media-libs/gst-plugins-base-0.10.12 - >=media-plugins/gst-plugins-gconf-0.10 - - >=media-plugins/gst-plugins-gio-0.10 - >=media-plugins/gst-plugins-pango-0.10 - >=media-plugins/gst-plugins-x-0.10 - >=media-plugins/gst-plugins-meta-0.10-r2 - - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXtst - >=x11-libs/libXrandr-1.1.1 - >=x11-libs/libXxf86vm-1.0.1 - - bluetooth? ( net-wireless/bluez ) - galago? ( >=dev-libs/libgalago-0.5.2 ) - lirc? ( app-misc/lirc ) - nautilus? ( >=gnome-base/nautilus-2.10 ) - python? ( - dev-lang/python[threads] - >=dev-python/pygtk-2.12 - dev-python/pyxdg - dev-python/gdata - dev-python/gst-python - dev-python/gconf-python - media-plugins/gst-plugins-soup ) - tracker? ( >=app-misc/tracker-0.5.3 )" -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - app-text/scrollkeeper - gnome-base/gnome-common - app-text/gnome-doc-utils - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.20 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.11 )" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -# FIXME: tests broken with USE="-doc" upstream bug #577774 -RESTRICT="test" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-scrollkeeper - --disable-schemas-install - --disable-static - --disable-vala - --with-dbus - --with-smclient - --enable-easy-codec-installation - $(use_enable nsplugin browser-plugins)" - - # Plugin configuration - G2CONF="${G2CONF} - BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins - PLUGINDIR=/usr/$(get_libdir)/totem/plugins" - - local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot" - use bluetooth && plugins="${plugins},bemused" - use galago && plugins="${plugins},galago" - use lirc && plugins="${plugins},lirc" - use python && plugins="${plugins},youtube,opensubtitles,jamendo,pythonconsole" - use tracker && plugins="${plugins},tracker" - - G2CONF="${G2CONF} --with-plugins=${plugins}" - - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable nautilus) - $(use_enable python)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix broken smclient option passing - epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch" - - # YouTube plugin broken, when we try to load some videos, bug #292839 - epatch "${FILESDIR}/${PN}-2.26.4-youtube-plug-play-vids.patch" - - # Fix playing of Apple trailers using firefox plugin, bug 292852 - epatch "${FILESDIR}/${P}-firefox-plugin-apple-trailers.patch" - - # FIXME: tarball generated with broken gtk-doc, revisit me. - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \ - -i gtk-doc.make || die "sed 2 failed" - fi - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile -} - -src_configure() { - # FIXME: why does it need write access here, probably need to set up a fake - # home in /var/tmp like other pkgs do - - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - addpredict "$(unset HOME; echo ~)/.gnome2" - - gnome2_src_configure -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/totem/plugins - fi - - ewarn - ewarn "If totem doesn't play some video format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/totem/plugins -} diff --git a/media-video/totem/totem-2.28.5-r3.ebuild b/media-video/totem/totem-2.28.5-r3.ebuild deleted file mode 100644 index 8063d59a624d..000000000000 --- a/media-video/totem/totem-2.28.5-r3.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.5-r3.ebuild,v 1.6 2010/08/14 17:39:21 armin76 Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 multilib python - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="http://gnome.org/projects/totem/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm ia64 sparc x86 ~x86-fbsd" - -SRC_URI="${SRC_URI} - mirror://gentoo/${P}-patches.tar.bz2" - -# FIXME: Enable for now python USE flag per bug #316409 -# this change should only be noticed by people not following current -# current linux profiles default -IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python +youtube" #zeroconf - -# TODO: -# Cone (VLC) plugin needs someone with the right setup (remi ?) -# check gmyth requirement ? -> waiting for updates in tree -# coherence plugin not enabled until we have deps in tree -RDEPEND=">=dev-libs/glib-2.15 - >=x11-libs/gtk+-2.16.0 - >=gnome-base/gconf-2.0 - >=dev-libs/totem-pl-parser-2.27.0 - >=x11-themes/gnome-icon-theme-2.16 - x11-libs/cairo - app-text/iso-codes - >=dev-libs/libxml2-2.6 - >=dev-libs/dbus-glib-0.71 - >=media-libs/gstreamer-0.10.25 - >=media-libs/gst-plugins-good-0.10 - >=media-libs/gst-plugins-base-0.10.25 - >=media-plugins/gst-plugins-gconf-0.10 - - >=media-plugins/gst-plugins-taglib-0.10 - >=media-plugins/gst-plugins-gio-0.10 - >=media-plugins/gst-plugins-pango-0.10 - >=media-plugins/gst-plugins-x-0.10 - >=media-plugins/gst-plugins-meta-0.10-r2 - - dev-libs/libunique - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXtst - >=x11-libs/libXrandr-1.1.1 - >=x11-libs/libXxf86vm-1.0.1 - - bluetooth? ( net-wireless/bluez ) - galago? ( >=dev-libs/libgalago-0.5.2 ) - iplayer? ( - dev-python/pygobject - dev-python/pygtk - dev-python/httplib2 - dev-python/feedparser - dev-python/beautifulsoup ) - lirc? ( app-misc/lirc ) - nautilus? ( >=gnome-base/nautilus-2.10 ) - python? ( - dev-lang/python[threads] - >=dev-python/pygtk-2.12 - dev-python/pyxdg - dev-python/gst-python - dev-python/dbus-python - dev-python/gconf-python ) - youtube? ( - >=dev-libs/libgdata-0.4.0 - media-plugins/gst-plugins-soup )" -# FIXME: freezes totem -# zeroconf? ( >=net-libs/libepc-0.3 ) -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - app-text/scrollkeeper - gnome-base/gnome-common - app-text/gnome-doc-utils - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.20 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.11 ) - app-text/docbook-xml-dtd:4.5" -# docbook-xml-dtd is needed for user doc - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-scrollkeeper - --disable-schemas-install - --disable-static - --disable-vala - --with-dbus - --with-smclient - --enable-easy-codec-installation - $(use_enable nsplugin browser-plugins)" - - # Plugin configuration - G2CONF="${G2CONF} - BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins - PLUGINDIR=/usr/$(get_libdir)/totem/plugins" - - local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot" - use bluetooth && plugins="${plugins},bemused" - use galago && plugins="${plugins},galago" - use iplayer && plugins="${plugins},iplayer" - use lirc && plugins="${plugins},lirc" - use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service" - use youtube && plugins="${plugins},youtube" - #use zeroconf && plugins="${plugins},publish" - - G2CONF="${G2CONF} --with-plugins=${plugins}" - - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable nautilus) - $(use_enable python)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix broken smclient option passing - epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch" - - # Apply upstream patches committed to gnome-2.28 branch - epatch "${WORKDIR}"/${P}-patches/*.patch - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile -} - -src_configure() { - # FIXME: why does it need write access here, probably need to set up a fake - # home in /var/tmp like other pkgs do - - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - addpredict "$(unset HOME; echo ~)/.gnome2" - - gnome2_src_configure -} - -src_install() { - gnome2_src_install - # Installed for plugins, but they're dlopen()-ed - # firefox, totem as well as nautilus - find "${D}" -name "*.la" -delete || die "remove of la files failed" -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/totem/plugins - fi - - ewarn - ewarn "If totem doesn't play some video format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/totem/plugins -} diff --git a/media-video/totem/totem-2.28.6.ebuild b/media-video/totem/totem-2.28.6.ebuild deleted file mode 100644 index 511eb1abe4b4..000000000000 --- a/media-video/totem/totem-2.28.6.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.28.6.ebuild,v 1.6 2010/07/06 14:12:11 ssuominen Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 multilib python - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="http://gnome.org/projects/totem/" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86 ~x86-fbsd" - -# FIXME: Enable for now python USE flag per bug #316409 -# this change should only be noticed by people not following current -# current linux profiles default -IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker +youtube" #zeroconf - -# TODO: -# Cone (VLC) plugin needs someone with the right setup (remi ?) -# check gmyth requirement ? -> waiting for updates in tree -# coherence plugin not enabled until we have deps in tree -RDEPEND=">=dev-libs/glib-2.15 - >=x11-libs/gtk+-2.16 - >=gnome-base/gconf-2 - >=dev-libs/totem-pl-parser-2.27 - >=x11-themes/gnome-icon-theme-2.16 - x11-libs/cairo - app-text/iso-codes - >=dev-libs/libxml2-2.6 - >=dev-libs/dbus-glib-0.71 - >=media-libs/gstreamer-0.10.25 - >=media-libs/gst-plugins-good-0.10 - >=media-libs/gst-plugins-base-0.10.25 - >=media-plugins/gst-plugins-gconf-0.10 - - >=media-plugins/gst-plugins-taglib-0.10 - >=media-plugins/gst-plugins-gio-0.10 - >=media-plugins/gst-plugins-pango-0.10 - >=media-plugins/gst-plugins-x-0.10 - >=media-plugins/gst-plugins-meta-0.10-r2 - - dev-libs/libunique - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXtst - >=x11-libs/libXrandr-1.1.1 - >=x11-libs/libXxf86vm-1.0.1 - - bluetooth? ( net-wireless/bluez ) - galago? ( >=dev-libs/libgalago-0.5.2 ) - iplayer? ( - dev-python/pygobject - dev-python/pygtk - dev-python/httplib2 - dev-python/feedparser - dev-python/beautifulsoup ) - lirc? ( app-misc/lirc ) - nautilus? ( >=gnome-base/nautilus-2.10 ) - nsplugin? ( media-plugins/gst-plugins-soup ) - python? ( - dev-lang/python[threads] - >=dev-python/pygtk-2.12 - dev-python/pyxdg - dev-python/gst-python - dev-python/dbus-python - dev-python/gconf-python ) - tracker? ( - >=app-misc/tracker-0.6 - <app-misc/tracker-0.7 ) - youtube? ( - >=dev-libs/libgdata-0.4 - media-plugins/gst-plugins-soup )" -# FIXME: freezes totem -# zeroconf? ( >=net-libs/libepc-0.3 ) -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - app-text/scrollkeeper - gnome-base/gnome-common - app-text/gnome-doc-utils - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.20 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.11 ) - app-text/docbook-xml-dtd:4.5" -# docbook-xml-dtd is needed for user doc - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-scrollkeeper - --disable-schemas-install - --disable-static - --disable-vala - --with-dbus - --with-smclient - --enable-easy-codec-installation - $(use_enable nsplugin browser-plugins)" - - # Plugin configuration - G2CONF="${G2CONF} - BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins - PLUGINDIR=/usr/$(get_libdir)/totem/plugins" - - local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot" - use bluetooth && plugins="${plugins},bemused" - use galago && plugins="${plugins},galago" - use iplayer && plugins="${plugins},iplayer" - use lirc && plugins="${plugins},lirc" - use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service" - use tracker && plugins="${plugins},tracker" - use youtube && plugins="${plugins},youtube" - #use zeroconf && plugins="${plugins},publish" - - G2CONF="${G2CONF} --with-plugins=${plugins}" - - G2CONF="${G2CONF} - $(use_enable debug) - $(use_enable nautilus) - $(use_enable python)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix broken smclient option passing - epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile -} - -src_configure() { - # FIXME: why does it need write access here, probably need to set up a fake - # home in /var/tmp like other pkgs do - - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - addpredict "$(unset HOME; echo ~)/.gnome2" - - gnome2_src_configure -} - -src_install() { - gnome2_src_install - # Installed for plugins, but they're dlopen()-ed - # firefox, totem as well as nautilus - find "${D}" -name "*.la" -delete || die "remove of la files failed" -} - -pkg_postinst() { - gnome2_pkg_postinst - if use python; then - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/totem/plugins - fi - - ewarn - ewarn "If totem doesn't play some video format, please check your" - ewarn "USE flags on media-plugins/gst-plugins-meta" - ewarn -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/totem/plugins -} diff --git a/media-video/totem/totem-2.30.2.ebuild b/media-video/totem/totem-2.30.2.ebuild index 2636de08c440..cda0bd3dd37c 100644 --- a/media-video/totem/totem-2.30.2.ebuild +++ b/media-video/totem/totem-2.30.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.2.ebuild,v 1.8 2010/10/17 15:36:40 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.2.ebuild,v 1.9 2010/11/19 19:04:22 eva Exp $ EAPI="2" @@ -30,7 +30,7 @@ RDEPEND=">=dev-libs/glib-2.24 >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6 - >=dev-libs/dbus-glib-0.71 + >=dev-libs/dbus-glib-0.82 >=media-libs/gstreamer-0.10.28.1 >=media-libs/gst-plugins-good-0.10 >=media-libs/gst-plugins-base-0.10.26 diff --git a/media-video/totem/totem-2.30.0-r1.ebuild b/media-video/totem/totem-2.32.0.ebuild index 5b72767fddb2..cb32661bdaee 100644 --- a/media-video/totem/totem-2.30.0-r1.ebuild +++ b/media-video/totem/totem-2.32.0.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.2 2010/06/27 10:19:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0.ebuild,v 1.1 2010/11/19 19:04:22 eva Exp $ -EAPI="2" +EAPI="3" +GCONF_DEBUG="yes" +#PYTHON_DEPEND="2" inherit autotools eutils gnome2 multilib python @@ -16,25 +18,23 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # FIXME: Enable for now python USE flag per bug #316409 # this change should only be noticed by people not following current # current linux profiles default -IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker +youtube" #zeroconf +IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker upnp +youtube" #zeroconf # TODO: # Cone (VLC) plugin needs someone with the right setup (remi ?) # check gmyth requirement ? -> waiting for updates in tree -# coherence plugin not enabled until we have deps in tree # vala ( dev-lang/vala ) requires 0.7.5 -RDEPEND=">=dev-libs/glib-2.22 - >=x11-libs/gtk+-2.19.5 - >=gnome-base/gconf-2.0 - >=dev-libs/totem-pl-parser-2.29.1 +RDEPEND=">=dev-libs/glib-2.25.11:2 + >=x11-libs/gtk+-2.21.8:2 + >=gnome-base/gconf-2 + >=dev-libs/totem-pl-parser-2.30.2 >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo - app-text/iso-codes >=dev-libs/libxml2-2.6 - >=dev-libs/dbus-glib-0.71 - >=media-libs/gstreamer-0.10.26 + >=dev-libs/dbus-glib-0.82 + >=media-libs/gstreamer-0.10.30 >=media-libs/gst-plugins-good-0.10 - >=media-libs/gst-plugins-base-0.10.26 + >=media-libs/gst-plugins-base-0.10.30 >=media-plugins/gst-plugins-gconf-0.10 >=media-plugins/gst-plugins-taglib-0.10 @@ -44,6 +44,7 @@ RDEPEND=">=dev-libs/glib-2.22 >=media-plugins/gst-plugins-meta-0.10-r2 dev-libs/libunique + x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst @@ -53,23 +54,26 @@ RDEPEND=">=dev-libs/glib-2.22 bluetooth? ( net-wireless/bluez ) galago? ( >=dev-libs/libgalago-0.5.2 ) iplayer? ( - dev-python/pygobject - dev-python/pygtk + dev-python/pygobject:2 + dev-python/pygtk:2 dev-python/httplib2 dev-python/feedparser dev-python/beautifulsoup ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.10 ) + nsplugin? ( media-plugins/gst-plugins-soup ) python? ( dev-lang/python[threads] - >=dev-python/pygtk-2.12 + >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python dev-python/dbus-python dev-python/gconf-python ) - tracker? ( >=app-misc/tracker-0.7.1 ) + tracker? ( >=app-misc/tracker-0.8.1 ) + upnp? ( media-video/coherence ) youtube? ( - >=dev-libs/libgdata-0.4.0 + >=dev-libs/libgdata-0.4 + net-libs/libsoup:2.4 media-plugins/gst-plugins-soup )" # FIXME: freezes totem # zeroconf? ( >=net-libs/libepc-0.3 ) @@ -78,18 +82,21 @@ DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xf86vidmodeproto app-text/scrollkeeper - gnome-base/gnome-common app-text/gnome-doc-utils >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.20 + app-text/docbook-xml-dtd:4.5 + gnome-base/gnome-common dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1.11 ) - app-text/docbook-xml-dtd:4.5" -# docbook-xml-dtd is needed for user doc + doc? ( >=dev-util/gtk-doc-1.11 )" +# eautoreconf needs: +# gnome-base/gnome-common +# dev-util/gtk-doc-am -DOCS="AUTHORS ChangeLog NEWS README TODO" +# docbook-xml-dtd is needed for user doc pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README TODO" G2CONF="${G2CONF} --disable-scrollkeeper --disable-schemas-install @@ -105,13 +112,14 @@ pkg_setup() { BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins PLUGINDIR=/usr/$(get_libdir)/totem/plugins" - local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot" + local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot,chapters" use bluetooth && plugins="${plugins},bemused" use galago && plugins="${plugins},galago" use iplayer && plugins="${plugins},iplayer" use lirc && plugins="${plugins},lirc" use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service" use tracker && plugins="${plugins},tracker" + use upnp && plugins="${plugins},coherence_upnp" use youtube && plugins="${plugins},youtube" #use zeroconf && plugins="${plugins},publish" @@ -121,18 +129,15 @@ pkg_setup() { $(use_enable debug) $(use_enable nautilus) $(use_enable python)" + + python_set_active_version 2 } src_prepare() { gnome2_src_prepare # Fix broken smclient option passing - epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch" - -# epatch "${FILESDIR}/${PN}-2.30.1-fix-constant-buffering.patch" - epatch "${FILESDIR}/${PN}-2.30.1-fix-gmp-plugin.patch" - epatch "${FILESDIR}/${PN}-2.30.1-fix-pygtk-include.patch" - epatch "${FILESDIR}/${PN}-2.30.1-fix-qt-eos.patch" + epatch "${FILESDIR}/${PN}-2.32.0-smclient-target-detection.patch" intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf @@ -157,7 +162,10 @@ src_install() { gnome2_src_install # Installed for plugins, but they're dlopen()-ed # firefox, totem as well as nautilus - find "${D}" -name "*.la" -delete || die "remove of la files failed" + find "${ED}" -name "*.la" -delete || die "remove of la files failed" + + # Fix python script shebangs + python_convert_shebangs 2 "${ED}"/usr/libexec/totem/totem-bugreport.py } pkg_postinst() { |