gst-player: Start building with Gtk+3
Drop the patch that added gtk+2 support. Use an icon that is found in adwaita icon theme. (From OE-Core rev: 9fc64086b3d7e37493c800f0228d47b1c7bdd1c8) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
70f465159a
commit
457f8256e9
|
@ -1,7 +1,7 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Media Player
|
Name=Media Player
|
||||||
Comment=Basic media player
|
Comment=Basic media player
|
||||||
Icon=audio-player
|
Icon=multimedia-player
|
||||||
TryExec=gtk-play
|
TryExec=gtk-play
|
||||||
Exec=gtk-play
|
Exec=gtk-play
|
||||||
StartupNotify=true
|
StartupNotify=true
|
||||||
|
|
|
@ -1,71 +0,0 @@
|
||||||
As the rest of Sato is GTK+ 2, patch gtk-play to use GTK+ 2. When the rest of
|
|
||||||
Sato has been ported to GTK+ 3 this patch can be dropped.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index b8af13b..90ab74c 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -60,7 +60,7 @@ AC_SUBST(GLIB_PREFIX)
|
|
||||||
GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`"
|
|
||||||
AC_SUBST(GST_PREFIX)
|
|
||||||
|
|
||||||
-PKG_CHECK_MODULES(GTK, [gtk+-3.0], [have_gtk="yes"], [have_gtk="no"])
|
|
||||||
+PKG_CHECK_MODULES(GTK, [gtk+-2.0], [have_gtk="yes"], [have_gtk="no"])
|
|
||||||
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;
|
|
||||||
|
|
||||||
+/* Compat stubs */
|
|
||||||
+GtkWidget *
|
|
||||||
+gtk_box_new (GtkOrientation orientation,
|
|
||||||
+ gint spacing)
|
|
||||||
+{
|
|
||||||
+ switch (orientation) {
|
|
||||||
+ case GTK_ORIENTATION_HORIZONTAL:
|
|
||||||
+ return gtk_hbox_new (FALSE, spacing);
|
|
||||||
+ case GTK_ORIENTATION_VERTICAL:
|
|
||||||
+ return gtk_vbox_new (FALSE, spacing);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+GtkWidget*
|
|
||||||
+gtk_button_new_from_icon_name (const gchar *icon_name,
|
|
||||||
+ GtkIconSize size)
|
|
||||||
+{
|
|
||||||
+ GtkWidget *button;
|
|
||||||
+ GtkWidget *image;
|
|
||||||
+
|
|
||||||
+ image = gtk_image_new_from_icon_name (icon_name, size);
|
|
||||||
+ button = g_object_new (GTK_TYPE_BUTTON,
|
|
||||||
+ "image", image,
|
|
||||||
+ NULL);
|
|
||||||
+ return button;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+GtkWidget *
|
|
||||||
+gtk_scale_new_with_range (GtkOrientation orientation,
|
|
||||||
+ gdouble min,
|
|
||||||
+ gdouble max,
|
|
||||||
+ gdouble step)
|
|
||||||
+{
|
|
||||||
+ switch (orientation) {
|
|
||||||
+ case GTK_ORIENTATION_HORIZONTAL:
|
|
||||||
+ return gtk_hscale_new_with_range (min, max, step);
|
|
||||||
+ case GTK_ORIENTATION_VERTICAL:
|
|
||||||
+ return gtk_vscale_new_with_range (min, max, step);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
|
|
||||||
static void
|
|
||||||
set_title (GtkPlay * play, const gchar * title)
|
|
|
@ -2,11 +2,10 @@ SUMMARY = "GStreamer playback helper library and examples"
|
||||||
LICENSE = "LGPL-2.0+"
|
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=03aeca9d8295f811817909075a15ff65"
|
||||||
|
|
||||||
DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+"
|
DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+3"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/sdroege/gst-player.git \
|
SRC_URI = "git://github.com/sdroege/gst-player.git \
|
||||||
file://filechooser.patch \
|
file://filechooser.patch \
|
||||||
file://gtk2.patch \
|
|
||||||
file://Fix-pause-play.patch \
|
file://Fix-pause-play.patch \
|
||||||
file://Add-error-signal-emission-for-missing-plugins.patch \
|
file://Add-error-signal-emission-for-missing-plugins.patch \
|
||||||
file://gst-player.desktop"
|
file://gst-player.desktop"
|
||||||
|
@ -17,7 +16,7 @@ S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection
|
inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection
|
||||||
|
|
||||||
ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
|
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
touch ${S}/ChangeLog
|
touch ${S}/ChangeLog
|
||||||
|
|
Loading…
Reference in New Issue