On Tue, 26 Apr 2011, David Coppa wrote:
> On Tue, 26 Apr 2011, Francois Pussault wrote:
>
> > I confirm this method is good
> > easy and working well.
> >
> > > ----------------------------------------
> > > From: David Steiner <[email protected]>
> > > Sent: Tue Apr 26 15:19:53 CEST 2011
> > > To: <[email protected]>
> > > Subject: Flash Video in Firefox
> > >
> > >
> > > 1) pkg_add gecko-mediaplayer
> > > 2) https://addons.mozilla.org/en-US/firefox/addon/flashvideoreplacer/
> > >
> > > works here on -current amd64. i tested youtube and blip.tv sofar
> > > without any trouble.
>
> I'm hijacking the thread to wake up your attention on this diff
> that updates gnome-mplayer and gecko-mediaplayer to version 1.0.3.
>
> Most of my patches for openbsd have been merged upstream due to
> the willingness of Kevin DeKorte (main developer).
>
> Both are now based on gsettings/dconf.
> Antoine: are the gsettings bits properly done?
Yup seems fine.
> gecko-mediaplayer is intentionally missing the PLIST
goos, since
> its schema file is installed by gnome-mplayer.
This part I don't get. Why are you using the dconf MODULE for
gecko-mediaplayer then?
> gecko-mediaplayer now depends on curl too, to better handle
> more complex streams like the apple.com ones.
>
> Please test/comment/whatever if you can!
>
> Cheers,
> David
>
> Index: www/gecko-mediaplayer/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/gecko-mediaplayer/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- www/gecko-mediaplayer/Makefile 18 Jan 2011 11:04:23 -0000 1.19
> +++ www/gecko-mediaplayer/Makefile 26 Apr 2011 14:53:35 -0000
> @@ -1,9 +1,8 @@
> # $OpenBSD: Makefile,v 1.19 2011/01/18 11:04:23 dcoppa Exp $
>
> COMMENT = gnome-mplayer browser media plugin
> -V = 1.0.0
> +V = 1.0.3
> DISTNAME = gecko-mediaplayer-${V}
> -REVISION = 1
> CATEGORIES = www
>
> MAINTAINER = David Coppa <[email protected]>
> @@ -18,12 +17,14 @@ PERMIT_PACKAGE_FTP = Yes
> PERMIT_DISTFILES_CDROM =Yes
> PERMIT_DISTFILES_FTP = Yes
>
> -WANTLIB = dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 \
> - gthread-2.0 m stdc++
> +WANTLIB = curl dbus-1 dbus-glib-1 gio-2.0 glib-2.0 \
> + gmodule-2.0 gobject-2.0 gthread-2.0 m stdc++
>
> -MODULES = devel/gettext
> +MODULES = devel/gettext \
> + devel/dconf
>
> -LIB_DEPENDS = x11/dbus-glib
> +LIB_DEPENDS = net/curl \
> + x11/dbus-glib
>
> BUILD_DEPENDS = devel/xulrunner/1.9,-devel>=1.9.2
> RUN_DEPENDS = x11/gnome-mplayer>=${V}
> @@ -39,8 +40,10 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>
> CONFIGURE_ARGS = --enable-new-libxul \
> + --with-libcurl \
> --with-xulrunner-sdk=${LOCALBASE}/xulrunner1.9 \
> --with-plugin-dir=${LOCALBASE}/lib/mozilla/plugins \
> - --without-gconf
> + --without-gconf \
> + --disable-silent-rules
>
> .include <bsd.port.mk>
> Index: www/gecko-mediaplayer/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/gecko-mediaplayer/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- www/gecko-mediaplayer/distinfo 8 Nov 2010 15:06:31 -0000 1.4
> +++ www/gecko-mediaplayer/distinfo 26 Apr 2011 14:53:35 -0000
> @@ -1,5 +1,5 @@
> -MD5 (gecko-mediaplayer-1.0.0.tar.gz) = gMy2ca6pAVO+n55txBt+rg==
> -RMD160 (gecko-mediaplayer-1.0.0.tar.gz) = IYE0wIhmmuFasSt/AI2YivProwg=
> -SHA1 (gecko-mediaplayer-1.0.0.tar.gz) = cC+7R7Rbkvz/vNMkmD6WqAJ7wHU=
> -SHA256 (gecko-mediaplayer-1.0.0.tar.gz) =
> 0OXWUWyUPeIldmHUcYyRqoeOJD0/qJGhIemciHkpSZ4=
> -SIZE (gecko-mediaplayer-1.0.0.tar.gz) = 263320
> +MD5 (gecko-mediaplayer-1.0.3.tar.gz) = SZayQ+1yDcMPXcybwlO/aA==
> +RMD160 (gecko-mediaplayer-1.0.3.tar.gz) = TBPukNODgkVLLRJvXSY+cqWtsMo=
> +SHA1 (gecko-mediaplayer-1.0.3.tar.gz) = SBmKMhUEsR9TxWO87qwbw9xLQFg=
> +SHA256 (gecko-mediaplayer-1.0.3.tar.gz) =
> DJHx5fTyRVWCAbUIiROlggPUI6lXlTI/fPzFMJIM3aI=
> +SIZE (gecko-mediaplayer-1.0.3.tar.gz) = 271546
> Index: www/gecko-mediaplayer/patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-configure,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-configure
> --- www/gecko-mediaplayer/patches/patch-configure 8 Nov 2010 15:06:31
> -0000 1.5
> +++ www/gecko-mediaplayer/patches/patch-configure 26 Apr 2011 14:53:35
> -0000
> @@ -4,9 +4,9 @@ use -pthread instead of -lpthread for pt
> remove -ldl
> fix GECKO_CFLAGS and GECKO_LIBS
>
> ---- configure.orig Fri Nov 5 17:13:48 2010
> -+++ configure Mon Nov 8 12:27:11 2010
> -@@ -7206,8 +7206,8 @@ fi
> +--- configure.orig Thu Apr 21 16:59:11 2011
> ++++ configure Tue Apr 26 16:26:20 2011
> +@@ -7364,8 +7364,8 @@ fi
> if test "${with_xulrunner_sdk+set}" = set; then :
> withval=$with_xulrunner_sdk;
> XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
> Index: www/gecko-mediaplayer/patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-src_Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-src_Makefile_in
> --- www/gecko-mediaplayer/patches/patch-src_Makefile_in 8 Nov 2010
> 15:06:31 -0000 1.4
> +++ www/gecko-mediaplayer/patches/patch-src_Makefile_in 26 Apr 2011
> 14:53:35 -0000
> @@ -2,46 +2,46 @@ $OpenBSD: patch-src_Makefile_in,v 1.4 20
>
> fix library linking (remove -ldl)
>
> ---- src/Makefile.in.orig Fri Nov 5 17:13:49 2010
> -+++ src/Makefile.in Mon Nov 8 12:27:11 2010
> -@@ -332,35 +332,35 @@ gecko_mediaplayer_so_SOURCES = \
> +--- src/Makefile.in.orig Tue Apr 26 16:27:58 2011
> ++++ src/Makefile.in Tue Apr 26 16:28:19 2011
> +@@ -370,35 +370,35 @@ gecko_mediaplayer_so_SOURCES = \
>
> gecko_mediaplayer_so_CFLAGS = -fPIC
> gecko_mediaplayer_so_LDFLAGS = -shared -fPIC
> --gecko_mediaplayer_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> -+gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS)
> $(GCONF_LIBS)
> +-gecko_mediaplayer_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> ++gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS)
> $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> gecko_mediaplayer_qt_so_SOURCES = \
> plugin_types_qt.cpp \
> $(COMMONCODE)
>
> gecko_mediaplayer_qt_so_CFLAGS = -fPIC
> gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC
> --gecko_mediaplayer_qt_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> -+gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> +-gecko_mediaplayer_qt_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> ++gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> gecko_mediaplayer_wmp_so_SOURCES = \
> plugin_types_wmp.cpp \
> $(COMMONCODE)
>
> gecko_mediaplayer_wmp_so_CFLAGS = -fPIC
> gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC
> --gecko_mediaplayer_wmp_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> -+gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> +-gecko_mediaplayer_wmp_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> ++gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> gecko_mediaplayer_dvx_so_SOURCES = \
> plugin_types_dvx.cpp \
> $(COMMONCODE)
>
> gecko_mediaplayer_dvx_so_CFLAGS = -fPIC
> gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC
> --gecko_mediaplayer_dvx_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> -+gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> +-gecko_mediaplayer_dvx_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> ++gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> gecko_mediaplayer_rm_so_SOURCES = \
> plugin_types_rm.cpp \
> $(COMMONCODE)
>
> gecko_mediaplayer_rm_so_CFLAGS = -fPIC
> gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC
> --gecko_mediaplayer_rm_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> -+gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS)
> +-gecko_mediaplayer_rm_so_LDADD = -ldl libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> ++gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS)
> $(DBUS_LIBS) $(GCONF_LIBS) $(CURL_LIBS) $(GIO_LIBS)
> all: all-recursive
>
> .SUFFIXES:
> Index: www/gecko-mediaplayer/patches/patch-src_plugin_cpp
> ===================================================================
> RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_cpp
> diff -N www/gecko-mediaplayer/patches/patch-src_plugin_cpp
> --- www/gecko-mediaplayer/patches/patch-src_plugin_cpp 18 Jan 2011
> 11:04:23 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-src_plugin_cpp,v 1.4 2011/01/18 11:04:23 dcoppa Exp $
> -
> -fix from upstream: bump QuickTime emulation to 7.6.9 (fix apple.com
> -movie trailers)
> -
> ---- src/plugin.cpp.orig Tue Jan 18 10:55:14 2011
> -+++ src/plugin.cpp Tue Jan 18 10:56:13 2011
> -@@ -243,7 +243,7 @@ void clearPreference(CPlugin * instance, const gchar *
> - if (instance->user_agent == NULL ||
> strlen(instance->user_agent) == 0) {
> - prefBranch->ClearUserPref(name);
> - } else {
> -- if (g_strrstr(instance->user_agent, "QuickTime/7.6.4")) {
> -+ if (g_strrstr(instance->user_agent, "QuickTime/7.6.9")) {
> - prefBranch->ClearUserPref(name);
> - } else {
> - prefBranch->ClearUserPref(name);
> Index: www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp
> ===================================================================
> RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp
> diff -N www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp
> --- www/gecko-mediaplayer/patches/patch-src_plugin_setup_cpp 18 Jan 2011
> 11:04:23 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-src_plugin_setup_cpp,v 1.4 2011/01/18 11:04:23 dcoppa Exp $
> -
> -fix from upstream: set width and height from the style attribute
> -if present
> -
> ---- src/plugin_setup.cpp.orig Fri Nov 5 17:12:59 2010
> -+++ src/plugin_setup.cpp Tue Jan 18 11:07:47 2011
> -@@ -112,6 +112,14 @@ void new_instance(CPlugin * instance, int16_t argc, ch
> - if (g_ascii_strcasecmp(argn[i], "height") == 0) {
> - sscanf(argv[i], "%i", &height);
> - }
> -+
> -+ if (g_ascii_strcasecmp(argn[i], "style") == 0) {
> -+ tmp = g_strrstr(argv[i],"width:");
> -+ sscanf(tmp + strlen("width:"), "%i", &width);
> -+ tmp = g_strrstr(argv[i],"height:");
> -+ sscanf(tmp + strlen("height:"), "%i", &height);
> -+ }
> -+
> -
> - if (g_ascii_strcasecmp(argn[i], "src") == 0 ||
> g_ascii_strcasecmp(argn[i], "url") == 0) {
> - item = g_new0(ListItem, 1);
> Index: www/gecko-mediaplayer/patches/patch-src_plugin_types_qt_cpp
> ===================================================================
> RCS file: www/gecko-mediaplayer/patches/patch-src_plugin_types_qt_cpp
> diff -N www/gecko-mediaplayer/patches/patch-src_plugin_types_qt_cpp
> --- www/gecko-mediaplayer/patches/patch-src_plugin_types_qt_cpp 18 Jan
> 2011 11:04:23 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -$OpenBSD: patch-src_plugin_types_qt_cpp,v 1.1 2011/01/18 11:04:23 dcoppa Exp
> $
> -
> -fix from upstream: bump QuickTime emulation to 7.6.9 (fix apple.com
> -movie trailers)
> -
> ---- src/plugin_types_qt.cpp.orig Tue Jan 18 10:55:07 2011
> -+++ src/plugin_types_qt.cpp Tue Jan 18 10:55:55 2011
> -@@ -73,7 +73,7 @@ NPError PluginGetValue(NPPVariable variable, void *val
> - // description matches the features
> -
> - if (variable == NPPVpluginNameString) {
> -- *((const char **) value) = "QuickTime Plug-in 7.6.4";
> -+ *((const char **) value) = "QuickTime Plug-in 7.6.9";
> - }
> - if (variable == NPPVpluginDescriptionString) {
> - *((const char **) value) =
> -@@ -101,5 +101,5 @@ NPError PluginGetValue(NPPVariable variable, void *val
> - void pluginSpecific(CPlugin * instance)
> - {
> - //printf("calling pluginSpecific for qt plugin\n");
> -- setPreference(instance, "general.useragent.override",
> "QuickTime/7.6.4");
> -+ setPreference(instance, "general.useragent.override",
> "QuickTime/7.6.9");
> - }
> Index: x11/gnome-mplayer/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/gnome-mplayer/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- x11/gnome-mplayer/Makefile 21 Apr 2011 07:07:26 -0000 1.34
> +++ x11/gnome-mplayer/Makefile 26 Apr 2011 14:53:50 -0000
> @@ -1,8 +1,7 @@
> # $OpenBSD: Makefile,v 1.34 2011/04/21 07:07:26 ajacoutot Exp $
>
> COMMENT = GTK+/GNOME frontend for MPlayer
> -DISTNAME = gnome-mplayer-1.0.0
> -REVISION = 6
> +DISTNAME = gnome-mplayer-1.0.3
> CATEGORIES = x11 multimedia
>
> MAINTAINER = David Coppa <[email protected]>
> @@ -25,7 +24,8 @@ WANTLIB += GL X11 Xau Xcomposite Xcursor
> pangoft2-1.0 pixman-1 png pthread pthread-stubs musicbrainz3 \
> xcb xcb-render xcb-shm z notify gpod curl
>
> -MODULES = devel/gettext
> +MODULES = devel/gettext \
> + devel/dconf
>
> LIB_DEPENDS = devel/libnotify>=0.7.2 \
> audio/libgpod \
> @@ -53,8 +53,9 @@ CONFIGURE_ARGS = --with-gio \
> --with-libmusicbrainz3 \
> --enable-panscan \
> --without-alsa \
> - --without-flat-volume \
> --without-gconf \
> - --disable-nautilus
> + --without-pulseaudio \
> + --disable-nautilus \
> + --disable-silent-rules
>
> .include <bsd.port.mk>
> Index: x11/gnome-mplayer/distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/gnome-mplayer/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- x11/gnome-mplayer/distinfo 8 Nov 2010 15:04:15 -0000 1.5
> +++ x11/gnome-mplayer/distinfo 26 Apr 2011 14:53:50 -0000
> @@ -1,5 +1,5 @@
> -MD5 (gnome-mplayer-1.0.0.tar.gz) = LIx+Z5+gLlJPrOP9tQSznQ==
> -RMD160 (gnome-mplayer-1.0.0.tar.gz) = HWQJTC5yNp0GzJdob7xDPf7odjg=
> -SHA1 (gnome-mplayer-1.0.0.tar.gz) = 75TDFwzE1CVAPI3mfvuPZNx/di8=
> -SHA256 (gnome-mplayer-1.0.0.tar.gz) =
> RpSk+ECQOc73IG6wcpUnISYtvsNyZpNztzLmF91e5TA=
> -SIZE (gnome-mplayer-1.0.0.tar.gz) = 903789
> +MD5 (gnome-mplayer-1.0.3.tar.gz) = cqHH1kCmfrLWDyZxEIkZwg==
> +RMD160 (gnome-mplayer-1.0.3.tar.gz) = +L06DDX3Ni3PEFJhK0lyblBq8oo=
> +SHA1 (gnome-mplayer-1.0.3.tar.gz) = meeKEKmAG32l9NxZsCZvGJU6nSI=
> +SHA256 (gnome-mplayer-1.0.3.tar.gz) =
> fiTN1RUmRSDDCUlXfbYUnESMLY/rkgfH+ByWGVOPwXI=
> +SIZE (gnome-mplayer-1.0.3.tar.gz) = 1016907
> Index:
> x11/gnome-mplayer/patches/patch-apps_gnome-mplayer_preferences_gschema_xml
> ===================================================================
> RCS file:
> x11/gnome-mplayer/patches/patch-apps_gnome-mplayer_preferences_gschema_xml
> diff -N
> x11/gnome-mplayer/patches/patch-apps_gnome-mplayer_preferences_gschema_xml
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++
> x11/gnome-mplayer/patches/patch-apps_gnome-mplayer_preferences_gschema_xml
> 26 Apr 2011 14:53:50 -0000
> @@ -0,0 +1,52 @@
> +$OpenBSD$
> +
> +set some sane defaults:
> +use mplayer's software volume control
> +disable bar animation in full screen
> +use xscrnsaver controls over gnome-power-manager
> +start with softvol at 100% by default
> +
> +--- apps.gnome-mplayer.preferences.gschema.xml.orig Mon Mar 7 22:44:54 2011
> ++++ apps.gnome-mplayer.preferences.gschema.xml Tue Apr 26 16:06:53 2011
> +@@ -101,7 +101,7 @@
> + <description>When set to TRUE the ability to pause on mouse click is
> disabled</description>
> + </key>
> + <key name="disable-animation" type="b">
> +- <default>false</default>
> ++ <default>true</default>
> + <summary>Disable Animation</summary>
> + <description>Disable animation of fullscreen control bar sliding
> away</description>
> + </key>
> +@@ -121,7 +121,7 @@
> + <description>When set to TRUE the cache value is always used, even
> for streaming media</description>
> + </key>
> + <key name="softvol" type="b">
> +- <default>false</default>
> ++ <default>true</default>
> + <summary>Have mplayer use the softvol option</summary>
> + <description>When set to TRUE the softvol option is passed to
> mplayer, useful for machines without pulseaudio</description>
> + </key>
> +@@ -246,7 +246,7 @@
> + <description>Will load and save the playlist when the program
> runs</description>
> + </key>
> + <key name="use-xscrnsaver" type="b">
> +- <default>false</default>
> ++ <default>true</default>
> + <summary>Set to TRUE if you want to use xscrnsaver controls over
> gnome-power-manager</summary>
> + <description>When enabled directly tells the xscreensaver to inhibit
> itself, otherwise uses gnome-power-manager</description>
> + </key>
> +@@ -261,12 +261,12 @@
> + <description>Configuration value for mplayer to control the number of
> audio channels</description>
> + </key>
> + <key name="remember-softvol" type="b">
> +- <default>false</default>
> ++ <default>true</default>
> + <summary>Remember the software volume</summary>
> + <description>Remember the software volume value</description>
> + </key>
> + <key name="volume-softvol" type="d">
> +- <default>1.0</default>
> ++ <default>100.0</default>
> + <summary>Remembered software volume</summary>
> + <description>Remembered software volume</description>
> + </key>
> Index: x11/gnome-mplayer/patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/x11/gnome-mplayer/patches/patch-configure,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-configure
> --- x11/gnome-mplayer/patches/patch-configure 8 Nov 2010 15:04:15 -0000
> 1.4
> +++ x11/gnome-mplayer/patches/patch-configure 26 Apr 2011 14:53:50 -0000
> @@ -3,37 +3,37 @@ $OpenBSD: patch-configure,v 1.4 2010/11/
> don't check for libgpod 0.6.x: it's not in our ports tree
> disable gnome-power-manager support
>
> ---- configure.orig Fri Nov 5 17:16:53 2010
> -+++ configure Mon Nov 8 11:10:05 2010
> -@@ -609,8 +609,6 @@ GPOD_CFLAGS
> +--- configure.orig Tue Apr 26 15:08:48 2011
> ++++ configure Tue Apr 26 15:10:54 2011
> +@@ -620,8 +620,6 @@ GPOD_CFLAGS
> GPOD07_LIBS
> GPOD07_CFLAGS
> GPOD_DEFINES
> -GPOD06_LIBS
> -GPOD06_CFLAGS
> NOTIFY_DEFINES
> + LIBNOTIFY_07_LIBS
> + LIBNOTIFY_07_CFLAGS
> +@@ -866,8 +864,6 @@ NOTIFY_CFLAGS
> NOTIFY_LIBS
> - NOTIFY_CFLAGS
> -@@ -818,8 +816,6 @@ ALSA_CFLAGS
> - ALSA_LIBS
> - NOTIFY_CFLAGS
> - NOTIFY_LIBS
> + LIBNOTIFY_07_CFLAGS
> + LIBNOTIFY_07_LIBS
> -GPOD06_CFLAGS
> -GPOD06_LIBS
> GPOD07_CFLAGS
> GPOD07_LIBS
> MUSICBRAINZ_CFLAGS
> -@@ -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
> +@@ -1597,9 +1593,6 @@ Some influential environment variables:
> + C compiler flags for LIBNOTIFY_07, overriding pkg-config
> + LIBNOTIFY_07_LIBS
> + linker flags for LIBNOTIFY_07, overriding pkg-config
> - GPOD06_CFLAGS
> - C compiler flags for GPOD06, overriding pkg-config
> - GPOD06_LIBS linker flags for GPOD06, overriding pkg-config
> GPOD07_CFLAGS
> C compiler flags for GPOD07, overriding pkg-config
> GPOD07_LIBS linker flags for GPOD07, overriding pkg-config
> -@@ -8338,84 +8331,6 @@ fi
> +@@ -8926,86 +8919,6 @@ fi
> if test "x$with_libgpod" != xno; then :
>
> pkg_failed=no
> @@ -76,6 +76,8 @@ disable gnome-power-manager support
> -
> -
> -if test $pkg_failed = yes; then
> +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +-$as_echo "no" >&6; }
> -
> -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
> - _pkg_short_errors_supported=yes
> @@ -90,13 +92,13 @@ disable gnome-power-manager support
> - # Put the nasty error message in config.log where it belongs
> - echo "$GPOD06_PKG_ERRORS" >&5
> -
> -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> --$as_echo "no" >&6; }
> -- { $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;}
> +- { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling without libgpod
> 0.6.0 support" >&5
> +-$as_echo "$as_me: Compiling without libgpod 0.6.0 support" >&6;}
> -elif test $pkg_failed = untried; then
> -- { $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;}
> +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> +-$as_echo "no" >&6; }
> +- { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling without libgpod
> 0.6.0 support" >&5
> +-$as_echo "$as_me: Compiling without libgpod 0.6.0 support" >&6;}
> -else
> - GPOD06_CFLAGS=$pkg_cv_GPOD06_CFLAGS
> - GPOD06_LIBS=$pkg_cv_GPOD06_LIBS
> @@ -118,7 +120,7 @@ disable gnome-power-manager support
> { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPOD07" >&5
> $as_echo_n "checking for GPOD07... " >&6; }
>
> -@@ -8491,8 +8406,8 @@ fi
> +@@ -9083,8 +8996,8 @@ fi
>
> fi
>
> @@ -129,10 +131,11 @@ disable gnome-power-manager support
>
>
>
> -@@ -8749,40 +8664,6 @@ $as_echo "#define SS_INHIBIT 0" >>confdefs.h
> -
> +@@ -9318,47 +9231,6 @@ $as_echo "#define SM_INHIBIT 0" >>confdefs.h
> + $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
> @@ -150,23 +153,29 @@ disable gnome-power-manager support
> -
> -
> -if test x$CHECK_GPM = "xyes"; then
> -- if test -x `which gnome-power-manager`; then
> +- GPM=`which gnome-power-manager`
> +- if test "$GPM" != ""; 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
> +- GPMVER=`$GPM --version | sed -e 's/.* 2.//' | cut -b1-2`
> +- if test -n $GPMVER; then
> -
> -$as_echo "#define SM_INHIBIT 1" >>confdefs.h
> -
> -- fi
> -- if test $GPMVER -lt 26; then
> +- else
> +- 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
> -fi
>
> - for ac_header in mntent.h
> - do :
> + if test x$with_gsettings = "xyes"; then
> +
> Index: x11/gnome-mplayer/patches/patch-src_common_h
> ===================================================================
> RCS file: x11/gnome-mplayer/patches/patch-src_common_h
> diff -N x11/gnome-mplayer/patches/patch-src_common_h
> --- x11/gnome-mplayer/patches/patch-src_common_h 15 Nov 2010 11:11:34
> -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-src_common_h,v 1.3 2010/11/15 11:11:34 dcoppa Exp $
> -
> -fix from upstream: don't hide controls and mouse in fullscreen mode
> -when mouse is over controls
> -
> ---- src/common.h.orig Tue Oct 19 18:33:40 2010
> -+++ src/common.h Mon Nov 15 08:35:10 2010
> -@@ -369,6 +369,7 @@ gboolean disable_embeddedfonts;
> - gboolean disable_animation;
> - gint auto_hide_timeout;
> - gboolean always_hide_after_timeout;
> -+gboolean mouse_over_controls;
> - gchar *subtitlefont;
> - gdouble subtitle_scale;
> - gdouble subtitle_delay;
> Index: x11/gnome-mplayer/patches/patch-src_gui_c
> ===================================================================
> RCS file: x11/gnome-mplayer/patches/patch-src_gui_c
> diff -N x11/gnome-mplayer/patches/patch-src_gui_c
> --- x11/gnome-mplayer/patches/patch-src_gui_c 21 Apr 2011 07:07:26 -0000
> 1.13
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,217 +0,0 @@
> -$OpenBSD: patch-src_gui_c,v 1.13 2011/04/21 07:07:26 ajacoutot Exp $
> -
> -Fix with libnotify>=0.7
> -(notify_notification_new has lost its widget argument)
> -(notify_notification_attach_to_status_icon is gone)
> -
> -adapt audio/video device selection gui
> -set DVD device to /dev/rcd0c instead of /dev/dvd
> -use the right icon for the "Open iPod" menu
> -
> -fixes from upstream:
> -don't hide controls and mouse in fullscreen mode when mouse is over
> -controls
> -plug a memory leak
> -adjust audio and video cache size minimum and incremental values
> -
> ---- src/gui.c.orig Fri Nov 5 17:16:22 2010
> -+++ src/gui.c Tue Apr 19 16:58:55 2011
> -@@ -472,10 +472,10 @@ gboolean set_media_label(void *data)
> - notify_init("gnome-mplayer");
> - notification =
> - notify_notification_new(idle->display_name,
> idle->media_notification,
> -- "gnome-mplayer", NULL);
> -+ "gnome-mplayer");
> - #ifdef GTK2_12_ENABLED
> -- if (show_status_icon)
> -- notify_notification_attach_to_status_icon(notification,
> status_icon);
> -+// if (show_status_icon)
> -+// notify_notification_attach_to_status_icon(notification,
> status_icon);
> - #endif
> - notify_notification_show(notification, NULL);
> - notify_uninit();
> -@@ -2716,7 +2716,7 @@ gboolean slide_panel_away(gpointer data)
> - }
> - // mutex was already locked, this is good since we only want to do the
> animation if locked
> -
> -- if (GTK_IS_WIDGET(fs_controls) && get_visible(fs_controls)) {
> -+ if (GTK_IS_WIDGET(fs_controls) && get_visible(fs_controls) &&
> mouse_over_controls == FALSE) {
> - gtk_widget_hide(fs_controls);
> - g_mutex_unlock(slide_away);
> - return FALSE;
> -@@ -2748,7 +2748,8 @@ gboolean make_panel_and_mouse_invisible(gpointer data)
> - GTimeVal currenttime;
> -
> - if ((fullscreen || always_hide_after_timeout) && auto_hide_timeout > 0
> -- && (get_visible(controls_box) || fs_controls != NULL)) {
> -+ && (get_visible(controls_box) || fs_controls != NULL)
> -+ && mouse_over_controls == FALSE) {
> - g_get_current_time(¤ttime);
> - g_time_val_add(¤ttime, -auto_hide_timeout * G_USEC_PER_SEC);
> - if (last_movement_time > 0 && currenttime.tv_sec >
> last_movement_time) {
> -@@ -2835,6 +2836,19 @@ gboolean leave_button_callback(GtkWidget * widget, Gdk
> - return FALSE;
> - }
> -
> -+gboolean fs_controls_entered(GtkWidget * widget, GdkEventCrossing * event,
> gpointer data)
> -+{
> -+ mouse_over_controls = TRUE;
> -+ return FALSE;
> -+}
> -+
> -+gboolean fs_controls_left(GtkWidget * widget, GdkEventCrossing * event,
> gpointer data)
> -+{
> -+ mouse_over_controls = FALSE;
> -+ return FALSE;
> -+}
> -+
> -+
> - void menuitem_open_callback(GtkMenuItem * menuitem, void *data)
> - {
> -
> -@@ -3303,9 +3317,11 @@ void parseChannels(FILE * f)
> -
> - void menuitem_open_dtv_callback(GtkMenuItem * menuitem, void *data)
> - {
> -- gtk_list_store_clear(playliststore);
> - FILE *fi; // FILE pointer to use to open the conf file
> - gchar *mpconf;
> -+
> -+ gtk_list_store_clear(playliststore);
> -+
> - mpconf = g_strdup_printf("%s/.mplayer/channels.conf", g_getenv("HOME"));
> - fi = fopen(mpconf, "r"); // Make sure this is pointing to
> - // the appropriate file
> -@@ -3315,7 +3331,8 @@ void menuitem_open_dtv_callback(GtkMenuItem * menuitem
> - } else {
> - printf("Unable to open the config file\n"); //can change this
> to whatever error message system is used
> - }
> --
> -+ g_free(mpconf);
> -+
> - gtk_tree_model_get_iter_first(GTK_TREE_MODEL(playliststore), &iter);
> - if (gtk_list_store_iter_is_valid(playliststore, &iter)) {
> - play_iter(&iter, 0);
> -@@ -5053,9 +5070,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)
> -@@ -5066,16 +5080,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, "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), 7);
> -+ gtk_combo_box_set_active(GTK_COMBO_BOX(config_vo), 4);
> - }
> - }
> - }
> -@@ -5145,39 +5153,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");
> -+ gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "sndio");
> - gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "esd");
> -+ gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "arts");
> - gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "jack");
> -- gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "oss");
> -- gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "pulse");
> -+ gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), "rtunes");
> - if (ao != NULL) {
> -- if (strcmp(ao, "alsa") == 0)
> -+ if (strcmp(ao, "sndio") == 0)
> - gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 0);
> -- if (strcmp(ao, "arts") == 0)
> -- gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 1);
> - if (strcmp(ao, "esd") == 0)
> -+ gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 1);
> -+ if (strcmp(ao, "arts") == 0)
> - gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 2);
> - if (strcmp(ao, "jack") == 0)
> - gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 3);
> -- if (strcmp(ao, "oss") == 0)
> -+ if (strcmp(ao, "rtunes") == 0)
> - gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 4);
> -- if (strcmp(ao, "pulse") == 0)
> -- gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 5);
> - if (gtk_combo_box_get_active(GTK_COMBO_BOX(config_ao))
> - == -1) {
> - gtk_combo_box_append_text(GTK_COMBO_BOX(config_ao), ao);
> -- gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 6);
> -+ gtk_combo_box_set_active(GTK_COMBO_BOX(config_ao), 5);
> - }
> - }
> - }
> -@@ -5264,8 +5269,8 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
> - j = -1;
> -
> - config_mplayer_dvd_device = gtk_combo_box_entry_new_text();
> -- gtk_combo_box_append_text(GTK_COMBO_BOX(config_mplayer_dvd_device),
> "/dev/dvd");
> -- if (mplayer_dvd_device == NULL || g_ascii_strcasecmp("/dev/dvd",
> mplayer_dvd_device) == 0) {
> -+ gtk_combo_box_append_text(GTK_COMBO_BOX(config_mplayer_dvd_device),
> "/dev/rcd0c");
> -+ if (mplayer_dvd_device == NULL || g_ascii_strcasecmp("/dev/rcd0c",
> mplayer_dvd_device) == 0) {
> - j = i;
> - }
> - i++;
> -@@ -5492,8 +5497,8 @@ void menuitem_config_callback(GtkMenuItem * menuitem,
> - gtk_misc_set_padding(GTK_MISC(conf_label), 12, 0);
> - gtk_table_attach(GTK_TABLE(conf_table), conf_label, 0, 1, i, i + 1,
> GTK_FILL, GTK_SHRINK, 0, 0);
> - gtk_widget_show(conf_label);
> -- config_plugin_audio_cache_size = gtk_spin_button_new_with_range(32, 256
> * 1024, 128);
> -- config_plugin_video_cache_size = gtk_spin_button_new_with_range(32, 256
> * 1024, 512);
> -+ config_plugin_audio_cache_size = gtk_spin_button_new_with_range(64, 256
> * 1024, 64);
> -+ config_plugin_video_cache_size = gtk_spin_button_new_with_range(256,
> 256 * 1024, 256);
> - #ifdef GTK2_12_ENABLED
> - gtk_widget_set_tooltip_text(config_plugin_audio_cache_size,
> - _
> -@@ -6634,9 +6639,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("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
> -@@ -7658,6 +7663,10 @@ void show_fs_controls()
> -
> - if (fs_controls == NULL && fullscreen) {
> - fs_controls = gtk_window_new(GTK_WINDOW_POPUP);
> -+ gtk_widget_add_events(fs_controls, GDK_ENTER_NOTIFY_MASK);
> -+ gtk_widget_add_events(fs_controls, GDK_LEAVE_NOTIFY_MASK);
> -+ g_signal_connect(G_OBJECT(fs_controls), "enter_notify_event",
> G_CALLBACK(fs_controls_entered), NULL);
> -+ g_signal_connect(G_OBJECT(fs_controls), "leave_notify_event",
> G_CALLBACK(fs_controls_left), NULL);
> - g_object_ref(hbox);
> - gtk_container_remove(GTK_CONTAINER(controls_box), hbox);
> - gtk_container_add(GTK_CONTAINER(fs_controls), hbox);
> Index: x11/gnome-mplayer/patches/patch-src_libgmlib_gm_file_c
> ===================================================================
> RCS file: x11/gnome-mplayer/patches/patch-src_libgmlib_gm_file_c
> diff -N x11/gnome-mplayer/patches/patch-src_libgmlib_gm_file_c
> --- x11/gnome-mplayer/patches/patch-src_libgmlib_gm_file_c 31 Dec 2010
> 12:03:55 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_libgmlib_gm_file_c,v 1.2 2010/12/31 12:03:55 dcoppa Exp $
> -
> -from upstream: remove useless socket.h declaration
> -
> ---- src/libgmlib/gm_file.c.orig Tue Nov 23 08:44:47 2010
> -+++ src/libgmlib/gm_file.c Tue Nov 23 08:46:25 2010
> -@@ -26,7 +26,6 @@
> - #include <string.h>
> - #include <stdio.h>
> - #include <unistd.h>
> --#include <sys/socket.h>
> -
> - gchar *gm_tempname(gchar * path, const gchar * name_template)
> - {
> Index: x11/gnome-mplayer/patches/patch-src_main_c
> ===================================================================
> RCS file: x11/gnome-mplayer/patches/patch-src_main_c
> diff -N x11/gnome-mplayer/patches/patch-src_main_c
> --- x11/gnome-mplayer/patches/patch-src_main_c 31 Dec 2010 12:03:55
> -0000 1.9
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,64 +0,0 @@
> -$OpenBSD: patch-src_main_c,v 1.9 2010/12/31 12:03:55 dcoppa Exp $
> -
> -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
> -start with volume at 50% by default
> -
> ---- src/main.c.orig Tue Oct 19 18:33:40 2010
> -+++ src/main.c Mon Nov 15 11:49:10 2010
> -@@ -689,8 +689,8 @@ int main(int argc, char *argv[])
> - playlist_visible = FALSE;
> - disable_fullscreen = FALSE;
> - disable_framedrop = FALSE;
> -- softvol = FALSE;
> -- remember_softvol = FALSE;
> -+ softvol = TRUE;
> -+ remember_softvol = TRUE;
> - volume_softvol = -1;
> - volume_gain = 0;
> - subtitlefont = NULL;
> -@@ -705,8 +705,9 @@ int main(int argc, char *argv[])
> - reallyverbose = 0;
> - embedding_disabled = FALSE;
> - disable_pause_on_click = FALSE;
> -- disable_animation = FALSE;
> -+ disable_animation = TRUE;
> - auto_hide_timeout = 3;
> -+ mouse_over_controls = FALSE;
> - use_mediakeys = TRUE;
> - use_defaultpl = FALSE;
> - mplayer_bin = NULL;
> -@@ -744,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;
> - update_control_flag = FALSE;
> - gchar *filename;
> -@@ -796,9 +797,10 @@ int main(int argc, char *argv[])
> - audio_channels = gm_pref_store_get_int(gm_store, AUDIO_CHANNELS);
> - use_hw_audio = gm_pref_store_get_boolean(gm_store, USE_HW_AUDIO);
> - fullscreen = gm_pref_store_get_boolean(gm_store, FULLSCREEN);
> -- softvol = gm_pref_store_get_boolean(gm_store, SOFTVOL);
> -- remember_softvol = gm_pref_store_get_boolean(gm_store,
> REMEMBER_SOFTVOL);
> -- volume_softvol = gm_pref_store_get_int(gm_store, VOLUME_SOFTVOL);
> -+ softvol = gm_pref_store_get_boolean_with_default(gm_store, SOFTVOL,
> softvol);
> -+ remember_softvol = gm_pref_store_get_boolean_with_default(gm_store,
> REMEMBER_SOFTVOL, remember_softvol);
> -+ volume_softvol = gm_pref_store_get_int_with_default(gm_store,
> VOLUME_SOFTVOL, volume_softvol);
> -+ if (volume_softvol == -1) volume_softvol = 50;
> - volume_gain = gm_pref_store_get_int(gm_store, VOLUME_GAIN);
> - forcecache = gm_pref_store_get_boolean(gm_store, FORCECACHE);
> - vertical_layout = gm_pref_store_get_boolean(gm_store, VERTICAL);
> -@@ -815,7 +817,7 @@ int main(int argc, char *argv[])
> - disable_ass = gm_pref_store_get_boolean(gm_store, DISABLEASS);
> - disable_embeddedfonts = gm_pref_store_get_boolean(gm_store,
> DISABLEEMBEDDEDFONTS);
> - disable_pause_on_click = gm_pref_store_get_boolean(gm_store,
> DISABLEPAUSEONCLICK);
> -- disable_animation = gm_pref_store_get_boolean(gm_store,
> DISABLEANIMATION);
> -+ disable_animation = gm_pref_store_get_boolean_with_default(gm_store,
> DISABLEANIMATION, disable_animation);
> - auto_hide_timeout =
> - gm_pref_store_get_int_with_default(gm_store, AUTOHIDETIMEOUT,
> auto_hide_timeout);
> - disable_cover_art_fetch = gm_pref_store_get_boolean(gm_store,
> DISABLE_COVER_ART_FETCH);
> Index: x11/gnome-mplayer/patches/patch-src_thread_c
> ===================================================================
> RCS file: x11/gnome-mplayer/patches/patch-src_thread_c
> diff -N x11/gnome-mplayer/patches/patch-src_thread_c
> --- x11/gnome-mplayer/patches/patch-src_thread_c 3 Mar 2011 15:16:12
> -0000 1.9
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,39 +0,0 @@
> -$OpenBSD: patch-src_thread_c,v 1.9 2011/03/03 15:16:12 dcoppa Exp $
> -
> -fix an assertion failure
> -
> -fixes from upstream:
> -set the MEDIAENDED state correctly when running as plugin
> -bump QuickTime emulation to 7.6.9 (fix apple.com movie trailers)
> -
> ---- src/thread.c.orig Fri Nov 5 17:16:22 2010
> -+++ src/thread.c Tue Jan 18 10:36:05 2011
> -@@ -448,7 +448,7 @@ gboolean thread_reader(GIOChannel * source, GIOConditi
> - if (embed_window == 0)
> - idledata->cachepercent = 0.0;
> -
> -- if (g_ascii_strncasecmp(vo, "gl2", strlen("gl2")) != 0) {
> -+ if (vo != NULL && g_ascii_strncasecmp(vo, "gl2", strlen("gl2"))
> != 0) {
> - cmd = g_strdup_printf("brightness %i\n",
> idledata->brightness);
> - send_command(cmd, TRUE);
> - g_free(cmd);
> -@@ -1302,7 +1302,10 @@ gpointer launch_player(gpointer data)
> -
> - if (g_strrstr(threaddata->filename, "apple.com")) {
> - argv[arg++] = g_strdup_printf("-user-agent");
> -- argv[arg++] = g_strdup_printf("QuickTime/7.6.4");
> -+ argv[arg++] = g_strdup_printf("QuickTime/7.6.9");
> -+ } else {
> -+ argv[arg++] = g_strdup_printf("-user-agent");
> -+ argv[arg++] = g_strdup_printf("GnomeMplayer/" VERSION);
> - }
> -
> - /* disable msg stuff to make sure extra console characters don't mess
> around */
> -@@ -1495,6 +1498,7 @@ gpointer launch_player(gpointer data)
> -
> - // nothing is on the playlist and we are not looping so
> ask plugin for next item
> - if (embed_window != 0 || control_id != 0) {
> -+ js_state = STATE_MEDIAENDED;
> - dbus_send_event("MediaComplete", 0);
> - dbus_open_next();
> - }
> Index: x11/gnome-mplayer/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/gnome-mplayer/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- x11/gnome-mplayer/pkg/PLIST 8 Nov 2010 15:04:15 -0000 1.7
> +++ x11/gnome-mplayer/pkg/PLIST 26 Apr 2011 14:53:50 -0000
> @@ -12,10 +12,12 @@ share/doc/gnome-mplayer/README
> share/doc/gnome-mplayer/dbus.txt
> share/doc/gnome-mplayer/keyboard_shortcuts.txt
> share/doc/gnome-mplayer/plugin-interaction.txt
> +share/glib-2.0/schemas/apps.gecko-mediaplayer.preferences.gschema.xml
> +share/glib-2.0/schemas/apps.gnome-mplayer.preferences.enums.xml
> +share/glib-2.0/schemas/apps.gnome-mplayer.preferences.gschema.xml
> 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/
> @@ -35,8 +37,6 @@ share/icons/hicolor/48x48/apps/gnome-mpl
> share/icons/hicolor/scalable/
> share/icons/hicolor/scalable/apps/
> share/icons/hicolor/scalable/apps/gnome-mplayer.svg
> -share/locale/ar/
> -share/locale/ar/LC_MESSAGES/
> share/locale/ar/LC_MESSAGES/gnome-mplayer.mo
> share/locale/bg/LC_MESSAGES/gnome-mplayer.mo
> share/locale/ca/LC_MESSAGES/gnome-mplayer.mo
> @@ -44,9 +44,6 @@ share/locale/cs/LC_MESSAGES/gnome-mplaye
> 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/
> -share/locale/en_GB/LC_MESSAGES/
> 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
> @@ -56,14 +53,17 @@ 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/fy/
> +share/locale/fy/LC_MESSAGES/
> +share/locale/fy/LC_MESSAGES/gnome-mplayer.mo
> share/locale/gl/LC_MESSAGES/gnome-mplayer.mo
> share/locale/he/LC_MESSAGES/gnome-mplayer.mo
> +share/locale/hr/LC_MESSAGES/gnome-mplayer.mo
> share/locale/hu/LC_MESSAGES/gnome-mplayer.mo
> +share/locale/id/LC_MESSAGES/gnome-mplayer.mo
> share/locale/it/LC_MESSAGES/gnome-mplayer.mo
> share/locale/ja/LC_MESSAGES/gnome-mplayer.mo
> share/locale/ko/LC_MESSAGES/gnome-mplayer.mo
> -share/locale/lt/
> -share/locale/lt/LC_MESSAGES/
> share/locale/lt/LC_MESSAGES/gnome-mplayer.mo
> share/locale/nl/LC_MESSAGES/gnome-mplayer.mo
> share/locale/pl/LC_MESSAGES/gnome-mplayer.mo
> @@ -71,15 +71,19 @@ share/locale/pt/LC_MESSAGES/gnome-mplaye
> share/locale/pt_BR/LC_MESSAGES/gnome-mplayer.mo
> share/locale/ro/LC_MESSAGES/gnome-mplayer.mo
> share/locale/ru/LC_MESSAGES/gnome-mplayer.mo
> +share/locale/si/LC_MESSAGES/gnome-mplayer.mo
> share/locale/sr/LC_MESSAGES/gnome-mplayer.mo
> -share/locale/sr@latin/
> -share/locale/sr@latin/LC_MESSAGES/
> share/locale/sr@latin/LC_MESSAGES/gnome-mplayer.mo
> share/locale/sv/LC_MESSAGES/gnome-mplayer.mo
> +share/locale/th/LC_MESSAGES/gnome-mplayer.mo
> share/locale/tr/LC_MESSAGES/gnome-mplayer.mo
> +share/locale/ug/LC_MESSAGES/gnome-mplayer.mo
> +share/locale/uk/LC_MESSAGES/gnome-mplayer.mo
> share/locale/zh_CN/LC_MESSAGES/gnome-mplayer.mo
> share/locale/zh_HK/LC_MESSAGES/gnome-mplayer.mo
> share/locale/zh_TW/LC_MESSAGES/gnome-mplayer.mo
> +@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
> +@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas
> @exec %D/bin/update-desktop-database
> @unexec-delete %D/bin/update-desktop-database
> @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
> /dev/null || true
>
--
Antoine
