rpms/totem/devel totem-use-pulsesink-volume.patch, 1.1, 1.2 totem.spec, 1.224, 1.225
Bastien Nocera
hadess at fedoraproject.org
Thu Feb 12 16:22:39 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9754
Modified Files:
totem-use-pulsesink-volume.patch totem.spec
Log Message:
fix patch application
totem-use-pulsesink-volume.patch:
Index: totem-use-pulsesink-volume.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem-use-pulsesink-volume.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- totem-use-pulsesink-volume.patch 12 Feb 2009 15:57:59 -0000 1.1
+++ totem-use-pulsesink-volume.patch 12 Feb 2009 16:22:38 -0000 1.2
@@ -1,3 +1,160 @@
+--- 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)
Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- totem.spec 12 Feb 2009 16:01:08 -0000 1.224
+++ totem.spec 12 Feb 2009 16:22:38 -0000 1.225
@@ -206,7 +206,9 @@
%prep
%setup -q -c
+pushd totem-%{version}/
%patch0 -p0 -b .pulsesink-vol
+popd
# Whatever needs to be changed in both copies do here
## remember to update me when changing %doc
for i in AUTHORS COPYING NEWS README TODO;do
More information about the fedora-extras-commits
mailing list