Update gnome-mplayer to 1.0.4.

1.0.4
    Remove vdpau failure detection as it doesn't work
    Quit mplayer on vdpau restart, mplayer doesn't want to die
    Restart mplayer on vdpau create error
    Try and set the initial window size prior to loading the media, may fix vdpau issues
    Fix AC3 passthru, option was not being set, Issue #533
    Fix default filename in context menu. Issue #531
    Enable Save in popup menu with control id is specified but not window, useful for scripting
    Updated Portuguese translation
    Added a missing string to the Polish translation
    Correct invalid label, and update po files
    Updated Polish translation
    Move notification of export filename to occur later
    Track export filename across mplayer restarts
    Updated Turkish translation
1.0.4b2
    Update translations from launchpad
    Add Vietnamese translation
    Move -profile gnome-mplayer into the vo setting area, allows gnome-mplayer to work without preferences set
    Add in new media state, MEDIA_STATE_BUFFERING
    Updated Japanese Translation
    dbus - fixup GetPlayState to give more correct values
    dbus - add GetCachePercent method
    libgmtk - gmtk_media_player add ATTRIBUTE_CACHE_PERCENT
    Tell mplayer to ignore the xscreensaver, as gnome-mplayer controls it
    Make audio track and subtitle selection work correctly even when metadata is missing
    Add in generic ALSA and PulseAudio devices to the output selections even if we have ALSA and PulseSupport
    Emit dbus events on media state changes, useful for gecko-mediaplayer
    libgmtk - gmtk_media_player, block all event emissions when in restart mode
    Make cover art lookup with filenames in the form of "Artist - Title.xxx" where xxx can be any extension
    Only set don't play next if we are playing something, fixes playlist problem.
    Improvements to shoutcast media/station info
    Add GetTitle to dbus methods
    Fix GetDuration and GetTime dbus methods
