summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-10 15:47:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:20 +0100
commita102793b1583d9d385a8f01ae89f2235531e6c83 (patch)
treedda8d25a8eec8ccceec887ba6ec95f77d9909eb2
parent75bb9025ea7307dedc821875cd0cb1410cb3b420 (diff)
downloadpoky-a102793b1583d9d385a8f01ae89f2235531e6c83.tar.gz
libowl-av: patches merged upstream, bump srcrev
(From OE-Core rev: 5b0d8cb8463da423035484f42659926b472c53b3) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch42
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch13
-rw-r--r--meta/recipes-sato/owl-video-widget/libowl-av_git.bb8
3 files changed, 3 insertions, 60 deletions
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
deleted file mode 100644
index 5bc279a019..0000000000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Fix music player crash if adding unknown type files.
2
3Using bus message to call function flush_head/feed_head in main thread
4to protect private data operation.
5
6A better fix may be to listen to bus message "CODEC_NOT_FOUND" and
7"MISSING_PLUGIN" directly to avoid hooking into "unknown-type" signal.
8We will revisit it in next period.
9
10Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
11
12Upstream-Status: Pending
13
14diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c
15--- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800
16+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800
17@@ -300,13 +300,23 @@
18 GstCaps *caps,
19 OwlTagReader *tag_reader)
20 {
21+ GstMessage *message;
22+ GstBus *bus;
23+
24 tag_reader->priv->current_error =
25 g_error_new (OWL_TAG_READER_ERROR,
26 OWL_TAG_READER_ERROR_UNKNOWN_TYPE,
27 "Unknown type");
28
29- flush_head (tag_reader);
30- feed_head (tag_reader);
31+ /**
32+ * Post a message to the bus, as we are in another thread here.
33+ **/
34+ message = gst_message_new_error(GST_OBJECT (decodebin),
35+ tag_reader->priv->current_error, NULL);
36+
37+ bus = gst_pipeline_get_bus (GST_PIPELINE (tag_reader->priv->pipeline));
38+ gst_bus_post (bus, message);
39+ gst_object_unref (GST_OBJECT (bus));
40 }
41
42 /**
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
deleted file mode 100644
index a8be781dc9..0000000000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libowl-av/Makefile.am
4===================================================================
5--- libowl-av.orig/Makefile.am
6+++ libowl-av/Makefile.am
7@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v
8 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
9
10 snapshot:
11- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
12+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
13
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
index 4413d38839..62a4a7dccf 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
@@ -12,14 +12,12 @@ DEPENDS = "gtk+ gstreamer gst-plugins-base"
12RDEPENDS_${PN} = "gst-meta-base" 12RDEPENDS_${PN} = "gst-meta-base"
13RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" 13RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
14 14
15SRCREV = "1379fd230a32509e94971961183f1031f469737a" 15SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae"
16PV = "0.1+git${SRCPV}" 16PV = "0.1+git${SRCPV}"
17PR = "r2" 17PR = "r3"
18 18
19 19
20SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ 20SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
21 file://gst_change_state.patch \
22 file://make-382.patch"
23 21
24S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
25 23