diff options
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 @@ | |||
| 1 | Fix music player crash if adding unknown type files. | ||
| 2 | |||
| 3 | Using bus message to call function flush_head/feed_head in main thread | ||
| 4 | to protect private data operation. | ||
| 5 | |||
| 6 | A better fix may be to listen to bus message "CODEC_NOT_FOUND" and | ||
| 7 | "MISSING_PLUGIN" directly to avoid hooking into "unknown-type" signal. | ||
| 8 | We will revisit it in next period. | ||
| 9 | |||
| 10 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | diff -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 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | Index: 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" | |||
| 12 | RDEPENDS_${PN} = "gst-meta-base" | 12 | RDEPENDS_${PN} = "gst-meta-base" |
| 13 | RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" | 13 | RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" |
| 14 | 14 | ||
| 15 | SRCREV = "1379fd230a32509e94971961183f1031f469737a" | 15 | SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae" |
| 16 | PV = "0.1+git${SRCPV}" | 16 | PV = "0.1+git${SRCPV}" |
| 17 | PR = "r2" | 17 | PR = "r3" |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ | 20 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
| 21 | file://gst_change_state.patch \ | ||
| 22 | file://make-382.patch" | ||
| 23 | 21 | ||
| 24 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
| 25 | 23 | ||
