diff options
author | Ross Burton <ross.burton@intel.com> | 2012-08-10 15:45:06 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 18:04:19 +0100 |
commit | 75bb9025ea7307dedc821875cd0cb1410cb3b420 (patch) | |
tree | 0af5df1e77a52698341838f0b83fd23f66896914 /meta/recipes-sato/owl-video-widget/owl-video | |
parent | 38adf05204ddbefd2a3119009646f47f1a5f505b (diff) | |
download | poky-75bb9025ea7307dedc821875cd0cb1410cb3b420.tar.gz |
owl-video: patches pushed upstream, so bump srcrev
(From OE-Core rev: 65c62f8734dc56d411d33f638716e99790f2895f)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/owl-video-widget/owl-video')
-rw-r--r-- | meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch | 40 | ||||
-rw-r--r-- | meta/recipes-sato/owl-video-widget/owl-video/make-382.patch | 17 |
2 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch deleted file mode 100644 index 437f72be86..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe | ||
2 | |||
3 | If the video player tries to play an unknown type file, it will enter | ||
4 | the error_cb() function, which is called in another thread. | ||
5 | Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk | ||
6 | multi-thread operation. | ||
7 | |||
8 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | diff -ruN video-orig/src/video.c video/src/video.c | ||
13 | --- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800 | ||
14 | +++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800 | ||
15 | @@ -96,6 +96,7 @@ | ||
16 | { | ||
17 | GtkWidget *dialog; | ||
18 | |||
19 | + gdk_threads_enter(); | ||
20 | dialog = gtk_message_dialog_new (data->window, | ||
21 | GTK_DIALOG_NO_SEPARATOR, | ||
22 | GTK_MESSAGE_ERROR, | ||
23 | @@ -103,6 +104,7 @@ | ||
24 | error->message); | ||
25 | gtk_dialog_run (GTK_DIALOG (dialog)); | ||
26 | gtk_widget_destroy (dialog); | ||
27 | + gdk_threads_leave(); | ||
28 | } | ||
29 | |||
30 | /** | ||
31 | @@ -606,7 +608,9 @@ | ||
32 | |||
33 | gtk_widget_show_all (GTK_WIDGET (data->window)); | ||
34 | |||
35 | + gdk_threads_enter(); | ||
36 | gtk_main (); | ||
37 | + gdk_threads_leave(); | ||
38 | |||
39 | /** | ||
40 | * Cleanup. | ||
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch deleted file mode 100644 index d219c31858..0000000000 --- a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Make 3.82 is much stricter and demands tabs. Obey. | ||
2 | |||
3 | JL - 15/12/10 | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Index: video/Makefile.am | ||
8 | =================================================================== | ||
9 | --- video.orig/Makefile.am | ||
10 | +++ video/Makefile.am | ||
11 | @@ -4,5 +4,5 @@ SUBDIRS = src | ||
12 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing | ||
13 | |||
14 | snapshot: | ||
15 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
16 | + $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
17 | |||