aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-sato
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2015-03-22 22:14:14 -0400
committerDrew Moseley <drew_moseley@mentor.com>2015-03-22 22:14:14 -0400
commit8601bc5c9a383df8caa8844fce4ebb9a38ff6657 (patch)
tree88cf9ac94182af71ad2645c17a30e5122229a5be /common/recipes-sato
parentcf904ad3360db5eae86486a7ea97311cab91d05d (diff)
downloadmeta-amd-8601bc5c9a383df8caa8844fce4ebb9a38ff6657.tar.gz
meta-amd-8601bc5c9a383df8caa8844fce4ebb9a38ff6657.tar.bz2
meta-amd-8601bc5c9a383df8caa8844fce4ebb9a38ff6657.zip
owl: remove (replaced by gst-player)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Diffstat (limited to 'common/recipes-sato')
-rw-r--r--common/recipes-sato/owl-video-widget/files/upgrade-gstreamer.patch158
-rw-r--r--common/recipes-sato/owl-video-widget/libowl-av_git.bbappend8
2 files changed, 0 insertions, 166 deletions
diff --git a/common/recipes-sato/owl-video-widget/files/upgrade-gstreamer.patch b/common/recipes-sato/owl-video-widget/files/upgrade-gstreamer.patch
deleted file mode 100644
index 6f1ba74e..00000000
--- a/common/recipes-sato/owl-video-widget/files/upgrade-gstreamer.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8747268..90cf26f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,9 +12,9 @@ AC_STDC_HEADERS
- AC_PROG_LIBTOOL
-
- PKG_CHECK_MODULES(LIBOWL_AV, gtk+-2.0 \
-- gstreamer-0.10 \
-- gstreamer-plugins-base-0.10)
--LIBOWL_AV_LIBS="$LIBOWL_AV_LIBS -lgstinterfaces-0.10"
-+ gstreamer-1.0 \
-+ gstreamer-plugins-base-1.0)
-+LIBOWL_AV_LIBS="$LIBOWL_AV_LIBS -lgstvideo-1.0"
-
- PKG_CHECK_MODULES(VALA, [vala-1.0 >= 0.3.1], have_vala=yes, have_vala=no)
-
-diff --git a/libowl-av.pc.in b/libowl-av.pc.in
-index bf45b14..8a83112 100644
---- a/libowl-av.pc.in
-+++ b/libowl-av.pc.in
-@@ -5,7 +5,7 @@ includedir=@includedir@
-
- Name: libowl-av
- Description: OpenedHand Audio/Video Widgets Library
--Requires: gtk+-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10
-+Requires: gtk+-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0
- Version: @VERSION@
--Libs: -L${libdir} -lowl-av -lgstinterfaces-0.10
-+Libs: -L${libdir} -lowl-av -lgstvideo-1.0
- Cflags: -I${includedir}
-diff --git a/libowl-av/owl-tag-reader.c b/libowl-av/owl-tag-reader.c
-index a03aadf..b7a0316 100644
---- a/libowl-av/owl-tag-reader.c
-+++ b/libowl-av/owl-tag-reader.c
-@@ -80,7 +80,8 @@ feed_head (OwlTagReader *tag_reader)
- * Get appropriate src element.
- **/
- tag_reader->priv->src =
-- gst_element_make_from_uri (GST_URI_SRC, data->uri, "src");
-+ gst_element_make_from_uri (GST_URI_SRC, data->uri, "src",
-+ &tag_reader->priv->current_error);
-
- /**
- * Add to pipeline & link up.
-@@ -250,7 +251,7 @@ bus_message_application_cb (GstBus *bus,
- **/
- if (!tag_reader->priv->current_tag_list) {
- tag_reader->priv->current_tag_list =
-- gst_tag_list_new ();
-+ gst_tag_list_new_empty ();
- }
-
- /**
-@@ -287,7 +288,7 @@ decodebin_new_decoded_pad_cb (GstElement *decodebin,
- * The last discovered pad will always be the one hooked up to
- * the sink.
- **/
-- sink_pad = gst_element_get_pad (tag_reader->priv->sink, "sink");
-+ sink_pad = gst_element_get_static_pad (tag_reader->priv->sink, "sink");
- gst_pad_link (pad, sink_pad);
- }
-
-diff --git a/libowl-av/owl-video-widget.c b/libowl-av/owl-video-widget.c
-index e200155..af90f39 100644
---- a/libowl-av/owl-video-widget.c
-+++ b/libowl-av/owl-video-widget.c
-@@ -21,7 +21,7 @@
-
- #include <gdk/gdkx.h>
- #include <gst/gst.h>
--#include <gst/interfaces/xoverlay.h>
-+#include <gst/video/videooverlay.h>
-
- #include "owl-video-widget.h"
-
-@@ -40,7 +40,7 @@ G_DEFINE_TYPE (OwlVideoWidget,
-
- struct _OwlVideoWidgetPrivate {
- GstElement *playbin;
-- GstXOverlay *overlay;
-+ GstVideoOverlay *overlay;
-
- GMutex *overlay_lock;
-
-@@ -168,7 +168,7 @@ bus_sync_handler_cb (GstBus *bus,
- if (!str)
- return GST_BUS_PASS;
-
-- if (!gst_structure_has_name (str, "prepare-xwindow-id"))
-+ if (!gst_structure_has_name (str, "prepare-window-handle"))
- return GST_BUS_PASS;
-
- /**
-@@ -187,7 +187,7 @@ bus_sync_handler_cb (GstBus *bus,
- (gpointer) &video_widget->priv->overlay);
- }
-
-- video_widget->priv->overlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message));
-+ video_widget->priv->overlay = GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message));
-
- g_object_add_weak_pointer (G_OBJECT (video_widget->priv->overlay),
- (gpointer) &video_widget->priv->overlay);
-@@ -206,13 +206,13 @@ bus_sync_handler_cb (GstBus *bus,
- else
- xid = create_dummy_window (video_widget);
-
-- gst_x_overlay_set_xwindow_id (video_widget->priv->overlay, xid);
-+ gst_video_overlay_set_window_handle (video_widget->priv->overlay, xid);
-
- /**
- * And expose.
- **/
- if (GTK_WIDGET_REALIZED (video_widget))
-- gst_x_overlay_expose (video_widget->priv->overlay);
-+ gst_video_overlay_expose (video_widget->priv->overlay);
-
- /**
- * Unlock.
-@@ -507,7 +507,8 @@ construct_pipeline (OwlVideoWidget *video_widget)
-
- gst_bus_set_sync_handler (bus,
- (GstBusSyncHandler) bus_sync_handler_cb,
-- video_widget);
-+ video_widget,
-+ NULL);
-
- g_signal_connect_object (bus,
- "message::error",
-@@ -776,8 +777,8 @@ owl_video_widget_realize (GtkWidget *widget)
- XID xid;
-
- xid = GDK_WINDOW_XID (widget->window);
-- gst_x_overlay_set_xwindow_id (video_widget->priv->overlay, xid);
-- gst_x_overlay_expose (video_widget->priv->overlay);
-+ gst_video_overlay_set_window_handle (video_widget->priv->overlay, xid);
-+ gst_video_overlay_expose (video_widget->priv->overlay);
-
- /**
- * Destroy dummy window if it was there.
-@@ -817,7 +818,7 @@ owl_video_widget_unrealize (GtkWidget *widget)
-
- xid = create_dummy_window (video_widget);
-
-- gst_x_overlay_set_xwindow_id (video_widget->priv->overlay, xid);
-+ gst_video_overlay_set_window_handle (video_widget->priv->overlay, xid);
- }
-
- /**
-@@ -864,7 +865,7 @@ owl_video_widget_expose (GtkWidget *widget,
- * If we have an overlay, forward the expose to GStreamer.
- **/
- if (video_widget->priv->overlay)
-- gst_x_overlay_expose (video_widget->priv->overlay);
-+ gst_video_overlay_expose (video_widget->priv->overlay);
-
- /**
- * Unlock.
diff --git a/common/recipes-sato/owl-video-widget/libowl-av_git.bbappend b/common/recipes-sato/owl-video-widget/libowl-av_git.bbappend
deleted file mode 100644
index 70195bf9..00000000
--- a/common/recipes-sato/owl-video-widget/libowl-av_git.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-DEPENDS_remove_amd = " gstreamer gst-plugins-base"
-DEPENDS_append_amd = " gstreamer1.0 gstreamer1.0-plugins-base"
-RDEPENDS_${PN}_amd = "gstreamer1.0-meta-base"
-RRECOMMENDS_${PN}_amd = "gstreamer1.0-meta-audio gstreamer1.0-meta-video"
-
-SRC_URI_append_amd = " file://upgrade-gstreamer.patch"