Index: Makefile =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/Makefile,v retrieving revision 1.10 diff -N -u -p Makefile --- Makefile 11 Aug 2009 08:42:07 -0000 1.10 +++ Makefile 12 Oct 2009 21:51:42 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2009/08/11 08:42:07 ajacoutot Exp $ COMMENT = GTK+/GNOME frontend for MPlayer -DISTNAME = gnome-mplayer-0.9.5 -PKGNAME = ${DISTNAME}p5 +DISTNAME = gnome-mplayer-0.9.8 CATEGORIES = x11 multimedia MAINTAINER = David Coppa @@ -17,13 +16,12 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 c cairo -WANTLIB += crypto dbus-1 dbus-glib-1 expat fontconfig freetype -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 gssapi gthread-2.0 gtk-x11-2.0 idn krb5 -WANTLIB += m neon pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread ssl xml2 z pthread-stubs xcb +WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext m \ + Xfixes Xi Xinerama Xrandr Xrender c cairo dbus-1 dbus-glib-1 \ + expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \ + glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \ + neon pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread \ + z pthread-stubs xcb atk-1.0 MODULES = devel/gettext \ devel/gconf2 @@ -33,7 +31,7 @@ LIB_DEPENDS = notify::devel/libnotify \ musicbrainz3::audio/libmusicbrainz \ curl.>=12::net/curl RUN_DEPENDS = ::devel/desktop-file-utils \ - ::x11/mplayer + :mplayer->=20090708:x11/mplayer USE_X11 = Yes USE_LIBTOOL = Yes @@ -51,6 +49,10 @@ CONFIGURE_ARGS = --with-gio \ --with-libnotify \ --with-libgpod \ --with-libmusicbrainz3 \ + --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.2 diff -N -u -p distinfo --- distinfo 16 Mar 2009 11:27:21 -0000 1.2 +++ distinfo 12 Oct 2009 21:51:42 -0000 @@ -1,5 +1,5 @@ -MD5 (gnome-mplayer-0.9.5.tar.gz) = AtAfHMp/869RHFkZjzw1pw== -RMD160 (gnome-mplayer-0.9.5.tar.gz) = R0zHQ/NiVOkuFxZWoF4Zya3f/DQ= -SHA1 (gnome-mplayer-0.9.5.tar.gz) = 1qRuMtXTBe7WiyWuKAt310CV6HM= -SHA256 (gnome-mplayer-0.9.5.tar.gz) = TO+yr6CNjnXBJzmA4srQ4T9Lhy4vkAGfGsDXXsn6Qbc= -SIZE (gnome-mplayer-0.9.5.tar.gz) = 747308 +MD5 (gnome-mplayer-0.9.8.tar.gz) = VAYwZU2wRBmMQ18ywEsbUw== +RMD160 (gnome-mplayer-0.9.8.tar.gz) = hKJDMlivAFruqXLRXqvmeqlwgpw= +SHA1 (gnome-mplayer-0.9.8.tar.gz) = hVHCx7e0ju0xWrc6NiN/gBK6c7c= +SHA256 (gnome-mplayer-0.9.8.tar.gz) = snW64/deleW06LdZano2K6D/nlAo5xVUDkIVvIeBr2A= +SIZE (gnome-mplayer-0.9.8.tar.gz) = 721269 Index: patches/patch-gnome-mplayer_schemas =================================================================== RCS file: patches/patch-gnome-mplayer_schemas diff -N -u -p patches/patch-gnome-mplayer_schemas --- /dev/null 12 Oct 2009 21:51:42 -0000 +++ patches/patch-gnome-mplayer_schemas 12 Oct 2009 21:51:42 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- gnome-mplayer.schemas.orig Mon Oct 12 23:44:36 2009 ++++ gnome-mplayer.schemas Mon Oct 12 23:45:23 2009 +@@ -270,7 +270,7 @@ + /apps/gnome-mplayer/preferences/softvol + gnome-mplayer + bool +- FALSE ++ TRUE + + Have mplayer use the softvol option + When set to TRUE the softvol option is passed to mplayer, useful for machines without pulseaudio Index: patches/patch-gnome-mplayer_schemas_in =================================================================== RCS file: patches/patch-gnome-mplayer_schemas_in diff -N -u -p patches/patch-gnome-mplayer_schemas_in --- /dev/null 12 Oct 2009 21:51:42 -0000 +++ patches/patch-gnome-mplayer_schemas_in 12 Oct 2009 21:51:42 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- gnome-mplayer.schemas.in.orig Mon Oct 12 23:44:41 2009 ++++ gnome-mplayer.schemas.in Mon Oct 12 23:45:03 2009 +@@ -270,7 +270,7 @@ + /apps/gnome-mplayer/preferences/softvol + gnome-mplayer + bool +- FALSE ++ TRUE + + Have mplayer use the softvol option + When set to TRUE the softvol option is passed to mplayer, useful for machines without pulseaudio Index: patches/patch-src_gui_c =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_gui_c,v retrieving revision 1.3 diff -N -u -p patches/patch-src_gui_c --- patches/patch-src_gui_c 14 Apr 2009 09:38:39 -0000 1.3 +++ patches/patch-src_gui_c 12 Oct 2009 21:51:42 -0000 @@ -1,34 +1,35 @@ -$OpenBSD: patch-src_gui_c,v 1.3 2009/04/14 09:38:39 ajacoutot Exp $ ---- src/gui.c.orig Sun Mar 8 01:29:15 2009 -+++ src/gui.c Mon Apr 13 17:41:59 2009 -@@ -3550,7 +3550,7 @@ void menuitem_details_callback(GtkMenuItem * menuitem, - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); - gtk_misc_set_padding(GTK_MISC(label), 12, 0); - gtk_table_attach_defaults(GTK_TABLE(details_table), label, 0, 1, i, i + 1); -- buf = g_strdup_printf("%i Kb/s", (gint) (g_strtod(idle->video_bitrate, NULL) / 1024)); -+ buf = g_strdup_printf("%i Kb/s", (gint) (g_strtod(idle->video_bitrate, NULL) / 1000)); - label = gtk_label_new(buf); - g_free(buf); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); -@@ -3621,7 +3621,7 @@ void menuitem_details_callback(GtkMenuItem * menuitem, - gtk_table_attach_defaults(GTK_TABLE(details_table), label, 0, 1, i, i + 1); - if (idle != NULL) { - buf = -- g_strdup_printf("%i Kb/s", (gint) (g_strtod(idle->audio_bitrate, NULL) / 1024)); -+ g_strdup_printf("%i Kb/s", (gint) (g_strtod(idle->audio_bitrate, NULL) / 1000)); - label = gtk_label_new(buf); - g_free(buf); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); -@@ -3636,7 +3636,7 @@ void menuitem_details_callback(GtkMenuItem * menuitem, - if (idle != NULL) { - buf = - g_strdup_printf("%i Kb/s", -- (gint) (g_strtod(idle->audio_samplerate, NULL) / 1024)); -+ (gint) (g_strtod(idle->audio_samplerate, NULL) / 1000)); - label = gtk_label_new(buf); - g_free(buf); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0); -@@ -4104,32 +4104,41 @@ void menuitem_config_callback(GtkMenuItem * menuitem, +$OpenBSD$ +--- src/gui.c.orig Thu Sep 17 18:05:35 2009 ++++ src/gui.c Mon Oct 12 14:34:06 2009 +@@ -94,7 +94,9 @@ static void drawing_area_realized(GtkWidget * widget, + * onwards, requesting the native window in a thread causes a BadWindowID, + * so we need to request it now. We could call gdk_window_ensure_native(), + * but that would mean we require GTK+ 2.18, so instead we call this */ ++#ifdef GTK2_14_ENABLED + GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(widget))); ++#endif + } + + gint get_player_window() +@@ -435,7 +437,7 @@ gboolean set_progress_value(void *data) + } + if (idle->cachepercent < 1.0 && state == PAUSED) { + text = +- g_strdup_printf(_("Paused | %2i%% \342\226\274"), ++ g_strdup_printf(_("Paused | %2i%%"), + (gint) (idle->cachepercent * 100)); + gmtk_media_tracker_set_text(tracker, text); + g_free(text); +@@ -561,7 +563,7 @@ gboolean set_progress_time(void *data) + + if (idle->cachepercent > 0 && idle->cachepercent < 1.0 && !(playlist) && !forcecache + && !idle->streaming) { +- g_snprintf(idle->progress_text, 128, "%s | %2i%% \342\226\274", text, ++ g_snprintf(idle->progress_text, 128, "%s | %2i%%", text, + (int) (idle->cachepercent * 100)); + } else { + g_snprintf(idle->progress_text, 128, "%s", text); +@@ -4697,32 +4699,41 @@ void menuitem_config_callback(GtkMenuItem * menuitem, tooltip = gtk_tooltips_new(); gtk_tooltips_set_tip(tooltip, config_ao, _ Index: patches/patch-src_libgmlib_gm_parse_c =================================================================== RCS file: patches/patch-src_libgmlib_gm_parse_c diff -N -u -p patches/patch-src_libgmlib_gm_parse_c --- /dev/null 12 Oct 2009 21:51:42 -0000 +++ patches/patch-src_libgmlib_gm_parse_c 12 Oct 2009 21:51:42 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- src/libgmlib/gm_parse.c.orig Sun Oct 11 05:20:52 2009 ++++ src/libgmlib/gm_parse.c Sun Oct 11 05:22:10 2009 +@@ -159,6 +159,7 @@ gboolean gm_parse_asx_is_asx(const gchar *uri) + + #else + FILE *fp; ++ gchar **parse; + gchar *file = NULL; + + file = g_strndup(uri, 4); Index: patches/patch-src_libgmlib_gm_parse_h =================================================================== RCS file: patches/patch-src_libgmlib_gm_parse_h diff -N -u -p patches/patch-src_libgmlib_gm_parse_h --- /dev/null 12 Oct 2009 21:51:42 -0000 +++ patches/patch-src_libgmlib_gm_parse_h 12 Oct 2009 21:51:42 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- src/libgmlib/gm_parse.h.orig Sun Oct 11 05:20:54 2009 ++++ src/libgmlib/gm_parse.h Sun Oct 11 05:23:57 2009 +@@ -29,6 +29,7 @@ + #else + #include + #endif ++#include + + #ifdef __cplusplus + extern "C" { Index: patches/patch-src_main_c =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_main_c,v retrieving revision 1.1 diff -N -u -p patches/patch-src_main_c --- patches/patch-src_main_c 14 Apr 2009 09:38:39 -0000 1.1 +++ patches/patch-src_main_c 12 Oct 2009 21:51:42 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_main_c,v 1.1 2009/04/14 09:38:39 ajacoutot Exp $ ---- src/main.c.orig Mon Apr 13 18:04:28 2009 -+++ src/main.c Mon Apr 13 18:06:07 2009 -@@ -599,7 +599,7 @@ int main(int argc, char *argv[]) - disable_embeddedfonts = read_preference_bool(DISABLEEMBEDDEDFONTS); - disable_pause_on_click = read_preference_bool(DISABLEPAUSEONCLICK); - disable_animation = read_preference_bool(DISABLEANIMATION); -- auto_hide_timeout = read_preference_int(AUTOHIDETIMEOUT); -+ auto_hide_timeout = read_preference_int_with_default(AUTOHIDETIMEOUT,auto_hide_timeout); - disable_cover_art_fetch = read_preference_bool(DISABLE_COVER_ART_FETCH); - use_mediakeys = read_preference_bool(USE_MEDIAKEYS); - metadata_codepage = read_preference_string(METADATACODEPAGE); +$OpenBSD$ +--- src/main.c.orig Thu Sep 17 17:56:06 2009 ++++ src/main.c Mon Oct 12 23:44:14 2009 +@@ -699,7 +699,7 @@ int main(int argc, char *argv[]) + playlist_visible = FALSE; + disable_fullscreen = FALSE; + disable_framedrop = FALSE; +- softvol = FALSE; ++ softvol = TRUE; + subtitlefont = NULL; + subtitle_codepage = NULL; + subtitle_color = NULL; Index: patches/patch-src_support_c =================================================================== RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-src_support_c,v retrieving revision 1.1 diff -N -u -p patches/patch-src_support_c --- patches/patch-src_support_c 14 Apr 2009 09:38:39 -0000 1.1 +++ patches/patch-src_support_c 12 Oct 2009 21:51:42 -0000 @@ -1,28 +1,130 @@ -$OpenBSD: patch-src_support_c,v 1.1 2009/04/14 09:38:39 ajacoutot Exp $ ---- src/support.c.orig Mon Apr 13 18:07:53 2009 -+++ src/support.c Mon Apr 13 18:12:50 2009 -@@ -2061,6 +2061,24 @@ gint read_preference_int(gchar * key) - return value; - } +$OpenBSD$ +--- src/support.c.orig Mon Oct 12 00:46:58 2009 ++++ src/support.c Mon Oct 12 01:13:35 2009 +@@ -39,6 +39,7 @@ gint detect_playlist(gchar * uri) + gchar *coltitle; + gint count; + gchar *path = NULL; ++ gchar *lower; + #ifdef GIO_ENABLED + GFile *file; + GFileInputStream *input; +@@ -75,40 +76,37 @@ gint detect_playlist(gchar * uri) + memset(buffer, 0, sizeof(buffer)); + g_input_stream_read((GInputStream *) input, buffer, sizeof(buffer), NULL, NULL); + output = g_strsplit(buffer, "\n", 0); +- if (output[0] != NULL) { +- g_strchomp(output[0]); +- g_strchug(output[0]); +- } ++ lower = g_ascii_strdown(buffer, -1); + // printf("buffer=%s\n",buffer); +- if (strstr(g_strdown(buffer), "[playlist]") != 0) { ++ if (strstr(lower, "[playlist]") != 0) { + playlist = 1; + } -+gint read_preference_int_with_default(gchar * key, gint default_value) -+{ -+ gint value = 0; -+#ifdef HAVE_GCONF -+ gchar *full_key = NULL; -+ -+ full_key = g_strdup_printf("/apps/gnome-mplayer/preferences/%s", key); -+ value = gconf_client_get_int(gconf, full_key, NULL); -+ g_free(full_key); -+#else -+ if (g_key_file_has_key(config,"gnome-mplayer",key,NULL)) -+ value = g_key_file_get_integer(config, "gnome-mplayer", key, NULL); -+ else -+ value = default_value; -+#endif -+ return value; -+} -+ - gfloat read_preference_float(gchar * key) - { - gfloat value = 0; +- if (strstr(g_strdown(buffer), "[reference]") != 0) { ++ if (strstr(lower, "[reference]") != 0) { + playlist = 1; + } + +- if (strstr(g_strdown(buffer), "") != 0) { ++ if (strstr(lower, "") != 0) { + playlist = 1; + } + +- if (strstr(g_strdown(buffer), "#extm3u") != 0) { ++ if (strstr(lower, "#extm3u") != 0) { + playlist = 1; + } + +- if (strstr(g_strdown(buffer), "http://") != 0) { ++ if (strstr(lower, "http://") != 0) { + playlist = 1; + } + +- if (strstr(g_strdown(buffer), "rtsp://") != 0) { ++ if (strstr(lower, "rtsp://") != 0) { + playlist = 1; + } + +- if (strstr(g_strdown(buffer), "pnm://") != 0) { ++ if (strstr(lower, "pnm://") != 0) { + playlist = 1; + } + +@@ -129,6 +127,7 @@ gint detect_playlist(gchar * uri) + } + g_free(newuri); + } ++ g_free(lower); + g_strfreev(output); + + g_input_stream_close((GInputStream *) input, NULL, NULL); +@@ -150,16 +149,12 @@ gint detect_playlist(gchar * uri) + memset(buffer, 0, sizeof(buffer)); + size = fread(buffer, 1, sizeof(buffer) - 1, fp); + output = g_strsplit(buffer, "\n", 0); +- if (output[0] != NULL) { +- g_strchomp(output[0]); +- g_strchug(output[0]); +- } + //printf("buffer=%s\n",buffer); +- if (strstr(g_strdown(buffer), "[playlist]") != 0) { ++ if (strstr(lower, "[playlist]") != 0) { + playlist = 1; + } + +- if (strstr(g_strdown(buffer), "[reference]") != 0) { ++ if (strstr(lower, "[reference]") != 0) { + playlist = 1; + } + +@@ -167,19 +162,19 @@ gint detect_playlist(gchar * uri) + playlist = 1; + } + +- if (strstr(g_strdown(buffer), " /dev/null ${SCHEMAS_INSTDIR}/ ${SCHEMAS_INSTDIR}/gnome-mplayer.schemas