merge of '744cf977fa353b9dedb30f35cd9ba988ade94e8d'

     and 'cbd73e4685a6b456be3670606d5020189741092e'

6 files changed, 75 insertions, 0 deletions

diff --git a/packages/gnome-mplayer/.mtn2git_empty b/packages/gnome-mplayer/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome-mplayer/.mtn2git_empty
diff --git a/packages/gnome-mplayer/files/.mtn2git_empty b/packages/gnome-mplayer/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome-mplayer/files/.mtn2git_empty
diff --git a/packages/gnome-mplayer/files/1.patch b/packages/gnome-mplayer/files/1.patch
new file mode 100644
index 0000000000..77e03365f4
--- /dev/null
+++ b/packages/gnome-mplayer/files/1.patch
@@ -0,0 +1,37 @@
+# HG changeset patch
+# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>"
+# Date 1199174323 -7200
+# Node ID d630a2e72d3fa094a330f5bd6351b0cf7c9690a6
+# Parent  4b4820fa6fff9dbb8c6c8e1bd23eed54faf10982
+gui.c: Add vertical pane layout for main i/f vs playlist.
+Decision which layout to use is based on screen aspect.
+This change will allow sane layout on PDA devices, many
+of which have vertical layout by default. Possible
+improvements:
+1. Add menu check item for users to be able to select layout
+as they see fit.
+
+diff -r 4b4820fa6fff -r d630a2e72d3f src/gui.c
+--- a/src/gui.c	Tue Jan 01 09:29:28 2008 +0200
++++ b/src/gui.c	Tue Jan 01 09:58:43 2008 +0200
+@@ -3071,8 +3071,20 @@ GtkWidget *create_window(gint windowid)
+ 
+     gtk_widget_show(menubar);
+     gtk_widget_show(drawing_area);
++    if (gdk_screen_width() > gdk_screen_height()) {
+ 	pane = gtk_hpaned_new();
+ 	gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,TRUE);
++    } else {
++        GtkRequisition menu_size;
++        GtkRequisition vbox_size;
++        pane = gtk_vpaned_new();
++        gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,FALSE); /* No shrink beyond size request*/
++
++        gtk_widget_size_request(menubar, &menu_size);
++        gtk_widget_size_request(vbox, &vbox_size);
++        /* 5 is adhox compensation for layout issues ;-( */
++        gtk_widget_set_size_request(vbox, -1, menu_size.height + vbox_size.height - 5);
++    }
+ 	
+     gtk_container_add(GTK_CONTAINER(window), pane);
+ 
diff --git a/packages/gnome-mplayer/files/ac-gthread.patch b/packages/gnome-mplayer/files/ac-gthread.patch
new file mode 100644
index 0000000000..ea4abf143d
--- /dev/null
+++ b/packages/gnome-mplayer/files/ac-gthread.patch
@@ -0,0 +1,12 @@
+diff -r d630a2e72d3f configure.in
+--- a/configure.in	Tue Jan 01 09:58:43 2008 +0200
++++ b/configure.in	Tue Jan 01 10:16:44 2008 +0200
+@@ -32,7 +32,7 @@ AM_PROG_LIBTOOL
+ #AC_SUBST(GNOME_CFLAGS)
+ #AC_SUBST(GNOME_LIBS)
+ 
+-PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0 gthread-2.0])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
diff --git a/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb b/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
new file mode 100644
index 0000000000..a6119e0b07
--- /dev/null
+++ b/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
+HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gconf dbus-glib"
+PR = "r1"
+
+inherit autotools pkgconfig gconf
+
+SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
+    file://ac-gthread.patch;patch=1 \
+    file://1.patch;patch=1" 
diff --git a/packages/gnome-mplayer/gnome-mplayer_cvs.bb b/packages/gnome-mplayer/gnome-mplayer_cvs.bb
new file mode 100644
index 0000000000..aa781a4249
--- /dev/null
+++ b/packages/gnome-mplayer/gnome-mplayer_cvs.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
+HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gconf dbus-glib"
+SRCDATE = "20080101"
+PV = "0.5.3+cvs${SRCDATE}"
+PR = "r1"
+
+inherit autotools pkgconfig gconf
+
+S = "${WORKDIR}/${PN}"
+
+SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \
+    file://ac-gthread.patch;patch=1 \
+    file://1.patch;patch=1"