On Wed, 22 Sep 2010, David Coppa wrote: > Hi, > The following diff updates gnome-mplayer to version 0.9.99.rc1. > When the final 0.9.99 release will come out, a lot of patches > will be removed... In the meantime, please test!
New diff, following my latest commit... Ciao, David Index: Makefile =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 22 Sep 2010 12:04:07 -0000 1.20 +++ Makefile 22 Sep 2010 12:24:26 -0000 @@ -1,8 +1,8 @@ # $OpenBSD: Makefile,v 1.20 2010/09/22 12:04:07 dcoppa Exp $ COMMENT = GTK+/GNOME frontend for MPlayer -DISTNAME = gnome-mplayer-0.9.9.2 -REVISION= 3 +DISTNAME = gnome-mplayer-0.9.99.rc1 +PKGNAME = gnome-mplayer-0.9.99rc1 CATEGORIES = x11 multimedia MAINTAINER = David Coppa <[email protected]> @@ -55,8 +55,6 @@ CONFIGURE_ARGS = --with-gio \ --enable-panscan \ --without-alsa \ --without-flat-volume \ - --without-gpm-new-method \ - --without-gpm-old-method \ --disable-nautilus post-install: Index: distinfo =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 29 Mar 2010 12:16:07 -0000 1.4 +++ distinfo 22 Sep 2010 12:24:26 -0000 @@ -1,5 +1,5 @@ -MD5 (gnome-mplayer-0.9.9.2.tar.gz) = eYEJE9JFdVtgwn034dHxeA== -RMD160 (gnome-mplayer-0.9.9.2.tar.gz) = DnPhxhCfB7ln8wvXIl6sfpxsnOY= -SHA1 (gnome-mplayer-0.9.9.2.tar.gz) = tGpua87I0hS3vSV+k5sL/1xn9mA= -SHA256 (gnome-mplayer-0.9.9.2.tar.gz) = aVpUwA210KD1lusaEKWK0ypE6NbHWF18huDXXO8KSLQ= -SIZE (gnome-mplayer-0.9.9.2.tar.gz) = 828006 +MD5 (gnome-mplayer-0.9.99.rc1.tar.gz) = O2OlQe/xjmV+8d/CuGiwSw== +RMD160 (gnome-mplayer-0.9.99.rc1.tar.gz) = 1Q+G776Gc/CzDZnhVYOlW/esMLI= +SHA1 (gnome-mplayer-0.9.99.rc1.tar.gz) = mzojNNsTz0M64KoRTqaG3FydlOc= +SHA256 (gnome-mplayer-0.9.99.rc1.tar.gz) = YYr5+eVaROydhi/YnIe0cp6ga8LD1H0XajRDra5kywE= +SIZE (gnome-mplayer-0.9.99.rc1.tar.gz) = 886427 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure --- patches/patch-configure 29 Mar 2010 12:16:07 -0000 1.2 +++ patches/patch-configure 22 Sep 2010 12:24:26 -0000 @@ -1,10 +1,11 @@ $OpenBSD: patch-configure,v 1.2 2010/03/29 12:16:07 dcoppa Exp $ don't check for libgpod 0.6.x: it's not in our ports tree +disable gnome-power-manager support ---- configure.orig Mon Feb 22 22:46:24 2010 -+++ configure Tue Mar 23 14:55:56 2010 -@@ -653,8 +653,6 @@ GPOD_CFLAGS +--- configure.orig Thu Aug 19 21:52:29 2010 ++++ configure Wed Sep 22 13:09:32 2010 +@@ -609,8 +609,6 @@ GPOD_CFLAGS GPOD07_LIBS GPOD07_CFLAGS GPOD_DEFINES @@ -13,7 +14,7 @@ don't check for libgpod 0.6.x: it's not NOTIFY_DEFINES NOTIFY_LIBS NOTIFY_CFLAGS -@@ -855,8 +853,6 @@ ALSA_CFLAGS +@@ -818,8 +816,6 @@ ALSA_CFLAGS ALSA_LIBS NOTIFY_CFLAGS NOTIFY_LIBS @@ -22,7 +23,7 @@ don't check for libgpod 0.6.x: it's not GPOD07_CFLAGS GPOD07_LIBS MUSICBRAINZ_CFLAGS -@@ -1562,9 +1558,6 @@ Some influential environment variables: +@@ -1519,9 +1515,6 @@ Some influential environment variables: NOTIFY_CFLAGS C compiler flags for NOTIFY, overriding pkg-config NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config @@ -32,22 +33,22 @@ don't check for libgpod 0.6.x: it's not GPOD07_CFLAGS C compiler flags for GPOD07, overriding pkg-config GPOD07_LIBS linker flags for GPOD07, overriding pkg-config -@@ -9879,87 +9872,6 @@ fi - if test "x$with_libgpod" != xno; then +@@ -8338,84 +8331,6 @@ fi + if test "x$with_libgpod" != xno; then : pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for GPOD06" >&5 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPOD06" >&5 -$as_echo_n "checking for GPOD06... " >&6; } - -if test -n "$GPOD06_CFLAGS"; then - pkg_cv_GPOD06_CFLAGS="$GPOD06_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 <= 0.6.0\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 <= 0.6.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgpod-1.0 <= 0.6.0") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then - pkg_cv_GPOD06_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0 <= 0.6.0" 2>/dev/null` -else - pkg_failed=yes @@ -59,11 +60,11 @@ don't check for libgpod 0.6.x: it's not - pkg_cv_GPOD06_LIBS="$GPOD06_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 <= 0.6.0\"") >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 <= 0.6.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgpod-1.0 <= 0.6.0") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then - pkg_cv_GPOD06_LIBS=`$PKG_CONFIG --libs "libgpod-1.0 <= 0.6.0" 2>/dev/null` -else - pkg_failed=yes @@ -89,22 +90,20 @@ don't check for libgpod 0.6.x: it's not - # Put the nasty error message in config.log where it belongs - echo "$GPOD06_PKG_ERRORS" >&5 - -- { $as_echo "$as_me:$LINENO: result: no" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -- { $as_echo "$as_me:$LINENO: WARNING: Compiling without libgpod 0.6.0 support" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without libgpod 0.6.0 support" >&5 -$as_echo "$as_me: WARNING: Compiling without libgpod 0.6.0 support" >&2;} -elif test $pkg_failed = untried; then -- { $as_echo "$as_me:$LINENO: WARNING: Compiling without libgpod 0.6.0 support" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiling without libgpod 0.6.0 support" >&5 -$as_echo "$as_me: WARNING: Compiling without libgpod 0.6.0 support" >&2;} -else - GPOD06_CFLAGS=$pkg_cv_GPOD06_CFLAGS - GPOD06_LIBS=$pkg_cv_GPOD06_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - GPOD_DEFINES="-DHAVE_GPOD -DGPOD_06" --cat >>confdefs.h <<\_ACEOF --#define GPOD_ENABLED 1 --_ACEOF +-$as_echo "#define GPOD_ENABLED 1" >>confdefs.h - -fi - @@ -113,16 +112,15 @@ don't check for libgpod 0.6.x: it's not - -fi - -- --if test "x$with_libgpod" != xno; then +-if test "x$with_libgpod" != xno; then : - -pkg_failed=no - { $as_echo "$as_me:$LINENO: checking for GPOD07" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPOD07" >&5 $as_echo_n "checking for GPOD07... " >&6; } -@@ -10038,8 +9950,8 @@ fi - fi +@@ -8491,8 +8406,8 @@ fi + fi -GPOD_CFLAGS="$GPOD06_CFLAGS $GPOD07_CFLAGS" -GPOD_LIBS="$GPOD06_LIBS $GPOD07_LIBS" @@ -131,3 +129,44 @@ don't check for libgpod 0.6.x: it's not +@@ -8749,40 +8664,6 @@ $as_echo "#define SS_INHIBIT 0" >>confdefs.h + + + +-# Check whether --with-gpm-new-method was given. +-if test "${with_gpm_new_method+set}" = set; then : +- withval=$with_gpm_new_method; CHECK_GPM=no +-$as_echo "#define SM_INHIBIT 1" >>confdefs.h +- +-fi +- +- +-# Check whether --with-gpm-old-method was given. +-if test "${with_gpm_old_method+set}" = set; then : +- withval=$with_gpm_old_method; CHECK_GPM=no +-$as_echo "#define SS_INHIBIT 1" >>confdefs.h +- +-fi +- +- +-if test x$CHECK_GPM = "xyes"; then +- if test -x `which gnome-power-manager`; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for gnome-power-manager support" >&5 +-$as_echo "$as_me: Checking for gnome-power-manager support" >&6;} +- GPMVER=`gnome-power-manager --version | sed -e 's/.* 2.//' | cut -b1-2` +- if test $GPMVER -ge 26; then +- +-$as_echo "#define SM_INHIBIT 1" >>confdefs.h +- +- fi +- if test $GPMVER -lt 26; then +- +-$as_echo "#define SS_INHIBIT 1" >>confdefs.h +- +- fi +- +- fi +-fi + + for ac_header in mntent.h + do : Index: patches/patch-gnome-mplayer_schemas_in =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-gnome-mplayer_schemas_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-gnome-mplayer_schemas_in --- patches/patch-gnome-mplayer_schemas_in 29 Mar 2010 12:16:07 -0000 1.2 +++ patches/patch-gnome-mplayer_schemas_in 22 Sep 2010 12:24:26 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-gnome-mplayer_schemas_in,v 1.2 2010/03/29 12:16:07 dcoppa Exp $ -set some sane defaults: +set some sane defaults: use mplayer's software volume control (see pkg/MESSAGE) disable bar animation in full screen use xscrnsaver controls over gnome-power-manager Index: patches/patch-src_common_h =================================================================== RCS file: patches/patch-src_common_h diff -N patches/patch-src_common_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_common_h 22 Sep 2010 12:24:26 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +fix from upstream: +fix problem with "--fullscreen" flag not working + +--- src/common.h.orig Wed Sep 22 12:34:57 2010 ++++ src/common.h Wed Sep 22 12:33:09 2010 +@@ -304,6 +304,7 @@ gint streaming; + gint showcontrols; + gboolean showsubtitles; + gint fullscreen; ++gint init_fullscreen; + gint videopresent; + gint playlist; + gint embed_window; Index: patches/patch-src_gui_c =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_gui_c,v retrieving revision 1.8 diff -u -p -r1.8 patch-src_gui_c --- patches/patch-src_gui_c 8 Jul 2010 06:29:12 -0000 1.8 +++ patches/patch-src_gui_c 22 Sep 2010 12:24:27 -0000 @@ -1,81 +1,166 @@ $OpenBSD: patch-src_gui_c,v 1.8 2010/07/08 06:29:12 dcoppa Exp $ -fixes from upstream svn: -add missing icons to the file menu -activate Open on enter in Open->Location (fix upstream bug #381) -NULL check on retrieve_metadata_pool clear process +fixes from upstream: +fix album art size +fix window resize +fix problem with "--fullscreen" flag not working +minor tweaks to the autopause code -revised audio/video device selection gui +adapt audio/video device selection dialog to what we have on OpenBSD set DVD device to /dev/rcd0c instead of /dev/dvd ---- src/gui.c.orig Thu Feb 25 17:01:41 2010 -+++ src/gui.c Wed May 5 08:58:26 2010 -@@ -1555,11 +1555,13 @@ gboolean delete_callback(GtkWidget * widget, GdkEvent - - if (control_id == 0) { - g_thread_pool_stop_unused_threads(); -- while (gtk_events_pending() || thread != NULL -- || g_thread_pool_unprocessed(retrieve_metadata_pool)) { -- gtk_main_iteration(); -+ if (retrieve_metadata_pool != NULL) { -+ while (gtk_events_pending() || thread != NULL -+ || g_thread_pool_unprocessed(retrieve_metadata_pool)) { -+ gtk_main_iteration(); -+ } -+ g_thread_pool_free(retrieve_metadata_pool, TRUE, TRUE); +--- src/gui.c.orig Wed Aug 11 18:43:10 2010 ++++ src/gui.c Wed Sep 22 12:33:09 2010 +@@ -496,6 +496,10 @@ gboolean set_media_label(void *data) + + gboolean set_cover_art(gpointer pixbuf) + { ++ gint width, height; ++ gfloat aspect; ++ GdkPixbuf *scaled; ++ + if (pixbuf == NULL) { + if (GTK_IS_IMAGE(cover_art)) + gtk_image_clear(GTK_IMAGE(cover_art)); +@@ -505,8 +509,20 @@ gboolean set_cover_art(gpointer pixbuf) + // gtk_widget_hide_all(media_hbox); } -- g_thread_pool_free(retrieve_metadata_pool, TRUE, TRUE); } else { - while (gtk_events_pending() || thread != NULL) { - gtk_main_iteration(); -@@ -2766,6 +2768,7 @@ void menuitem_open_location_callback(GtkMenuItem * men - label = gtk_label_new(_("Location:")); - open_location = gtk_entry_new(); - gtk_entry_set_width_chars(GTK_ENTRY(open_location), 50); -+ gtk_entry_set_activates_default(GTK_ENTRY(open_location),TRUE); - item_box = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(item_box), label, FALSE, FALSE, 12); - gtk_box_pack_end(GTK_BOX(item_box), open_location, TRUE, TRUE, 0); -@@ -4796,15 +4799,13 @@ void menuitem_config_callback(GtkMenuItem * menuitem, - tooltip = gtk_tooltips_new(); - gtk_tooltips_set_tip(tooltip, config_vo, - _ -- ("mplayer video output device\nx11 should always work, try xv or gl for better performance"), -+ ("mplayer video output device\nx11 should always work\nTry xv or gl for better performance"), - NULL); - if (config_vo != NULL) { - gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "gl"); +- gtk_image_set_from_pixbuf(GTK_IMAGE(cover_art), GDK_PIXBUF(pixbuf)); +- g_object_unref(pixbuf); ++ width = gdk_pixbuf_get_width(GDK_PIXBUF(pixbuf)); ++ height = gdk_pixbuf_get_height(GDK_PIXBUF(pixbuf)); ++ ++ if (width > 200) { ++ aspect = (gfloat) width / (gfloat) height; ++ scaled = ++ gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), 200, 200 / aspect, GDK_INTERP_BILINEAR); ++ gtk_image_set_from_pixbuf(GTK_IMAGE(cover_art), GDK_PIXBUF(scaled)); ++ g_object_unref(pixbuf); ++ g_object_unref(scaled); ++ } else { ++ gtk_image_set_from_pixbuf(GTK_IMAGE(cover_art), GDK_PIXBUF(pixbuf)); ++ g_object_unref(pixbuf); ++ } + //gtk_widget_show_all(media_hbox); + } + +@@ -576,7 +592,7 @@ gboolean set_progress_value(void *data) + } + // if ((idle->percent + 0.10) > idle->cachepercent && ((idle->byte_pos + (512 * 1024)) > buf.st_size)) { + // if ((buf.st_size > 0) && (idle->byte_pos + (cache_size * 512)) > buf.st_size) { +- if (((idle->byte_pos + (cache_size * 512)) > buf.st_size) && !(playlist)) { ++ if (((idle->byte_pos + (cache_size * 1024)) > buf.st_size) && !(playlist)) { + pause_callback(NULL, NULL, NULL); + gtk_widget_set_sensitive(play_event_box, FALSE); + autopause = TRUE; +@@ -586,7 +602,7 @@ gboolean set_progress_value(void *data) + } + } + } else if (autopause == TRUE && state == PAUSED) { +- if (idle->cachepercent > (idle->percent + 0.20)) { ++ if (idle->cachepercent > (idle->percent + 0.20) || idle->cachepercent >= 0.99) { + play_callback(NULL, NULL, NULL); + gtk_widget_set_sensitive(play_event_box, TRUE); + autopause = FALSE; +@@ -594,7 +610,7 @@ gboolean set_progress_value(void *data) + } + } + +- if (idle->cachepercent > 0.9) { ++ if (idle->cachepercent > 0.95) { + if (autopause == TRUE && state == PAUSED) { + play_callback(NULL, NULL, NULL); + gtk_widget_set_sensitive(play_event_box, TRUE); +@@ -1263,6 +1279,12 @@ gboolean resize_window(void *data) + } + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_view_fullscreen), + fullscreen); ++ if (init_fullscreen) { ++ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem_view_fullscreen), ++ init_fullscreen); ++ init_fullscreen = 0; ++ } ++ + } else { + if (window_x > 0 && window_y > 0) { + total_height = window_y; +@@ -3566,7 +3588,9 @@ void menuitem_view_onetoone_callback(GtkMenuItem * men + total_width = total_width + plvbox->allocation.width; + } + } +- total_height += controls_box->allocation.height; ++ if (GTK_IS_WIDGET(controls_box) && get_visible(controls_box)) { ++ total_height += controls_box->allocation.height; ++ } + gtk_window_resize(GTK_WINDOW(window), total_width, total_height); + } + } +@@ -3604,7 +3628,9 @@ void menuitem_view_twotoone_callback(GtkMenuItem * men + total_width = total_width + plvbox->allocation.width; + } + } +- total_height += controls_box->allocation.height; ++ if (GTK_IS_WIDGET(controls_box) && get_visible(controls_box)) { ++ total_height += controls_box->allocation.height; ++ } + gtk_window_resize(GTK_WINDOW(window), total_width, total_height); + } + } +@@ -3642,7 +3668,9 @@ void menuitem_view_onetotwo_callback(GtkMenuItem * men + total_width = total_width + plvbox->allocation.width; + } + } +- total_height += controls_box->allocation.height; ++ if (GTK_IS_WIDGET(controls_box) && get_visible(controls_box)) { ++ total_height += controls_box->allocation.height; ++ } + gtk_window_resize(GTK_WINDOW(window), total_width, total_height); + } + } +@@ -5023,9 +5051,6 @@ void menuitem_config_callback(GtkMenuItem * menuitem, gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "gl2"); gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "x11"); gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "xv"); - gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "xvmc"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "vaapi"); - gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), "vdpau"); + if (vo != NULL) { if (strcmp(vo, "gl") == 0) - gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 0); -@@ -4814,14 +4815,10 @@ void menuitem_config_callback(GtkMenuItem * menuitem, +@@ -5036,16 +5061,10 @@ void menuitem_config_callback(GtkMenuItem * menuitem, gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 2); if (strcmp(vo, "xv") == 0) gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 3); - if (strcmp(vo, "xvmc") == 0) - gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 4); -- if (strcmp(vo, "vdpau") == 0) +- if (strcmp(vo, "vaapi") == 0) - gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 5); +- if (strcmp(vo, "vdpau") == 0) +- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 6); if (gtk_combo_box_get_active(GTK_COMBO_BOX(config_vo)) == -1) { gtk_combo_box_append_text(GTK_COMBO_BOX(config_vo), vo); -- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 6); +- gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 7); + gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 4); } } } -@@ -4891,32 +4888,29 @@ void menuitem_config_callback(GtkMenuItem * menuitem, +@@ -5115,39 +5134,36 @@ void menuitem_config_callback(GtkMenuItem * menuitem, + #ifdef GTK2_12_ENABLED + gtk_widget_set_tooltip_text(config_ao, + _ +- ("mplayer audio output device\nalsa or oss should always work, try esd in gnome, arts in kde, or pulse on newer distributions")); ++ ("mplayer audio output device\nsndio should always work\nTry esd under GNOME, arts under KDE\nTry jack if you use the JACK sound server\nUse rtunes if you want to stream to an Apple AirPort Express")); + + #else tooltip = gtk_tooltips_new(); gtk_tooltips_set_tip(tooltip, config_ao, _ - ("mplayer audio output device\nalsa or oss should always work, try esd in gnome, arts in kde, or pulse on newer distributions"), + ("mplayer audio output device\nsndio should always work\nTry esd under GNOME, arts under KDE\nTry jack if you use the JACK sound server\nUse rtunes if you want to stream to an Apple AirPort Express"), NULL); + #endif if (config_ao != NULL) { - gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "alsa"); - gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "arts"); @@ -111,7 +196,7 @@ set DVD device to /dev/rcd0c instead of } } } -@@ -4995,8 +4989,8 @@ void menuitem_config_callback(GtkMenuItem * menuitem, +@@ -5234,8 +5250,8 @@ void menuitem_config_callback(GtkMenuItem * menuitem, j = -1; config_mplayer_dvd_device = gtk_combo_box_entry_new_text(); @@ -122,35 +207,15 @@ set DVD device to /dev/rcd0c instead of j = i; } i++; -@@ -6222,12 +6216,19 @@ GtkWidget *create_window(gint windowid) - gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open)); - menuitem_file_open_folder = - GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open _Folder"))); -+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_folder), -+ gtk_image_new_from_icon_name("folder",GTK_ICON_SIZE_MENU)); - gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open_folder)); - menuitem_file_open_location = - GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open _Location"))); -+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_location), -+ gtk_image_new_from_icon_name("network-server",GTK_ICON_SIZE_MENU)); - gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open_location)); - -- menuitem_file_disc = GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(_("_Disc"))); -+ menuitem_file_disc = -+ GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("_Disc"))); -+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_disc), -+ gtk_image_new_from_icon_name("media-optical",GTK_ICON_SIZE_MENU)); - menu_file_disc = GTK_MENU(gtk_menu_new()); - gtk_widget_show(GTK_WIDGET(menuitem_file_disc)); - gtk_menu_shell_append(GTK_MENU_SHELL(menu_file), GTK_WIDGET(menuitem_file_disc)); -@@ -6276,7 +6277,9 @@ GtkWidget *create_window(gint windowid) +@@ -6604,9 +6620,9 @@ GtkWidget *create_window(gint windowid) gtk_menu_append(menu_file_tv, GTK_WIDGET(menuitem_file_open_dtv)); #ifdef HAVE_GPOD menuitem_file_open_ipod = - GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open _iPod???"))); + GTK_MENU_ITEM(gtk_image_menu_item_new_with_mnemonic(_("Open _iPod"))); -+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_ipod), -+ gtk_image_new_from_icon_name("multimedia-player",GTK_ICON_SIZE_MENU)); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem_file_open_ipod), +- gtk_image_new_from_icon_name("ipod", GTK_ICON_SIZE_MENU)); ++ gtk_image_new_from_icon_name("multimedia-player", GTK_ICON_SIZE_MENU)); + gtk_menu_append(menu_file, GTK_WIDGET(menuitem_file_open_ipod)); #endif - #ifdef GTK2_12_ENABLED Index: patches/patch-src_main_c =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_main_c,v retrieving revision 1.6 diff -u -p -r1.6 patch-src_main_c --- patches/patch-src_main_c 8 Jul 2010 06:29:12 -0000 1.6 +++ patches/patch-src_main_c 22 Sep 2010 12:24:27 -0000 @@ -1,35 +1,25 @@ $OpenBSD: patch-src_main_c,v 1.6 2010/07/08 06:29:12 dcoppa Exp $ -fixes from upstream svn: -fix memory leak when we have an invalid item to play -change metadata timeout count from 10 to 50 (fix upstream bug #391) +fix from upstream: +fix problem with "--fullscreen" flag not working -set some sane defaults: +set some sane defaults: use mplayer's software volume control (see pkg/MESSAGE) disable bar animation in full screen use xscrnsaver controls over gnome-power-manager ---- src/main.c.orig Thu Feb 25 17:01:41 2010 -+++ src/main.c Wed May 5 08:57:01 2010 -@@ -260,6 +260,8 @@ gint play_iter(GtkTreeIter * playiter, gint restart_se - } else { - if (verbose > 1) - printf("iter is invalid, nothing to play\n"); -+ g_free(thread_data); -+ thread_data = NULL; - return 0; - } - -@@ -281,7 +283,7 @@ gint play_iter(GtkTreeIter * playiter, gint restart_se - if (!streaming_media(uri) && !device_name(uri)) { - i = 0; - if (playable) { -- while (demuxer == NULL && i < 10) { -+ while (demuxer == NULL && i < 50) { - g_free(title); - g_free(artist); - g_free(album); -@@ -688,7 +690,7 @@ int main(int argc, char *argv[]) +--- src/main.c.orig Wed Aug 11 18:43:10 2010 ++++ src/main.c Wed Sep 22 12:33:09 2010 +@@ -57,7 +57,7 @@ static GOptionEntry entries[] = { + {"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, N_("Show more output on the console"), NULL}, + {"reallyverbose", '\0', 0, G_OPTION_ARG_NONE, &reallyverbose, + N_("Show even more output on the console"), NULL}, +- {"fullscreen", 0, 0, G_OPTION_ARG_NONE, &fullscreen, N_("Start in fullscreen mode"), NULL}, ++ {"fullscreen", 0, 0, G_OPTION_ARG_NONE, &init_fullscreen, N_("Start in fullscreen mode"), NULL}, + {"softvol", 0, 0, G_OPTION_ARG_NONE, &softvol, N_("Use mplayer software volume control"), NULL}, + {"remember_softvol", 0, 0, G_OPTION_ARG_NONE, &remember_softvol, + N_("When set to TRUE the last volume level is set as the default"), NULL}, +@@ -690,7 +690,7 @@ int main(int argc, char *argv[]) playlist_visible = FALSE; disable_fullscreen = FALSE; disable_framedrop = FALSE; @@ -38,7 +28,7 @@ use xscrnsaver controls over gnome-power remember_softvol = FALSE; volume_softvol = -1; volume_gain = 0; -@@ -703,7 +705,7 @@ int main(int argc, char *argv[]) +@@ -706,7 +706,7 @@ int main(int argc, char *argv[]) reallyverbose = 0; embedding_disabled = FALSE; disable_pause_on_click = FALSE; @@ -47,12 +37,12 @@ use xscrnsaver controls over gnome-power auto_hide_timeout = 3; use_mediakeys = TRUE; use_defaultpl = FALSE; -@@ -742,7 +744,7 @@ int main(int argc, char *argv[]) +@@ -745,7 +745,7 @@ int main(int argc, char *argv[]) start_second = 0; play_length = 0; save_loc = TRUE; - use_xscrnsaver = FALSE; + use_xscrnsaver = TRUE; screensaver_disabled = FALSE; - - sa.sa_handler = hup_handler; + update_control_flag = FALSE; + gchar *filename; Index: patches/patch-src_playlist_c =================================================================== RCS file: patches/patch-src_playlist_c diff -N patches/patch-src_playlist_c --- patches/patch-src_playlist_c 8 Jul 2010 06:29:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-src_playlist_c,v 1.1 2010/07/08 06:29:12 dcoppa Exp $ - -fix from upstream svn: -fix video playback problems when loading a folder from playlist - ---- src/playlist.c.orig Tue Jul 6 22:15:05 2010 -+++ src/playlist.c Tue Jul 6 22:17:35 2010 -@@ -549,7 +549,10 @@ void add_folder_to_playlist(GtkWidget * widget, void * - GSList *uris; - gchar *last_dir; - gchar *message; -+ gint count; - -+ count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(playliststore), NULL); -+ - dialog = gtk_file_chooser_dialog_new(_("Choose Directory"), - GTK_WINDOW(window), - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, -@@ -594,7 +597,7 @@ void add_folder_to_playlist(GtkWidget * widget, void * - g_free(message); - g_idle_add(set_media_label, idledata); - -- if (data != NULL) { -+ if (count == 0 && filecount > 0) { - gtk_tree_model_get_iter_first(GTK_TREE_MODEL(playliststore), &iter); - play_iter(&iter, 0); - dontplaynext = FALSE; Index: patches/patch-src_support_c =================================================================== RCS file: patches/patch-src_support_c diff -N patches/patch-src_support_c --- patches/patch-src_support_c 8 Jul 2010 06:29:12 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_support_c,v 1.4 2010/07/08 06:29:12 dcoppa Exp $ - -fix from upstream: -correct problem with tracks loaded from an iPod as not being marked -playable - ---- src/support.c.orig Wed Jul 7 17:07:17 2010 -+++ src/support.c Wed Jul 7 17:09:08 2010 -@@ -2778,7 +2778,7 @@ gboolean gpod_load_tracks(gchar * mount_point) - gtk_tree_model_iter_n_children(GTK_TREE_MODEL(playliststore), NULL), - ADD_ORDER_COLUMN, - gtk_tree_model_iter_n_children(GTK_TREE_MODEL(playliststore), NULL), -- -1); -+ PLAYABLE_COLUMN, TRUE, -1); - - g_free(duration); - g_free(full_path); Index: patches/patch-src_thread_c =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_thread_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_thread_c --- patches/patch-src_thread_c 29 Mar 2010 12:16:08 -0000 1.3 +++ patches/patch-src_thread_c 22 Sep 2010 12:24:27 -0000 @@ -1,22 +1,107 @@ -$OpenBSD: patch-src_thread_c,v 1.3 2010/03/29 12:16:08 dcoppa Exp $ +$OpenBSD$ -fix from upstream svn: -when dontplaynext is set, request next item on -playlist from plugin +fix from upstream: +keep desktop gamma from being adjusted when using mplayer gl2 driver ---- src/thread.c.orig Thu Feb 25 17:01:41 2010 -+++ src/thread.c Wed Mar 24 12:07:32 2010 -@@ -1496,6 +1496,13 @@ gpointer launch_player(gpointer data) - g_idle_add(play, p); - } - -+ if (playback_error == NO_ERROR) { -+ if (embed_window != 0 || control_id != 0) { -+ dbus_send_event("MediaComplete", 0); -+ dbus_open_next(); -+ } -+ } -+ - dontplaynext = FALSE; +--- src/thread.c.orig Wed Sep 22 12:35:02 2010 ++++ src/thread.c Wed Sep 22 12:33:09 2010 +@@ -445,25 +445,27 @@ gboolean thread_reader(GIOChannel * source, GIOConditi + send_command("get_property sub_demux\n", TRUE); } +- cmd = g_strdup_printf("brightness %i\n", idledata->brightness); +- send_command(cmd, TRUE); +- g_free(cmd); ++ if (g_ascii_strncasecmp(vo, "gl2", strlen("gl2")) != 0) { ++ cmd = g_strdup_printf("brightness %i\n", idledata->brightness); ++ send_command(cmd, TRUE); ++ g_free(cmd); + +- cmd = g_strdup_printf("contrast %i\n", idledata->contrast); +- send_command(cmd, TRUE); +- g_free(cmd); ++ cmd = g_strdup_printf("contrast %i\n", idledata->contrast); ++ send_command(cmd, TRUE); ++ g_free(cmd); + +- cmd = g_strdup_printf("gamma %i\n", idledata->gamma); +- send_command(cmd, TRUE); +- g_free(cmd); ++ cmd = g_strdup_printf("gamma %i\n", idledata->gamma); ++ send_command(cmd, TRUE); ++ g_free(cmd); + +- cmd = g_strdup_printf("hue %i\n", idledata->hue); +- send_command(cmd, TRUE); +- g_free(cmd); ++ cmd = g_strdup_printf("hue %i\n", idledata->hue); ++ send_command(cmd, TRUE); ++ g_free(cmd); + +- cmd = g_strdup_printf("saturation %i\n", idledata->saturation); +- send_command(cmd, TRUE); +- g_free(cmd); ++ cmd = g_strdup_printf("saturation %i\n", idledata->saturation); ++ send_command(cmd, TRUE); ++ g_free(cmd); ++ } + } + + if (strstr(mplayer_output->str, "Video: no video") != NULL) { +@@ -581,35 +583,32 @@ gboolean thread_reader(GIOChannel * source, GIOConditi + g_idle_add(set_update_gui, NULL); + } + */ +- if (g_ascii_strncasecmp(vo, "gl2", strlen("gl2")) != 0 ) { + +- if (strstr(mplayer_output->str, "ANS_brightness") != 0) { +- buf = strstr(mplayer_output->str, "ANS_brightness"); +- sscanf(buf, "ANS_brightness=%i", &idledata->brightness); +- } ++ if (strstr(mplayer_output->str, "ANS_brightness") != 0) { ++ buf = strstr(mplayer_output->str, "ANS_brightness"); ++ sscanf(buf, "ANS_brightness=%i", &idledata->brightness); ++ } + +- if (strstr(mplayer_output->str, "ANS_contrast") != 0) { +- buf = strstr(mplayer_output->str, "ANS_contrast"); +- sscanf(buf, "ANS_contrast=%i", &idledata->contrast); +- } ++ if (strstr(mplayer_output->str, "ANS_contrast") != 0) { ++ buf = strstr(mplayer_output->str, "ANS_contrast"); ++ sscanf(buf, "ANS_contrast=%i", &idledata->contrast); ++ } + +- if (strstr(mplayer_output->str, "ANS_gamma") != 0) { +- buf = strstr(mplayer_output->str, "ANS_gamma"); +- sscanf(buf, "ANS_gamma=%i", &idledata->gamma); +- } ++ if (strstr(mplayer_output->str, "ANS_gamma") != 0) { ++ buf = strstr(mplayer_output->str, "ANS_gamma"); ++ sscanf(buf, "ANS_gamma=%i", &idledata->gamma); ++ } + +- if (strstr(mplayer_output->str, "ANS_hue") != 0) { +- buf = strstr(mplayer_output->str, "ANS_hue"); +- sscanf(buf, "ANS_hue=%i", &idledata->hue); +- } ++ if (strstr(mplayer_output->str, "ANS_hue") != 0) { ++ buf = strstr(mplayer_output->str, "ANS_hue"); ++ sscanf(buf, "ANS_hue=%i", &idledata->hue); ++ } + +- if (strstr(mplayer_output->str, "ANS_saturation") != 0) { +- buf = strstr(mplayer_output->str, "ANS_saturation"); +- sscanf(buf, "ANS_saturation=%i", &idledata->saturation); +- } +- +- } +- ++ if (strstr(mplayer_output->str, "ANS_saturation") != 0) { ++ buf = strstr(mplayer_output->str, "ANS_saturation"); ++ sscanf(buf, "ANS_saturation=%i", &idledata->saturation); ++ } ++ + if (strstr(mplayer_output->str, "ANS_path") != 0) { + if (verbose > 1) + printf("pausing keep force enabled\n"); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- pkg/PLIST 29 Mar 2010 12:16:08 -0000 1.6 +++ pkg/PLIST 22 Sep 2010 12:24:27 -0000 @@ -15,7 +15,6 @@ share/doc/gnome-mplayer/plugin-interacti share/gnome-control-center/ share/gnome-control-center/default-apps/ share/gnome-control-center/default-apps/gnome-mplayer.xml -share/icons/ share/icons/hicolor/ share/icons/hicolor/16x16/ share/icons/hicolor/16x16/apps/ @@ -39,11 +38,18 @@ share/locale/ar/LC_MESSAGES/gnome-mplaye share/locale/bg/LC_MESSAGES/gnome-mplayer.mo share/locale/ca/LC_MESSAGES/gnome-mplayer.mo share/locale/cs/LC_MESSAGES/gnome-mplayer.mo +share/locale/da/LC_MESSAGES/gnome-mplayer.mo share/locale/de/LC_MESSAGES/gnome-mplayer.mo share/locale/el/LC_MESSAGES/gnome-mplayer.mo share/locale/en/LC_MESSAGES/gnome-mplayer.mo share/locale/en_GB/LC_MESSAGES/gnome-mplayer.mo share/locale/es/LC_MESSAGES/gnome-mplayer.mo +share/locale/et/LC_MESSAGES/gnome-mplayer.mo +share/locale/eu/LC_MESSAGES/gnome-mplayer.mo +share/locale/fi/LC_MESSAGES/gnome-mplayer.mo +share/locale/fo/ +share/locale/fo/LC_MESSAGES/ +share/locale/fo/LC_MESSAGES/gnome-mplayer.mo share/locale/fr/LC_MESSAGES/gnome-mplayer.mo share/locale/gl/LC_MESSAGES/gnome-mplayer.mo share/locale/he/LC_MESSAGES/gnome-mplayer.mo
