This patch brings gst-player up to a more recent version (2015-0-21)
Also, drop old patches which have been incorporated upstream.
Signed-off-by: Gary Thomas <g...@mlbassoc.com>
---
.../gstreamer/gst-player/gtk2.patch | 121 +++++++++++++++++++--
.../recipes-multimedia/gstreamer/gst-player_git.bb | 7 +-
2 files changed, 112 insertions(+), 16 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
index 2cd18bb..6cc8946 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
@@ -5,10 +5,10 @@ Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.bur...@intel.com>
-diff --git a/configure.ac b/configure.ac
-index b8af13b..90ab74c 100644
---- a/configure.ac
-+++ b/configure.ac
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
@@ -60,7 +60,7 @@ AC_SUBST(GLIB_PREFIX)
GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`"
AC_SUBST(GST_PREFIX)
@@ -18,14 +18,15 @@ index b8af13b..90ab74c 100644
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" != "xno")
GOBJECT_INTROSPECTION_CHECK([1.31.1])
-diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c
-index f015077..954d6fb 100644
---- a/gtk/gtk-play.c
-+++ b/gtk/gtk-play.c
-@@ -34,6 +34,46 @@ typedef struct
- gulong seekbar_value_changed_signal_id;
- } GtkPlay;
+Index: git/gtk/gtk-play.c
+===================================================================
+--- git.orig/gtk/gtk-play.c
++++ git/gtk/gtk-play.c
+@@ -98,6 +98,145 @@ enum
+ };
+ static void display_cover_art (GtkPlay * play, GstPlayerMediaInfo *
media_info);
++
+/* Compat stubs */
+GtkWidget *
+gtk_box_new (GtkOrientation orientation,
@@ -66,6 +67,104 @@ index f015077..954d6fb 100644
+ return gtk_vscale_new_with_range (min, max, step);
+ }
+}
++
++/**
++ * gtk_window_close:
++ * @window: a #GtkWindow
++ *
++ * Requests that the window is closed, similar to what happens
++ * when a window manager close button is clicked.
++ *
++ * This function can be used with close buttons in custom
++ * titlebars.
++ *
++ * Since: 3.10
++ */
++void
++gtk_window_close (GtkWindow *window)
++{
++#if 0
++ if (!gtk_widget_get_realized (GTK_WIDGET (window)))
++ return;
++
++ window->priv->delete_event_handler = gdk_threads_add_idle
(send_delete_event, window);
++ g_source_set_name_by_id (window->priv->delete_event_handler, "[gtk+]
send_delete_event");
++#endif
++ gtk_widget_destroy(window);
++}
++
++/**
++ * gtk_widget_is_visible:
++ * @widget: a #GtkWidget
++ *
++ * Determines whether the widget and all its parents are marked as
++ * visible.
++ *
++ * This function does not check if the widget is obscured in any way.
++ *
++ * See also gtk_widget_get_visible() and gtk_widget_set_visible()
++ *
++ * Returns: %TRUE if the widget and all its parents are visible
++ *
++ * Since: 3.8
++ **/
++gboolean
++gtk_widget_is_visible (GtkWidget *widget)
++{
++ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
++
++ while (widget)
++ {
++ // GtkWidgetPrivate *priv = widget->priv;
++
++ if (!gtk_widget_get_visible(widget))
++ return FALSE;
++
++ // widget = priv->parent;
++ widget = widget->parent;
++ }
++
++ return TRUE;
++}
++
++/**
++ * gtk_widget_get_allocated_width:
++ * @widget: the widget to query
++ *
++ * Returns the width that has currently been allocated to @widget.
++ * This function is intended to be used when implementing handlers
++ * for the #GtkWidget::draw function.
++ *
++ * Returns: the width of the @widget
++ **/
++int
++gtk_widget_get_allocated_width (GtkWidget *widget)
++{
++ g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
++
++ return widget->allocation.width;
++}
++
++/**
++ * gtk_widget_get_allocated_height:
++ * @widget: the widget to query
++ *
++ * Returns the height that has currently been allocated to @widget.
++ * This function is intended to be used when implementing handlers
++ * for the #GtkWidget::draw function.
++ *
++ * Returns: the height of the @widget
++ **/
++int
++gtk_widget_get_allocated_height (GtkWidget *widget)
++{
++ g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
++
++ return widget->allocation.height;
++}
++
++
++/* end compat stubs */
static void
set_title (GtkPlay * play, const gchar * title)
diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
index 54cfbbc..7a68284 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
@@ -1,18 +1,15 @@
SUMMARY="GStreamer playback helper library and examples"
LICENSE = "LGPL-2.0+"
-LIC_FILES_CHKSUM =
"file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65"
+LIC_FILES_CHKSUM =
"file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=e17548b76f29cc2fe3de3b61f9ff02d6"
DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+"
SRC_URI = "git://github.com/sdroege/gst-player.git \
- file://filechooser.patch \
file://gtk2.patch \
- file://Fix-pause-play.patch \
- file://Add-error-signal-emission-for-missing-plugins.patch \
file://gst-player.desktop"
-SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645"
+SRCREV = "88e04854ffbeffb5fa37073fb6c1922a49bd16e5"
S = "${WORKDIR}/git"
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
