summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-26 10:03:21 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:23 +0100
commit457f8256e96b838a02e0b8a15a7501a2c4738987 (patch)
treed70238a6b7d409f70ac4d9d7d08be195210149f6
parent70f465159ac8ed5604976529d4d25150844c1b43 (diff)
downloadpoky-457f8256e96b838a02e0b8a15a7501a2c4738987.tar.gz
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>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch71
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-player_git.bb5
3 files changed, 3 insertions, 75 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
index 9fd207b384..7ddd456a1e 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
+++ b/meta/recipes-multimedia/gstreamer/gst-player/gst-player.desktop
@@ -1,7 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Name=Media Player 2Name=Media Player
3Comment=Basic media player 3Comment=Basic media player
4Icon=audio-player 4Icon=multimedia-player
5TryExec=gtk-play 5TryExec=gtk-play
6Exec=gtk-play 6Exec=gtk-play
7StartupNotify=true 7StartupNotify=true
diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
deleted file mode 100644
index 2cd18bbc95..0000000000
--- a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1As the rest of Sato is GTK+ 2, patch gtk-play to use GTK+ 2. When the rest of
2Sato has been ported to GTK+ 3 this patch can be dropped.
3
4Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7
8diff --git a/configure.ac b/configure.ac
9index b8af13b..90ab74c 100644
10--- a/configure.ac
11+++ b/configure.ac
12@@ -60,7 +60,7 @@ AC_SUBST(GLIB_PREFIX)
13 GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`"
14 AC_SUBST(GST_PREFIX)
15
16-PKG_CHECK_MODULES(GTK, [gtk+-3.0], [have_gtk="yes"], [have_gtk="no"])
17+PKG_CHECK_MODULES(GTK, [gtk+-2.0], [have_gtk="yes"], [have_gtk="no"])
18 AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" != "xno")
19
20 GOBJECT_INTROSPECTION_CHECK([1.31.1])
21diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c
22index f015077..954d6fb 100644
23--- a/gtk/gtk-play.c
24+++ b/gtk/gtk-play.c
25@@ -34,6 +34,46 @@ typedef struct
26 gulong seekbar_value_changed_signal_id;
27 } GtkPlay;
28
29+/* Compat stubs */
30+GtkWidget *
31+gtk_box_new (GtkOrientation orientation,
32+ gint spacing)
33+{
34+ switch (orientation) {
35+ case GTK_ORIENTATION_HORIZONTAL:
36+ return gtk_hbox_new (FALSE, spacing);
37+ case GTK_ORIENTATION_VERTICAL:
38+ return gtk_vbox_new (FALSE, spacing);
39+ }
40+}
41+
42+GtkWidget*
43+gtk_button_new_from_icon_name (const gchar *icon_name,
44+ GtkIconSize size)
45+{
46+ GtkWidget *button;
47+ GtkWidget *image;
48+
49+ image = gtk_image_new_from_icon_name (icon_name, size);
50+ button = g_object_new (GTK_TYPE_BUTTON,
51+ "image", image,
52+ NULL);
53+ return button;
54+}
55+
56+GtkWidget *
57+gtk_scale_new_with_range (GtkOrientation orientation,
58+ gdouble min,
59+ gdouble max,
60+ gdouble step)
61+{
62+ switch (orientation) {
63+ case GTK_ORIENTATION_HORIZONTAL:
64+ return gtk_hscale_new_with_range (min, max, step);
65+ case GTK_ORIENTATION_VERTICAL:
66+ return gtk_vscale_new_with_range (min, max, step);
67+ }
68+}
69
70 static void
71 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 8129169c53..6d39c2de2d 100644
--- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb
@@ -2,11 +2,10 @@ SUMMARY = "GStreamer playback helper library and examples"
2LICENSE = "LGPL-2.0+" 2LICENSE = "LGPL-2.0+"
3LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65" 3LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65"
4 4
5DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+" 5DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+3"
6 6
7SRC_URI = "git://github.com/sdroege/gst-player.git \ 7SRC_URI = "git://github.com/sdroege/gst-player.git \
8 file://filechooser.patch \ 8 file://filechooser.patch \
9 file://gtk2.patch \
10 file://Fix-pause-play.patch \ 9 file://Fix-pause-play.patch \
11 file://Add-error-signal-emission-for-missing-plugins.patch \ 10 file://Add-error-signal-emission-for-missing-plugins.patch \
12 file://gst-player.desktop" 11 file://gst-player.desktop"
@@ -17,7 +16,7 @@ S = "${WORKDIR}/git"
17 16
18inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection 17inherit autotools gtk-doc lib_package pkgconfig distro_features_check gobject-introspection
19 18
20ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" 19ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
21 20
22do_configure_prepend() { 21do_configure_prepend() {
23 touch ${S}/ChangeLog 22 touch ${S}/ChangeLog