1.0.4b1
    Minor tweaks to the autopause code
    Keep restarting mplayer when ALSA device is busy and AO is alsa, sometimes Pulse is slow to release it
    libgmtk - gmtk_media_player set attribute for audio_channels
    Update tracker status message when pausing
    Disable tracker focus
    Fix minor issue with vcd://
    Detect UBUNTU_MENUPROXY and enable_global_menu = TRUE when not NULL
    Disable button focus on control bar
    Fix problem when chapters = 1, media really doesn't have chapters
    Fix stop in network/streaming mode
    Make sure mplayer is dead before quitting
    Try and solve the apple trailer issues, still may have issues
    When playing an ICY stream, clear the album metadata fixes problem when switching from MP3 to stream
    When playlist is open, don't resize the media window
    Fix up some problems with apple trailers, still may have problems
    Updated Polish translation
    Fix up some compiler warnings
    Correct GTK warning on gmtk_media_player allocation event
    Code fixes for older machines
    libgmtk - gmtk_media_player, Clamp the values in the alignment
    Implement subtitle fuzziness selection, Issue #474
    Add gconf/dconf key 'enable-global-menu' distros should set this to TRUE when using gnome global menu
    Remove GTK allocation warning caused by audio file, due to uninitialized values
    Flush GTK Events in resize window
    When initially loading a folder, check to see if it is a DVD
    Ensure that the window id is not 0, before using it
    Fix crash when giving a device name that does not exist
    Disable xvmc if mplayer reports video_out incompatibility with codec
    Don't force ffmpeg12 codec with xvmc vo
    Retry playback without accelerated divx if using vdpau and vdpau error
    Properly display DVD Title in playlist and on window title
    Add support for crystalhd vo, untested as I don't have the hardware.
    Set the allocation to the height and width desired
    Make cursor hiding work in GTK3
    Select Subtitle by ID rather than by description + name
    Fix Issue #514
    Remove "percent" from idledata
    Update translation files with updated file listings
    Remove global variable 'lastfile', and fix code that uses it, fixes issue #514
    Give the media_hbox a default height, makes media_info display work better when showing a video
    Remove dontplaynext = FALSE settings where incorrect
    Update the volume icon on mute
    Fix mute toggle from keyboard key 'm'
    Fix keyboard volume adjustment with 9 and 0
    Use --nokeepaspect when detecting mplayer2
    Don't fail on longer vo names, ie matrixview
    Capture Artist, Title, and Album metadata
    Set channel encoding to binary, solves problems with metadata
    Fix software volume not being set properly
    Make volume gain and post processing work
    Fix fullscreen mode when run as a plugin (X11 only)
    Set runtime in gmtk_media_player
    Cleanup some debug messages
    Fix restart in paused state
    Hook up scroll event for volume change or seeking
    Update media info from ICY stream data
    Fix TYPE_NETWORK for apple.com correctly
    Set tracker sensitivity based on seekability of content
    Reset cache percent to 0 once media starts playing
    Change channel reader priority so cache updates work
    Only show video window when we have video
    Set the background color (black), on initialization
    Never, ever call a GTK function that changes something from a thread, reading is ok
    Remove config.h from SVN
    Apply patch to gmtk_media_player from Byeongsik Jeon
    Apply patch to gm_audio from Byeongsik Jeon
    Convert all events to be signalled in the main loop vs from the thread
    Change g_type_init to gtk_init
    Initialize file descripters and alter the channel creation settings
    Don't cancel mplayer monitoring on read error, just try again
    More debugging information
    Fix problem loading DVD after loading file
    Fix problem with position not updating due to state issue
    Fix problem with media player state event triggering before the state was true
    Remove event flushing where possible
    Fix initial OSD Level setting
    Rework gnome-mplayer restart, should work better now
    Only emit the position-changed signal when position actually changes, lowers CPU usage
    Keyboard shortcuts should work now
    Complete send_command removal
    More features for gmtk_media_player
    Switch from specific API call for mplayer commands to generic command submission
    Keep purging send_command
    Enable more features in gmtk_media_player: frame_drop, audio_delay, and sub_delay
    Fix environment detection issues
    Fix known memory leak in gmtk_media_player
    Remove uri, windowid variables from idledata
    Remove seekable, x, y, last_x, last_y, sub_visible, sub_demux, switch_audio variables from idledata
    Remove video properties from idledata
    Remove global variable dvd_title_is_menu
    Fix problem with dvb/tv parser Issue #508
    Fix window size issue when no media is loaded
    Start work on playlist issues
    Add gmtk_media_player_switch_angle
    When restarting player, do not emit events
    Fix fallback to alternate protocols on error, fixes web playback
    Fix window size issue when opening details with non-standard window size
    Make audio meter work in GTK3 mode
    Make audio meter work in GTK2 mode
    Remove some IdleData properties
    Make Details display correct data
    Update tracker label on media change
    Remove allocate_fixed_callback
    Fix crash when setting preferences when no file is loaded
    Make extra opts work
    Fix preference setting
    Make DVD playback from ISO and Folders work
    Bring set_gui_state back, as it is needed for RealPlayer emulation
    Output notification when using old Mplayer on every startup
    Screenshot capture notification
    Make setting the media attributes a common function
    Enable deinterlacing
    Make disable upscaling work
    Fix Cancel/Close button layout in pref and adv dialog
    Make Pref/Next buttons appear when file has chapters
    Make Advanced video settings work
    Disable DVD w/o menu for now.
    Playlist and Cache Percentage changes
    Fix memory leak in gmtk_media_player set_attribute_string
    More subtitle work
    Make audio track and subtitle selection menus work
    Activate/Deactivate subtitle visibility,delay,size menus based on if subs exist or not
    Fix resize issues with normal, double and half sizes
    Move menu updates from resize_window, make the gui change based on media state
    Move GUI updates from set_gui_state, make the gui change based on media state
    Fix state tracking
    Fix DVD menu selection
    Make playlists work
    Make enhanced subtitles work
    Add many attributes to gmtk_media_player
    Replace send_command with dummy function, until conversion is complete
    Replace mplayer_shutdown with gmtk version
    Add more attributes and methods to libgmtk - gmtk_media_player, still more to add
    Remove mute and other values from idledata
    Remove ThreadData type
    Remove thread.[c|h]
    Start conversion to libgmtk - gmtk_media_player
    libgmtk - gmtk_media_player, convert from GtkFixed layout to GtkAlignment layout, allows window to shrink in GTK3
    Allow code to compile when --enable-gtk3 is used
    More configure macros
    Add --enable-gtk3 to configure, code does not compile yet in this mode
    libgmtk - gtk3 prep
    Convert gtk_menu_append to gtk_menu_shell_append

6 files changed, 45 insertions, 11 deletions

diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile
index 8badc6aeb63..fb84e74702a 100644
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2011/04/26 14:39:09 obache Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/12 14:09:39 obache Exp $
 #
 
-DISTNAME=	gnome-mplayer-1.0.3
+DISTNAME=	gnome-mplayer-1.0.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gnome-mplayer.googlecode.com/files/
 
@@ -20,6 +20,7 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config msgfmt
 
 CONFIGURE_ARGS+=	--with-gconf
+CONFIGURE_ARGS+=	--disable-gtk3
 
 GCONF_SCHEMAS+=	gnome-mplayer.schemas
 
