Ubuntu Pastebin

Paste from michal at Fri, 11 Dec 2015 16:57:33 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 clutter-gst-3.0 (3.0.14-1) unstable; urgency=medium
 .
   * New upstream release.
Author: Michael Biebl <biebl@debian.org>

---
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: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- a/clutter-gst/clutter-gst-plugin.c
+++ b/clutter-gst/clutter-gst-plugin.c
@@ -50,7 +50,8 @@
 
 #if defined (CLUTTER_WINDOWING_X11)
   /* Required by some GStreamer element like VA */
-  XInitThreads ();
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    XInitThreads ();
 #endif
 
   ret = gst_element_register (plugin,
--- a/clutter-gst/clutter-gst-util.c
+++ b/clutter-gst/clutter-gst-util.c
@@ -133,7 +133,8 @@
 
 #if defined (CLUTTER_WINDOWING_X11)
   /* Required by some GStreamer element like VA */
-  XInitThreads ();
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    XInitThreads ();
 #endif
 
   gst_init (argc, argv);
@@ -192,7 +193,8 @@
 
 #if defined (CLUTTER_WINDOWING_X11)
   /* Required by some gstreamer element like VA */
-  XInitThreads ();
+  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    XInitThreads ();
 #endif
 
   context = g_option_context_new (parameter_string);
Download as text