Commit | Line | Data |
---|---|---|
7ad81b8b LC |
1 | Fix a bug whereby the 'have_easy_codec' would be left undefined |
2 | when passing '-D enable-easy-codec-installation=no'. Likewise, | |
3 | don't rely on GStreamer's plug-in support when it's disabled. | |
4 | ||
5 | --- totem-3.26.0/meson.build 2017-10-11 22:29:44.506280919 +0200 | |
6 | +++ totem-3.26.0/meson.build 2017-10-11 22:29:50.902252058 +0200 | |
7 | @@ -203,6 +203,8 @@ if easy_codec_option != 'no' | |
8 | missing_plugins_deps += gst_pbutils_dep | |
9 | config_h.set('ENABLE_MISSING_PLUGIN_INSTALLATION', have_easy_codec, | |
10 | description: 'Whether we can and want to do installation of missing plugins') | |
11 | +else | |
12 | + have_easy_codec = false | |
13 | endif | |
14 | ||
15 | # python support | |
16 | ||
17 | --- totem-3.26.0/src/backend/bacon-video-widget.c 2017-10-11 22:40:52.531217356 +0200 | |
18 | +++ totem-3.26.0/src/backend/bacon-video-widget.c 2017-10-11 22:45:44.973847231 +0200 | |
19 | @@ -341,6 +341,22 @@ get_type_name (GType class_type, int typ | |
20 | return value->value_nick; | |
21 | } | |
22 | ||
23 | +#ifndef ENABLE_MISSING_PLUGIN_INSTALLATION | |
24 | + | |
25 | +gchar * | |
26 | +gst_missing_plugin_message_get_installer_detail (GstMessage *message) | |
27 | +{ | |
28 | + return NULL; | |
29 | +} | |
30 | + | |
31 | +char * | |
32 | +gst_missing_plugin_message_get_description (GstMessage *message) | |
33 | +{ | |
34 | + return NULL; | |
35 | +} | |
36 | + | |
37 | +#endif | |
38 | + | |
39 | static gchar ** | |
40 | bvw_get_missing_plugins_foo (const GList * missing_plugins, MsgToStrFunc func) | |
41 | { | |
42 | @@ -1654,10 +1670,12 @@ bvw_handle_element_message (BaconVideoWi | |
43 | } | |
44 | } | |
45 | goto done; | |
46 | +#ifdef ENABLE_MISSING_PLUGIN_INSTALLATION | |
47 | } else if (gst_is_missing_plugin_message (msg)) { | |
48 | bvw->priv->missing_plugins = | |
49 | g_list_prepend (bvw->priv->missing_plugins, gst_message_ref (msg)); | |
50 | goto done; | |
51 | +#endif | |
52 | } else if (strcmp (type_name, "not-mounted") == 0) { | |
53 | const GValue *val; | |
54 | GFile *file; | |
55 | @@ -6109,7 +6127,9 @@ bacon_video_widget_initable_init (GInita | |
56 | GST_DEBUG ("Initialised %s", version_str); | |
57 | g_free (version_str); | |
58 | ||
59 | +#ifdef ENABLE_MISSING_PLUGIN_INSTALLATION | |
60 | gst_pb_utils_init (); | |
61 | +#endif | |
62 | ||
63 | /* Instantiate all the fallible plugins */ | |
64 | bvw->priv->play = element_make_or_warn ("playbin", "play"); | |
65 |