diff --git a/.cvsignore b/.cvsignore index 9c44c78..b2da6c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -totem-2.25.90.tar.bz2 +totem-2.25.91.tar.bz2 diff --git a/sources b/sources index 2ef3365..e91086b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfa04c61cc69596c71e4603f59a1941a totem-2.25.90.tar.bz2 +33e1ccbaf8bfdd9b4ac70bc45680516c totem-2.25.91.tar.bz2 diff --git a/totem-use-pulsesink-volume.patch b/totem-use-pulsesink-volume.patch index 0602a97..304fd0e 100644 --- a/totem-use-pulsesink-volume.patch +++ b/totem-use-pulsesink-volume.patch @@ -1,160 +1,3 @@ ---- src/backend/bacon-video-widget-gst-0.10.c 2009/01/13 11:38:01 5912 -+++ src/backend/bacon-video-widget-gst-0.10.c 2009/02/09 22:15:42 5957 -@@ -2720,8 +2720,8 @@ - } else { - gchar *cur_dir = g_get_current_dir (); - if (!cur_dir) { -- g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC, -- _("Failed to retrieve working directory")); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC, -+ _("Failed to retrieve working directory")); - return FALSE; - } - subtitle_uri = g_strdup_printf ("file://%s/%s", cur_dir, uris[1]); -@@ -3977,15 +3977,15 @@ - case MEDIA_TYPE_DVD: { - if (!gst_default_registry_check_feature_version ("rsndvdbin", 0, 10, 0)) { - GST_DEBUG ("Missing rsndvdbin"); -- g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -+ "XXX Do not use XXX"); - return NULL; - } else if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) && - gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) && - !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) { - GST_DEBUG ("flupsdemux not new enough for DVD playback"); -- g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -+ "XXX Do not use XXX"); - return NULL; - } else { - gchar *uri[] = { NULL, NULL }; -@@ -4002,24 +4002,24 @@ - !gst_default_registry_check_feature_version ("mpegtsparse", 0, 10, 6) || - !gst_default_registry_check_feature_version ("dvbsrc", 0, 10, 6)) { - GST_DEBUG ("Missing one or all of: dvbsrc, dvbbasebin, mpegtsparse"); -- g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -+ "XXX Do not use XXX"); - return NULL; - } - if (!gst_default_registry_check_feature_version ("mpegpsdemux", 0, 10, 0) && - gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 0) && - !gst_default_registry_check_feature_version ("flupsdemux", 0, 10, 15)) { - GST_DEBUG ("flupsdemux not new enough for DVB playback"); -- g_set_error (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_NO_PLUGIN_FOR_FILE, -+ "XXX Do not use XXX"); - return NULL; - } - - filename = g_strdup_printf ("/dev/dvb/adapter%s/frontend0", device); - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { - g_free (filename); -- g_set_error (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_INVALID_DEVICE, -+ "XXX Do not use XXX"); - return NULL; - } - g_free (filename); -@@ -4030,16 +4030,16 @@ - mrls = bacon_video_widget_get_dvb_mrls (device); - } else { - GST_DEBUG ("no channels file '%s'", filename); -- g_set_error (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_FILE_NOT_FOUND, -+ "XXX Do not use XXX"); - g_free (filename); - return NULL; - } - break; - } - case MEDIA_TYPE_CDDA: -- g_set_error (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION, -- "XXX Do not use XXX"); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_UNVALID_LOCATION, -+ "XXX Do not use XXX"); - return NULL; - default: - g_assert_not_reached(); -@@ -4595,14 +4595,14 @@ - /* check for version */ - if (!g_object_class_find_property ( - G_OBJECT_GET_CLASS (bvw->priv->play), "frame")) { -- g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC, -- _("Too old version of GStreamer installed.")); -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC, -+ _("Too old version of GStreamer installed.")); - return FALSE; - } - - /* check for video */ - if (!bvw->priv->media_has_video && !bvw->priv->show_vfx) { -- g_set_error (error, BVW_ERROR, BVW_ERROR_GENERIC, -+ g_set_error_literal (error, BVW_ERROR, BVW_ERROR_GENERIC, - _("Media contains no supported video streams.")); - return FALSE; - } -@@ -4977,7 +4977,7 @@ - - bvw->priv->play = gst_element_factory_make ("playbin", "play"); - if (!bvw->priv->play) { -- g_set_error (err, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD, -+ g_set_error_literal (err, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD, - _("Failed to create a GStreamer play object. " - "Please check your GStreamer installation.")); - g_object_ref_sink (bvw); -@@ -5108,7 +5108,7 @@ - err_msg = gst_bus_poll (bvw->priv->bus, GST_MESSAGE_ERROR, 0); - if (err_msg == NULL) { - g_warning ("Should have gotten an error message, please file a bug."); -- g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN, -+ g_set_error_literal (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN, - _("Failed to open video output. It may not be available. " - "Please select another video output in the Multimedia " - "Systems Selector.")); -@@ -5120,7 +5120,7 @@ - } - } - } else { -- g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN, -+ g_set_error_literal (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN, - _("Could not find the video output. " - "You may need to install additional GStreamer plugins, " - "or select another video output in the Multimedia Systems " -@@ -5155,7 +5155,7 @@ - err_msg = gst_bus_poll (bus, GST_MESSAGE_ERROR, 0); - if (err_msg == NULL) { - g_warning ("Should have gotten an error message, please file a bug."); -- g_set_error (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN, -+ g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN, - _("Failed to open audio output. You may not have " - "permission to open the sound device, or the sound " - "server may not be running. " -@@ -5175,7 +5175,7 @@ - } - gst_object_unref (bus); - } else { -- g_set_error (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN, -+ g_set_error_literal (err, BVW_ERROR, BVW_ERROR_AUDIO_PLUGIN, - _("Could not find the audio output. " - "You may need to install additional GStreamer plugins, or " - "select another audio output in the Multimedia Systems " -@@ -5225,7 +5225,7 @@ - ret = gst_element_get_state (video_sink, NULL, NULL, 5 * GST_SECOND); - if (ret != GST_STATE_CHANGE_SUCCESS) { - GST_WARNING ("Timeout setting videosink to READY"); -- g_set_error (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN, -+ g_set_error_literal (err, BVW_ERROR, BVW_ERROR_VIDEO_PLUGIN, - _("Failed to open video output. It may not be available. " - "Please select another video output in the Multimedia Systems Selector.")); - return NULL; Index: src/backend/bacon-video-widget-gst-0.10.c =================================================================== --- src/backend/bacon-video-widget-gst-0.10.c (revision 5970) diff --git a/totem.spec b/totem.spec index db736a8..f711987 100644 --- a/totem.spec +++ b/totem.spec @@ -8,8 +8,8 @@ Summary: Movie player for GNOME Name: totem -Version: 2.25.90 -Release: 3%{?dist} +Version: 2.25.91 +Release: 1%{?dist} License: GPLv2+ with exceptions Group: Applications/Multimedia URL: http://projects.gnome.org/totem/ @@ -191,6 +191,15 @@ This package provides a plugin to allow you to share your current playlist (and the files included in that playlist) with other Totems on the same local network. +%package devel +Summary: Plugin writer's documentation for %{package} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains API documentation for +developing developing plugins for %{name}. + %package nautilus Summary: Video and Audio Properties tab for Nautilus Group: Applications/Multimedia @@ -459,6 +468,10 @@ fi %defattr(-, root, root) %{_libdir}/totem/plugins/coherence_upnp +%files devel +%defattr(-, root, root) +%{_datadir}/gtk-doc/html/totem + #%files tracker #%defattr(-, root, root) #%{_libdir}/totem/plugins/tracker @@ -481,6 +494,9 @@ fi %endif %changelog +* Tue Feb 17 2009 - Bastien Nocera - 2.25.91-1 +- Update to 2.25.91 + * Thu Feb 12 2009 - Bastien Nocera - 2.25.90-3 - Add patch to set the PA stream volume from Totem, instead of having a separate one