diff --git a/multimedia/gnome-mplayer/PLIST b/multimedia/gnome-mplayer/PLIST
index 30f8064f956..3d07bd19ecc 100644
--- a/multimedia/gnome-mplayer/PLIST
+++ b/multimedia/gnome-mplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/04/26 14:39:09 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/07/12 14:09:39 obache Exp $
 bin/gnome-mplayer
 ${PLIST.nautilus}lib/nautilus/extensions-2.0/libgnome-mplayer-properties-page.so
 man/man1/gnome-mplayer.1
@@ -58,6 +58,7 @@ 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/vi/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
diff --git a/multimedia/gnome-mplayer/distinfo b/multimedia/gnome-mplayer/distinfo
index 8e1ba1444c1..ae9aebd09c2 100644
--- a/multimedia/gnome-mplayer/distinfo
+++ b/multimedia/gnome-mplayer/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/04/26 14:39:09 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/07/12 14:09:39 obache Exp $
 
-SHA1 (gnome-mplayer-1.0.3.tar.gz) = 99e78a10a9801b7da5f4dc59b0266f18953a9d22
-RMD160 (gnome-mplayer-1.0.3.tar.gz) = f8bd3a0c35f7362dcf1052612b49726e506af28a
-Size (gnome-mplayer-1.0.3.tar.gz) = 1016907 bytes
-SHA1 (patch-Makefile.in) = 5851a997e450e6228f252528040ff9e887d9e29f
+SHA1 (gnome-mplayer-1.0.4.tar.gz) = 15c329573692e97bb550063854ddc6404309b265
+RMD160 (gnome-mplayer-1.0.4.tar.gz) = d2c42caa22b66b94e98d72b8c53074aa61e8485c
+Size (gnome-mplayer-1.0.4.tar.gz) = 1069389 bytes
+SHA1 (patch-Makefile.in) = d6c1c4d7bf7199087379d554d5d2cc1d5e60b860
+SHA1 (patch-configure) = e45b8517cb85b03ba5097453902ac631f23b6b28
+SHA1 (patch-configure.in) = c0f22d923945347d7b01738c6d206a3f37f8bb73
diff --git a/multimedia/gnome-mplayer/patches/patch-Makefile.in b/multimedia/gnome-mplayer/patches/patch-Makefile.in
index 482142e4af2..5e715b36105 100644
--- a/multimedia/gnome-mplayer/patches/patch-Makefile.in
+++ b/multimedia/gnome-mplayer/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1.1.1 2011/04/10 08:43:32 obache Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2011/07/12 14:09:39 obache Exp $
 
 Always install schema files (but not install-schemas).
 
---- Makefile.in.orig	2011-03-02 15:14:38.000000000 +0000
+--- Makefile.in.orig	2011-07-01 16:37:42.000000000 +0000
 +++ Makefile.in
-@@ -317,8 +317,8 @@ gnome_mplayerdoc_DATA = \
+@@ -335,8 +335,8 @@ gnome_mplayerdoc_DATA = \
  	DOCS/tech/dbus.txt \
  	DOCS/tech/plugin-interaction.txt
  
diff --git a/multimedia/gnome-mplayer/patches/patch-configure b/multimedia/gnome-mplayer/patches/patch-configure
new file mode 100644
index 00000000000..e6f83eab3d3
--- /dev/null
+++ b/multimedia/gnome-mplayer/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/07/12 14:09:39 obache Exp $
+
+* portability fix (already fixed in upstream repo).
+
+--- configure.orig	2011-07-12 09:10:02.000000000 +0000
++++ configure
+@@ -7474,7 +7474,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: gtk3 is $ENABLE_GTK3" >&5
+ $as_echo "$as_me: gtk3 is $ENABLE_GTK3" >&6;}
+ 
+-if test "x$ENABLE_GTK3" == "xyes"; then :
++if test "x$ENABLE_GTK3" = "xyes"; then :
+ 
+ 
+ 
diff --git a/multimedia/gnome-mplayer/patches/patch-configure.in b/multimedia/gnome-mplayer/patches/patch-configure.in
new file mode 100644
index 00000000000..3bb1b496ab7
--- /dev/null
+++ b/multimedia/gnome-mplayer/patches/patch-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2011/07/12 14:09:39 obache Exp $
+
+* portability fix (already fixed in upstream repo).
+
+--- configure.in.orig	2011-07-01 16:37:33.000000000 +0000
++++ configure.in
+@@ -64,7 +64,7 @@ AC_ARG_ENABLE(gtk3,
+ 
+ AC_MSG_NOTICE([gtk3 is $ENABLE_GTK3])
+     
+-AS_IF([test "x$ENABLE_GTK3" == "xyes"],   
++AS_IF([test "x$ENABLE_GTK3" = "xyes"],   
+     [
+     
+     PKG_CHECK_MODULES(GTK, [gtk+-3.0 glib-2.0 gthread-2.0])