From 995ef5ea11a9003abc0ea90b4ce61e53ef1eb679 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 22 Jul 2019 17:55:35 -0400 Subject: gnu: totem: Update to 3.32.1. * gnu/packages/gnome.scm (totem): Update to 3.32.1. [source]: Remove patches. [arguments]: Add 'pre-check' phase. Remove #:parallel-build?. [native-inputs]: Add python-pylint and xorg-server-for-tests. [inputs]: Replace python2-pygobject with python-pygobject. * gnu/packages/patches/totem-meson-easy-codec.patch, gnu/packages/patches/totem-meson-compat.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/packages/patches/totem-meson-compat.patch | 14 ----- gnu/packages/patches/totem-meson-easy-codec.patch | 65 ----------------------- 2 files changed, 79 deletions(-) delete mode 100644 gnu/packages/patches/totem-meson-compat.patch delete mode 100644 gnu/packages/patches/totem-meson-easy-codec.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/totem-meson-compat.patch b/gnu/packages/patches/totem-meson-compat.patch deleted file mode 100644 index 8557908dd0..0000000000 --- a/gnu/packages/patches/totem-meson-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix an error that occurs with Meson 0.50.0 and later: -"ERROR: Subdir keyword must not be an absolute path". - ---- a/src/meson.build 2019-03-15 00:10:26.882293850 +0100 -+++ b/src/meson.build 2019-03-15 00:10:54.312197229 +0100 -@@ -82,7 +82,7 @@ - - install_headers( - headers, -- subdir: join_paths(totem_includedir, totem_api_path) -+ install_dir: join_paths(totem_includedir, totem_api_path) - ) - - libtotem_player_sources = files( diff --git a/gnu/packages/patches/totem-meson-easy-codec.patch b/gnu/packages/patches/totem-meson-easy-codec.patch deleted file mode 100644 index b97d555c1a..0000000000 --- a/gnu/packages/patches/totem-meson-easy-codec.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix a bug whereby the 'have_easy_codec' would be left undefined -when passing '-D enable-easy-codec-installation=no'. Likewise, -don't rely on GStreamer's plug-in support when it's disabled. - ---- totem-3.26.0/meson.build 2017-10-11 22:29:44.506280919 +0200 -+++ totem-3.26.0/meson.build 2017-10-11 22:29:50.902252058 +0200 -@@ -203,6 +203,8 @@ if easy_codec_option != 'no' - missing_plugins_deps += gst_pbutils_dep - config_h.set('ENABLE_MISSING_PLUGIN_INSTALLATION', have_easy_codec, - description: 'Whether we can and want to do installation of missing plugins') -+else -+ have_easy_codec = false - endif - - # python support - ---- totem-3.26.0/src/backend/bacon-video-widget.c 2017-10-11 22:40:52.531217356 +0200 -+++ totem-3.26.0/src/backend/bacon-video-widget.c 2017-10-11 22:45:44.973847231 +0200 -@@ -341,6 +341,22 @@ get_type_name (GType class_type, int typ - return value->value_nick; - } - -+#ifndef ENABLE_MISSING_PLUGIN_INSTALLATION -+ -+gchar * -+gst_missing_plugin_message_get_installer_detail (GstMessage *message) -+{ -+ return NULL; -+} -+ -+char * -+gst_missing_plugin_message_get_description (GstMessage *message) -+{ -+ return NULL; -+} -+ -+#endif -+ - static gchar ** - bvw_get_missing_plugins_foo (const GList * missing_plugins, MsgToStrFunc func) - { -@@ -1654,10 +1670,12 @@ bvw_handle_element_message (BaconVideoWi - } - } - goto done; -+#ifdef ENABLE_MISSING_PLUGIN_INSTALLATION - } else if (gst_is_missing_plugin_message (msg)) { - bvw->priv->missing_plugins = - g_list_prepend (bvw->priv->missing_plugins, gst_message_ref (msg)); - goto done; -+#endif - } else if (strcmp (type_name, "not-mounted") == 0) { - const GValue *val; - GFile *file; -@@ -6109,7 +6127,9 @@ bacon_video_widget_initable_init (GInita - GST_DEBUG ("Initialised %s", version_str); - g_free (version_str); - -+#ifdef ENABLE_MISSING_PLUGIN_INSTALLATION - gst_pb_utils_init (); -+#endif - - /* Instantiate all the fallible plugins */ - bvw->priv->play = element_make_or_warn ("playbin", "play"); - -- cgit v1.2.3