* [PATCH 1/2] owl-video: patches pushed upstream, so bump srcrev
2012-08-13 19:01 [PATCH 0/2] libowl updates Ross Burton
@ 2012-08-13 19:01 ` Ross Burton
2012-08-13 19:01 ` [PATCH 2/2] libowl-av: patches merged upstream, " Ross Burton
2012-08-17 20:57 ` [PATCH 0/2] libowl updates Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2012-08-13 19:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../owl-video/gtk_multithread_safe.patch | 40 --------------------
.../owl-video-widget/owl-video/make-382.patch | 17 ---------
.../recipes-sato/owl-video-widget/owl-video_git.bb | 8 ++--
3 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
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 437f72b..0000000
--- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe
-
-If the video player tries to play an unknown type file, it will enter
-the error_cb() function, which is called in another thread.
-Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
-multi-thread operation.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Pending
-
-diff -ruN video-orig/src/video.c video/src/video.c
---- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
-+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
-@@ -96,6 +96,7 @@
- {
- GtkWidget *dialog;
-
-+ gdk_threads_enter();
- dialog = gtk_message_dialog_new (data->window,
- GTK_DIALOG_NO_SEPARATOR,
- GTK_MESSAGE_ERROR,
-@@ -103,6 +104,7 @@
- error->message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-+ gdk_threads_leave();
- }
-
- /**
-@@ -606,7 +608,9 @@
-
- gtk_widget_show_all (GTK_WIDGET (data->window));
-
-+ gdk_threads_enter();
- gtk_main ();
-+ gdk_threads_leave();
-
- /**
- * 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 d219c31..0000000
--- a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make 3.82 is much stricter and demands tabs. Obey.
-
-JL - 15/12/10
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: video/Makefile.am
-===================================================================
---- video.orig/Makefile.am
-+++ video/Makefile.am
-@@ -4,5 +4,5 @@ SUBDIRS = src
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
-
- snapshot:
-- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
index bc63273..ae08383 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -8,22 +8,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
SECTION = "x11"
DEPENDS = "libowl-av"
-SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
+SRCREV = "07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d"
PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/git"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://gtk_multithread_safe.patch \
file://owl-video-widget.png \
file://stock_media-play.png \
file://stock_volume-0.png \
file://stock_volume-min.png \
file://stock_volume-med.png \
file://stock_volume-max.png \
- file://owl-video-widget.desktop \
- file://make-382.patch"
+ file://owl-video-widget.desktop"
inherit autotools pkgconfig
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] libowl-av: patches merged upstream, bump srcrev
2012-08-13 19:01 [PATCH 0/2] libowl updates Ross Burton
2012-08-13 19:01 ` [PATCH 1/2] owl-video: patches pushed upstream, so bump srcrev Ross Burton
@ 2012-08-13 19:01 ` Ross Burton
2012-08-17 20:57 ` [PATCH 0/2] libowl updates Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Ross Burton @ 2012-08-13 19:01 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../libowl-av/gst_change_state.patch | 42 --------------------
.../owl-video-widget/libowl-av/make-382.patch | 13 ------
.../recipes-sato/owl-video-widget/libowl-av_git.bb | 8 ++--
3 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
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 5bc279a..0000000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix music player crash if adding unknown type files.
-
-Using bus message to call function flush_head/feed_head in main thread
-to protect private data operation.
-
-A better fix may be to listen to bus message "CODEC_NOT_FOUND" and
-"MISSING_PLUGIN" directly to avoid hooking into "unknown-type" signal.
-We will revisit it in next period.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Pending
-
-diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c
---- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800
-+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800
-@@ -300,13 +300,23 @@
- GstCaps *caps,
- OwlTagReader *tag_reader)
- {
-+ GstMessage *message;
-+ GstBus *bus;
-+
- tag_reader->priv->current_error =
- g_error_new (OWL_TAG_READER_ERROR,
- OWL_TAG_READER_ERROR_UNKNOWN_TYPE,
- "Unknown type");
-
-- flush_head (tag_reader);
-- feed_head (tag_reader);
-+ /**
-+ * Post a message to the bus, as we are in another thread here.
-+ **/
-+ message = gst_message_new_error(GST_OBJECT (decodebin),
-+ tag_reader->priv->current_error, NULL);
-+
-+ bus = gst_pipeline_get_bus (GST_PIPELINE (tag_reader->priv->pipeline));
-+ gst_bus_post (bus, message);
-+ gst_object_unref (GST_OBJECT (bus));
- }
-
- /**
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 a8be781..0000000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libowl-av/Makefile.am
-===================================================================
---- libowl-av.orig/Makefile.am
-+++ libowl-av/Makefile.am
-@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
-
- snapshot:
-- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-
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 4413d38..62a4a7d 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"
RDEPENDS_${PN} = "gst-meta-base"
RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
-SRCREV = "1379fd230a32509e94971961183f1031f469737a"
+SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae"
PV = "0.1+git${SRCPV}"
-PR = "r2"
+PR = "r3"
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://gst_change_state.patch \
- file://make-382.patch"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] libowl updates
2012-08-13 19:01 [PATCH 0/2] libowl updates Ross Burton
2012-08-13 19:01 ` [PATCH 1/2] owl-video: patches pushed upstream, so bump srcrev Ross Burton
2012-08-13 19:01 ` [PATCH 2/2] libowl-av: patches merged upstream, " Ross Burton
@ 2012-08-17 20:57 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2012-08-17 20:57 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/13/2012 12:01 PM, Ross Burton wrote:
> Patches were merged upstream, so drop them and bump srcrev.
>
> The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18:
>
> foomatic: fix perl path for target (2012-08-08 10:06:00 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/owl
>
> for you to fetch changes up to d3e664ba768f4485f8d7984a86c571cf43815497:
>
> libowl-av: patches merged upstream, bump srcrev (2012-08-10 15:47:00 +0300)
>
> ----------------------------------------------------------------
> Ross Burton (2):
> owl-video: patches pushed upstream, so bump srcrev
> libowl-av: patches merged upstream, bump srcrev
>
> .../libowl-av/gst_change_state.patch | 42 --------------------
> .../owl-video-widget/libowl-av/make-382.patch | 13 ------
> .../recipes-sato/owl-video-widget/libowl-av_git.bb | 8 ++--
> .../owl-video/gtk_multithread_safe.patch | 40 -------------------
> .../owl-video-widget/owl-video/make-382.patch | 17 --------
> .../recipes-sato/owl-video-widget/owl-video_git.bb | 8 ++--
> 6 files changed, 6 insertions(+), 122 deletions(-)
> delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
> delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
> delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
> delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
>
Merged into OE-Core
Thanks
Sau!
> Ross Burton (2):
> owl-video: patches pushed upstream, so bump srcrev
> libowl-av: patches merged upstream, bump srcrev
>
> .../libowl-av/gst_change_state.patch | 42 --------------------
> .../owl-video-widget/libowl-av/make-382.patch | 13 ------
> .../recipes-sato/owl-video-widget/libowl-av_git.bb | 8 ++--
> .../owl-video/gtk_multithread_safe.patch | 40 -------------------
> .../owl-video-widget/owl-video/make-382.patch | 17 --------
> .../recipes-sato/owl-video-widget/owl-video_git.bb | 8 ++--
> 6 files changed, 6 insertions(+), 122 deletions(-)
> delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
> delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
> delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
> delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
>
^ permalink raw reply [flat|nested] 4+ messages in thread