diffstat for totem-3.18.1 totem-3.18.1 changelog | 51 +++++++++ control | 14 +- control.in | 12 +- patches/endless-add-desktop-alias.patch | 8 + patches/endless-handle-missing-codecs.patch | 144 ++++++++++++++++++++++++++ patches/endless-present-on-open.patch | 20 +++ patches/endless-remove-dbus-activatable.patch | 28 +++++ patches/endless-thumbnailer-no-v4l2.patch | 46 ++++++++ patches/series | 5 rules | 1 totem-plugins.install | 1 totem.install | 1 12 files changed, 316 insertions(+), 15 deletions(-) diff -Nru totem-3.18.1/debian/changelog totem-3.18.1/debian/changelog --- totem-3.18.1/debian/changelog 2015-12-05 23:55:54.000000000 +0000 +++ totem-3.18.1/debian/changelog 2016-03-14 04:53:25.000000000 +0000 @@ -1,3 +1,54 @@ +totem (3.18.1-2endless5) master; urgency=medium + + * debian/patches/endless-remove-dbus-activatable.patch: + - Remove DBusActivatable=true for proper integration with Endless + desktop launching + * debian/control.in: + - Specify app ID as org.gnome.Totem to match desktop file name + + https://phabricator.endlessm.com/T6387 + + -- Roddy Shuler Sun, 13 Mar 2016 21:19:03 -0700 + +totem (3.18.1-2endless4) eos; urgency=medium + + * debian/patches/endless-handle-missing-codecs.patch: + - Remove unused code code relying on PackageKit (which we don't ship) + and simply show am information dialog to the user and attempt the + installation, so that we have a chance to report this to EosMetrics. + https://phabricator.endlessm.com/T6405 + + -- Mario Mon, 07 Mar 2016 16:52:45 +0000 + +totem (3.18.1-2endless3) master; urgency=medium + + + endless-add-desktop-alias.patch: + Add X-Endless-Alias key to the desktop file, endlessm/T6387 + + -- Emmanuele Fri, 04 Mar 2016 16:04:01 +0000 + +totem (3.18.1-2endless2) eos; urgency=medium + + + endless-thumbnailer-no-v4l2.patch: + Prevent thumbnailer from using v4l2 decoder, eos-shell #6070 + + -- Daniel Drake Tue, 26 Jan 2016 14:14:18 -0600 + +totem (3.18.1-2endless1) eos; urgency=medium + + * Rebase on Debian, remaining changes: + * debian/totem.install: remove usr/lib/nautilus + * control: + - don't recommend gstreamer1.0-plugins-ugly (#4966) + - don't depend on gnome-icon-theme; rename to adwaita-icon-theme + - Add build dep on eos-shell-content-dev for dh_eoscontent. + - Define app ID as totem since libtotem0 is the main binary package + * rules: Include CDBS eoscontent rules for dh_eoscontent. + * endless-present-on-open.patch: Present when a new file is opened + * control, totem-plugins.install: disable zeitgeist plugin + + -- Daniel Drake Wed, 20 Jan 2016 18:43:42 -0600 + totem (3.18.1-2) unstable; urgency=medium * Switch to python3 for the plugins diff -Nru totem-3.18.1/debian/control totem-3.18.1/debian/control --- totem-3.18.1/debian/control 2015-12-06 00:03:35.000000000 +0000 +++ totem-3.18.1/debian/control 2016-03-14 04:53:35.000000000 +0000 @@ -6,7 +6,7 @@ Section: video Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Laurent Bigonville , Michael Biebl +Uploaders: Andreas Henriksson , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 9), cdbs (>= 0.4.90), dpkg-dev (>= 1.16.1), @@ -48,19 +48,20 @@ libxrandr-dev (>= 2:1.1.1), libxtst-dev, libxxf86vm-dev (>= 1:1.0.1), - libzeitgeist-2.0-dev (>= 0.9.12), python3 (>= 3.2), python-gi-dev (>= 2.90.3), shared-mime-info (>= 0.22), valac (>= 0.14.1), x11proto-core-dev, - yelp-tools + yelp-tools, + eos-shell-content-dev Standards-Version: 3.9.6 Homepage: https://wiki.gnome.org/Apps/Videos Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/totem Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/totem Package: libtotem0 +XCBS-Eos-Appid: totem Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -73,11 +74,11 @@ Package: totem Architecture: any +XCBS-EOS-AppId: org.gnome.Totem Depends: ${misc:Depends}, ${shlibs:Depends}, totem-common (= ${source:Version}), - gnome-icon-theme (>= 2.15.90), - gnome-icon-theme-symbolic, + adwaita-icon-theme, gsettings-desktop-schemas, gstreamer1.0-clutter-3.0, gstreamer1.0-plugins-base (>= 1.4.2), @@ -86,7 +87,6 @@ gstreamer1.0-x, grilo-plugins-0.2 Recommends: gstreamer1.0-libav, - gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio, totem-plugins Suggests: gnome-codec-install @@ -148,7 +148,7 @@ gir1.2-totem-1.0 (= ${binary:Version}), python3-gi (>= 2.90.3), python3-xdg -Recommends: gnome-settings-daemon, zeitgeist-core +Recommends: gnome-settings-daemon Suggests: gromit Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read diff -Nru totem-3.18.1/debian/control.in totem-3.18.1/debian/control.in --- totem-3.18.1/debian/control.in 2015-12-05 23:49:59.000000000 +0000 +++ totem-3.18.1/debian/control.in 2016-03-14 04:17:41.000000000 +0000 @@ -44,19 +44,20 @@ libxrandr-dev (>= 2:1.1.1), libxtst-dev, libxxf86vm-dev (>= 1:1.0.1), - libzeitgeist-2.0-dev (>= 0.9.12), python3 (>= 3.2), python-gi-dev (>= 2.90.3), shared-mime-info (>= 0.22), valac (>= 0.14.1), x11proto-core-dev, - yelp-tools + yelp-tools, + eos-shell-content-dev Standards-Version: 3.9.6 Homepage: https://wiki.gnome.org/Apps/Videos Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/totem Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/totem Package: libtotem0 +XCBS-Eos-Appid: totem Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} @@ -69,11 +70,11 @@ Package: totem Architecture: any +XCBS-EOS-AppId: org.gnome.Totem Depends: ${misc:Depends}, ${shlibs:Depends}, totem-common (= ${source:Version}), - gnome-icon-theme (>= 2.15.90), - gnome-icon-theme-symbolic, + adwaita-icon-theme, gsettings-desktop-schemas, gstreamer1.0-clutter-3.0, gstreamer1.0-plugins-base (>= 1.4.2), @@ -82,7 +83,6 @@ gstreamer1.0-x, grilo-plugins-0.2 Recommends: gstreamer1.0-libav, - gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio, totem-plugins Suggests: gnome-codec-install @@ -144,7 +144,7 @@ gir1.2-totem-1.0 (= ${binary:Version}), python3-gi (>= 2.90.3), python3-xdg -Recommends: gnome-settings-daemon, zeitgeist-core +Recommends: gnome-settings-daemon Suggests: gromit Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read diff -Nru totem-3.18.1/debian/patches/endless-add-desktop-alias.patch totem-3.18.1/debian/patches/endless-add-desktop-alias.patch --- totem-3.18.1/debian/patches/endless-add-desktop-alias.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.18.1/debian/patches/endless-add-desktop-alias.patch 2016-03-04 16:07:50.000000000 +0000 @@ -0,0 +1,8 @@ +diff -Nuarp totem-3.18.1.orig/data/org.gnome.Totem.desktop.in.in.in totem-3.18.1/data/org.gnome.Totem.desktop.in.in.in +--- totem-3.18.1.orig/data/org.gnome.Totem.desktop.in.in.in 2016-03-04 16:01:53.465471858 +0000 ++++ totem-3.18.1/data/org.gnome.Totem.desktop.in.in.in 2016-03-04 16:02:16.137495198 +0000 +@@ -15,3 +15,4 @@ X-GNOME-Bugzilla-Component=general + X-GNOME-Bugzilla-Version=@VERSION@ + X-GNOME-Bugzilla-OtherBinaries=totem-video-thumbnailer;totem-audio-preview; + StartupNotify=true ++X-Endless-Alias=totem diff -Nru totem-3.18.1/debian/patches/endless-handle-missing-codecs.patch totem-3.18.1/debian/patches/endless-handle-missing-codecs.patch --- totem-3.18.1/debian/patches/endless-handle-missing-codecs.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.18.1/debian/patches/endless-handle-missing-codecs.patch 2016-03-07 18:22:21.000000000 +0000 @@ -0,0 +1,144 @@ +--- totem-3.18.1.orig/src/backend/bacon-video-widget-gst-missing-plugins.c ++++ totem-3.18.1/src/backend/bacon-video-widget-gst-missing-plugins.c +@@ -313,35 +313,11 @@ bacon_video_widget_start_plugin_installa + return TRUE; + } + +-#if GST_CHECK_VERSION (1, 5, 0) + static void +-codec_confirmation_dialog_response_cb (GtkDialog *dialog, +- GtkResponseType response_type, +- gpointer user_data) ++show_codec_missing_information_dialog (TotemCodecInstallContext *ctx) + { +- TotemCodecInstallContext *ctx = user_data; +- +- switch (response_type) { +- case GTK_RESPONSE_ACCEPT: +- bacon_video_widget_start_plugin_installation (ctx, FALSE); +- break; +- case GTK_RESPONSE_CANCEL: +- case GTK_RESPONSE_DELETE_EVENT: +- break; +- default: +- g_assert_not_reached (); +- } +- gtk_widget_destroy (GTK_WIDGET (dialog)); +-} +- +-static void +-show_codec_confirmation_dialog (TotemCodecInstallContext *ctx, +- const gchar *install_helper_display_name) +-{ +- GtkWidget *button; + GtkWidget *dialog; + GtkWidget *toplevel; +- gchar *button_text; + gchar *descriptions_text; + gchar *message_text; + +@@ -360,67 +336,15 @@ show_codec_confirmation_dialog (TotemCod + g_strv_length (ctx->descriptions)), + descriptions_text); + +- /* TRANSLATORS: this is a button to launch a codec installer. +- * %s will be replaced with the software installer's name, e.g. +- * 'Software' in case of gnome-software. */ +- button_text = g_strdup_printf (_("_Find in %s"), install_helper_display_name); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", message_text); +- button = gtk_dialog_add_button (GTK_DIALOG (dialog), +- button_text, +- GTK_RESPONSE_ACCEPT); +- gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); +- gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action"); +- g_signal_connect (dialog, "response", +- G_CALLBACK (codec_confirmation_dialog_response_cb), +- ctx); +- + gtk_window_present (GTK_WINDOW (dialog)); + +- g_free (button_text); ++ gtk_dialog_run (dialog); ++ gtk_widget_destroy (dialog); ++ + g_free (descriptions_text); + g_free (message_text); + } +-#endif +- +-static void +-on_packagekit_proxy_ready (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- TotemCodecInstallContext *ctx = (TotemCodecInstallContext *) user_data; +- GDBusProxy *packagekit_proxy = NULL; +- GVariant *property = NULL; +- GError *error = NULL; +- +- packagekit_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); +- if (packagekit_proxy == NULL && +- g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { +- goto out; +- } +- +-#if GST_CHECK_VERSION (1, 5, 0) +- if (packagekit_proxy != NULL) { +- property = g_dbus_proxy_get_cached_property (packagekit_proxy, "DisplayName"); +- if (property != NULL) { +- const gchar *display_name; +- +- display_name = g_variant_get_string (property, NULL); +- if (display_name != NULL && display_name[0] != '\0') { +- show_codec_confirmation_dialog (ctx, display_name); +- goto out; +- } +- } +- } +-#endif +- +- /* If the above failed, fall back to immediately starting the codec installation */ +- bacon_video_widget_start_plugin_installation (ctx, TRUE); +- +-out: +- g_clear_error (&error); +- g_clear_pointer (&property, g_variant_unref); +- g_clear_object (&packagekit_proxy); +-} + + static gboolean + bacon_video_widget_gst_on_missing_plugins_event (BaconVideoWidget *bvw, +@@ -466,24 +390,21 @@ bacon_video_widget_gst_on_missing_plugin + return FALSE; + } + +- /* Get the PackageKit session interface proxy and continue with the +- * codec installation in the callback */ +- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, /* g-interface-info */ +- "org.freedesktop.PackageKit", +- "/org/freedesktop/PackageKit", +- "org.freedesktop.PackageKit.Modify2", +- g_object_get_data (G_OBJECT (bvw), "missing-plugins-cancellable"), +- on_packagekit_proxy_ready, +- ctx); +- + /* if we managed to start playing, pause playback, since some install + * wizard should now take over in a second anyway and the user might not + * be able to use totem's controls while the wizard is running */ + if (playing) + bacon_video_widget_pause (bvw); + ++ /* We don't have PackageKit available in Endless, so we always have to ++ * show an informative information dialog to the user at this point. */ ++ show_codec_missing_information_dialog (ctx); ++ ++ /* Also, we don't have any means to really install codecs automatically on ++ * Endless yet, but we still pretend we do so that we can record the attempt ++ * to play media with a missing codecs from a centralized point. */ ++ bacon_video_widget_start_plugin_installation (ctx, FALSE); ++ + return TRUE; + } + diff -Nru totem-3.18.1/debian/patches/endless-present-on-open.patch totem-3.18.1/debian/patches/endless-present-on-open.patch --- totem-3.18.1/debian/patches/endless-present-on-open.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.18.1/debian/patches/endless-present-on-open.patch 2016-01-22 19:36:34.000000000 +0000 @@ -0,0 +1,20 @@ +[endlessm/eos-shell#5961] + +Index: totem-3.18.1/src/totem-object.c +=================================================================== +--- totem-3.18.1.orig/src/totem-object.c ++++ totem-3.18.1/src/totem-object.c +@@ -143,11 +143,13 @@ totem_object_app_open (GApplication *ap + const char *hint) + { + GSList *slist = NULL; ++ Totem *totem = TOTEM_OBJECT (application); + int i; + + optionstate.had_filenames = (n_files > 0); + + g_application_activate (application); ++ gtk_window_present (GTK_WINDOW (totem->win)); + + totem_object_set_main_page (TOTEM_OBJECT (application), "player"); + diff -Nru totem-3.18.1/debian/patches/endless-remove-dbus-activatable.patch totem-3.18.1/debian/patches/endless-remove-dbus-activatable.patch --- totem-3.18.1/debian/patches/endless-remove-dbus-activatable.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.18.1/debian/patches/endless-remove-dbus-activatable.patch 2016-03-14 04:51:52.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Remove DBusActivatable=true + For proper integration with Endless desktop launching. + https://phabricator.endlessm.com/T6387 +Author: Roddy Shuler + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- totem-3.18.1.orig/data/org.gnome.Totem.desktop.in.in.in ++++ totem-3.18.1/data/org.gnome.Totem.desktop.in.in.in +@@ -4,7 +4,6 @@ _Comment=Play movies + _Keywords=Video;Movie;Film;Clip;Series;Player;DVD;TV;Disc; + Exec=totem %U + Icon=totem +-DBusActivatable=true + Terminal=false + Type=Application + Categories=GTK;GNOME;AudioVideo;Player;Video; diff -Nru totem-3.18.1/debian/patches/endless-thumbnailer-no-v4l2.patch totem-3.18.1/debian/patches/endless-thumbnailer-no-v4l2.patch --- totem-3.18.1/debian/patches/endless-thumbnailer-no-v4l2.patch 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.18.1/debian/patches/endless-thumbnailer-no-v4l2.patch 2016-01-26 20:14:07.000000000 +0000 @@ -0,0 +1,46 @@ +From 83f683a8e8012cfe70d009e148593339aa1a837e Mon Sep 17 00:00:00 2001 +From: Nicolas Dufresne +Date: Wed, 25 Nov 2015 17:13:21 -0500 +Subject: [PATCH] thumbnailer: Don't use v4l2 plugin + +Don't use any of the features in the v4l2 plugins. These are not +useful and may waste precious decoder instances. + +[endlessm/eos-shell/issues/6070] +--- + src/totem-video-thumbnailer.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + mode change 100755 => 100644 src/totem-video-thumbnailer.c + +Index: totem-3.18.1/src/totem-video-thumbnailer.c +=================================================================== +--- totem-3.18.1.orig/src/totem-video-thumbnailer.c ++++ totem-3.18.1/src/totem-video-thumbnailer.c +@@ -396,6 +396,7 @@ thumb_app_setup_play (ThumbApp *app) + GstElement *audio_sink, *video_sink; + GstRegistry *registry; + GstPluginFeature *feature; ++ GstPlugin *plugin; + + play = gst_element_factory_make ("playbin", "play"); + audio_sink = gst_element_factory_make ("fakesink", "audio-fake-sink"); +@@ -424,9 +425,16 @@ thumb_app_setup_play (ThumbApp *app) + feature = gst_registry_find_feature (registry, + "vaapidecode", + GST_TYPE_ELEMENT_FACTORY); +- if (!feature) +- return; +- gst_registry_remove_feature (registry, feature); ++ if (feature) ++ gst_registry_remove_feature (registry, feature); ++ ++ /* Don't use anything from V4L2 in the thumbnailer. That disables ++ * decoders mostly but also encoders and converters. Access to V4L2 ++ * devices shall be limited to foreground use to not waste precious ++ * resources. */ ++ plugin = gst_registry_find_plugin (registry, "video4linux2"); ++ if (plugin) ++ gst_registry_remove_plugin (registry, plugin); + } + + static void diff -Nru totem-3.18.1/debian/patches/series totem-3.18.1/debian/patches/series --- totem-3.18.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ totem-3.18.1/debian/patches/series 2016-03-14 04:53:02.000000000 +0000 @@ -0,0 +1,5 @@ +endless-present-on-open.patch +endless-thumbnailer-no-v4l2.patch +endless-add-desktop-alias.patch +endless-handle-missing-codecs.patch +endless-remove-dbus-activatable.patch diff -Nru totem-3.18.1/debian/rules totem-3.18.1/debian/rules --- totem-3.18.1/debian/rules 2015-12-05 23:49:59.000000000 +0000 +++ totem-3.18.1/debian/rules 2016-01-21 00:43:29.000000000 +0000 @@ -12,6 +12,7 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/cdbs/1/rules/eoscontent.mk DEB_DH_AUTORECONF_ARGS = --as-needed diff -Nru totem-3.18.1/debian/totem-plugins.install totem-3.18.1/debian/totem-plugins.install --- totem-3.18.1/debian/totem-plugins.install 2015-12-05 23:49:59.000000000 +0000 +++ totem-3.18.1/debian/totem-plugins.install 2016-01-21 15:18:31.000000000 +0000 @@ -20,4 +20,3 @@ usr/lib/totem/plugins/screenshot usr/lib/totem/plugins/skipto usr/lib/totem/plugins/vimeo -usr/lib/totem/plugins/zeitgeist-dp diff -Nru totem-3.18.1/debian/totem.install totem-3.18.1/debian/totem.install --- totem-3.18.1/debian/totem.install 2015-12-05 23:49:48.000000000 +0000 +++ totem-3.18.1/debian/totem.install 2016-01-21 00:43:39.000000000 +0000 @@ -1,5 +1,4 @@ usr/bin -usr/lib/nautilus usr/share/applications usr/share/appdata/org.gnome.Totem.appdata.xml usr/share/dbus-1/services/