Update mplayer packages to 1.1, provided by Leonardo Taccari in PR 46566.

Pkgsrc changes:
* Fix some pkglint(1) warnings (no functional changes intended)
* Modified options.mk in order to always enable or disable a
  PKG_SUPPORTED_OPTION (for more information please give a look to
  the second "Note" of options.mk)
* Removed the mplayer-internal-faad PKG_SUPPORTED_OPTION, now faad support is
  only enabled via audio/faad2.
* Changed MASTER_SITES, now MPlayer distfile is fetched directly from its
  mirror.

MPlayer changes:

  1.1: "We gave up on 1.0"

    Decoders:
    * FFmpeg AAC decoder is now preferred over libfaad2 and the internal
      libfaad2 forked copy has been removed in its favor

    Demuxers:
    * experimental support for using binary Quicktime codecs with -demuxer lavf.
    * correct runtime and average bitrate for VBR (variable bitrate) MP3

    Filters:
    * delogo: allow to change the rectangle based on the time.
    * lavfi: libavfilter filter graphs (experimental).

    Other:
    * support adding noise at output resolution with -vo gl:noise-strength=8
    * experimental support for OpenGL ES 1.0 in -vo gl
    * support for PGS (BluRay-compatible), DVB and XSUB subtitles.
    * af_cmdline slave command to change e.g. audio equalizer options at runtime.
    * vo x11: don't hide or show cursor any more if attached to an existing window (-wid)
    * try reconnecting network streams e.g. after network timeouts
    * lots of bug fixes as always (and surely a few new bugs, too :-( )

    GUI: Support for the GUI continues.
    * numerous fixes, improvements and updates
    * UTF-8 support
    * all skin messages available as slave commands (gui <message>)
    * fancy new icon

    Ports:
    * Wine (see DOCS/tech/crosscompile.txt)

    MEncoder:
    * -force-key-frames option to set explicit seek points.

MPlayer (1.0)

  rc4: "Yes We Can"

    GUI: Changes towards removing the GUI
    * The GUI will no longer display any error or warning messages.
    * Special GUI slave commands (gui_*) were removed, along with
      the related key bindings.

    Decoders:
    * YUY2 Lossless Codec (YLC0) via binary DLL
    * Truemotion RT codec (TR20) via binary DLL
    * Nogantech Codec (NTN1 and NTN2) via binary DLL
    * add new FourCCs (m1v1, yuvs, VYUY, Y42B, V422, YUNV, UYNV, UYNY, uyv1,
      2Vu1, P422, HDYC, IJLV, MVJP)
      TwoCCs (0xA106, 0x6c75, 0xAAC0, 0x55005354)
      to existing decoders
    * AMR now handled via OpenCORE decoder
    * updated Windows Media Screen Codec (MSS1, MSS2) via binary DLL
    * CoreAVC H.264 decoder via binary DLL (Windows only)
    * Kega Game video codec (KGV1) via binary DLL
    * SoftLab-NSK Forward MPEG-2 I-frames (SLIF) via binary DLL
    * JPEG 2000 support via OpenJPEG
    * internal liba52 copy removed
    * CineForm HD (CFHD) via binary DLL
    * VP8 en-/decoding through libvpx wrapper and native decoder in FFmpeg
    * support for external libmpeg2 added
    * hardware MPEG decoder priority lowered
    * external libmpg123 support

    Demuxers:
    * Mostly fixed timing issues with some H.264 (PAFF) samples
    * Matroska and Ogg demuxers switched to use libavformat by default.
      Report issues and use -demuxer ogg and -demuxer mkv to work around them.
    * support for TrueHD in Blu-ray streams in libmpdemux
    * more Blu-ray codec support with lavf
    * fix length in ASF/WMV files
    * support ISDB-Tb DVB streams

    Filters:
    * remove vf_yuy2, functionality is replaced by -vf format=yuv2
    * remove vf_rgb2bgr, functionality is replaced by sws and vf_format

    Streaming:
    * Support for unencrypted Blu-ray playback through libbluray.
      Use it through: mplayer br:////path/to/disc

    Drivers:
    * -vo yuv4mpeg:interlaced no longer does its own interlaced RGB->YUV
      conversion. Use -vf scale=::1 to keep the same behavior and report
      if there are any issues with that.
    * X11: Window manager chooses Window position by default.
      Add geometry=50%:50% to your configuration to get the old behavior.
    * -vo md5sum md5 calculation changed so output matches FFmpeg's -f framemd5
    * Support for more formats in OpenGL video output drivers (different YUV
      subsampling, 16 bit per component)
    * Selectable YUV to RGB conversion standard for -vo gl
      (-vo gl:colorspace=...:levelconv=...)
    * -vo gl now tries to use yuv=2 by default if possible
    * -vo gl:stereo=... for experimental stereo (3D) support
    * -vo matrixview finally added
    * add OS/2 KAI audio driver (-ao kai)

    Other:
    * -nosub option for disabling auto-selected subtitles
    * support for displaying subs in the terminal (FIXME)
    * support for subtitles with audio-only files
    * support for right-to-left languages with embedded subtitles
    * support for UTF-16 encoded external subtitles
    * support for 8 channel audio
    * sync dvd:// and dvdnav:// features
    * support for MPEG-4 ASP in VDPAU video output (non-B-frame only)
    * support for live and non-live DVB teletext with demuxer lavf
    * -name, -title and -use-filename-title options for MPlayer
    * support for stream handling via FFmpeg, in particular RTMP and RTSP
      (use e.g. ffmpeg://http://example.com/test)
    * experimental support for external libass, configure with
      --disable-ass-internal
    * better support for 16-bit-per-component formats and formats
      with alpha channel
    * better out-of-the-box support for compiling for ARM, IA64,
      MinGW32 and MinGW-w64, MinGW has ASLR enabled with recent
      enough binutils
    * libdvdcss synced with upstream Subversion snapshot

    MEncoder:
    * add -tsprog for demuxer lavf

2 files changed, 38 insertions, 45 deletions

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index e10075d448a..b5c4b2b098b 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2012/03/03 07:21:42 sbd Exp $
+# $NetBSD: Makefile,v 1.98 2012/06/11 13:41:13 wiz Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,18 +9,18 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_VERSION}
-PKGREVISION=	13
 
 SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 		http://www2.mplayerhq.hu/MPlayer/skins/		\
 		ftp://ftp1.mplayerhq.hu/MPlayer/skins/		\
 		ftp://ftp2.mplayerhq.hu/MPlayer/skins/		\
 		http://ftp5.mplayerhq.hu/MPlayer/skins/		\
-		ftp://ftp5.mplayerhq.hu/MPlayer/skins/		\
+		ftp://ftp5.mplayerhq.hu/MPlayer/skins/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../multimedia/mplayer-share/Makefile.common"
+SKIN_EXTRACT_SUFX=	.tar.bz2
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=		yasm-[0-9]*:../../devel/yasm
@@ -28,32 +28,30 @@ BUILD_DEPENDS+=		yasm-[0-9]*:../../devel/yasm
 
 COMMENT=	Fast, cross-platform movie player with GTK2+ interface
 
-SKINS +=	AlienMind-1.2${EXTRACT_SUFX}			\
-		Blue-1.7${EXTRACT_SUFX}				\
-		BlueHeart-1.5${EXTRACT_SUFX}			\
-		CornerMP-1.2${EXTRACT_SUFX}			\
-		CornerMP-aqua-1.4${EXTRACT_SUFX}		\
-		Cyrus-1.2${EXTRACT_SUFX}			\
-		MidnightLove-1.6${EXTRACT_SUFX}			\
-		WMP6-2.2${EXTRACT_SUFX}				\
-		avifile-1.6${EXTRACT_SUFX}			\
-		gnome-1.1${EXTRACT_SUFX}			\
-		hayraphon-1.0${EXTRACT_SUFX}			\
-		hwswskin-1.1${EXTRACT_SUFX}			\
-		mentalic-1.2${EXTRACT_SUFX}			\
-		neutron-1.5${EXTRACT_SUFX}			\
-		phony-1.1${EXTRACT_SUFX}			\
-		plastic-1.2${EXTRACT_SUFX}			\
-		proton-1.2${EXTRACT_SUFX}			\
-		slim-1.2${EXTRACT_SUFX}				\
-		xanim-1.6${EXTRACT_SUFX}			\
-		xine-lcd-1.2${EXTRACT_SUFX}
-
-.if !defined(SITES_AlienMind-1.2.tar.bz2)
-.  for skin in ${SKINS}
+SKINS+=		AlienMind-1.2${SKIN_EXTRACT_SUFX}		\
+		Blue-1.7${SKIN_EXTRACT_SUFX}			\
+		BlueHeart-1.5${SKIN_EXTRACT_SUFX}		\
+		CornerMP-1.2${SKIN_EXTRACT_SUFX}		\
+		CornerMP-aqua-1.4${SKIN_EXTRACT_SUFX}		\
+		Cyrus-1.2${SKIN_EXTRACT_SUFX}			\
+		MidnightLove-1.6${SKIN_EXTRACT_SUFX}		\
+		WMP6-2.2${SKIN_EXTRACT_SUFX}			\
+		avifile-1.6${SKIN_EXTRACT_SUFX}			\
+		gnome-1.1${SKIN_EXTRACT_SUFX}			\
+		hayraphon-1.0${SKIN_EXTRACT_SUFX}		\
+		hwswskin-1.1${SKIN_EXTRACT_SUFX}		\
+		mentalic-1.2${SKIN_EXTRACT_SUFX}		\
+		neutron-1.5${SKIN_EXTRACT_SUFX}			\
+		phony-1.1${SKIN_EXTRACT_SUFX}			\
+		plastic-1.2${SKIN_EXTRACT_SUFX}			\
+		proton-1.2${SKIN_EXTRACT_SUFX}			\
+		slim-1.2${SKIN_EXTRACT_SUFX}			\
+		xanim-1.6${SKIN_EXTRACT_SUFX}			\
+		xine-lcd-1.2${SKIN_EXTRACT_SUFX}
+
+.for skin in ${SKINS}
 SITES.${skin}= ${SKIN_SITES}
-.  endfor
-.endif
+.endfor
 
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${SKINS}
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 42c96ae781f..4bd07aba764 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2011/11/02 16:35:15 drochner Exp $
+$NetBSD: distinfo,v 1.77 2012/06/11 13:41:13 wiz Exp $
 
 SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -18,6 +18,9 @@ Size (mplayer/CornerMP-aqua-1.4.tar.bz2) = 243154 bytes
 SHA1 (mplayer/Cyrus-1.2.tar.bz2) = 20bbb63114e8c0438770c1d1682296f37833968c
 RMD160 (mplayer/Cyrus-1.2.tar.bz2) = c4d4593a358456d98a1d94e14e263a902add6828
 Size (mplayer/Cyrus-1.2.tar.bz2) = 228461 bytes
+SHA1 (mplayer/MPlayer-1.1.tar.gz) = e46e3294bc96daabe604e4e195721e4f2d1e5b48
+RMD160 (mplayer/MPlayer-1.1.tar.gz) = 0369e57677c0c30f3b05f80ee1c4d8d7d1217e63
+Size (mplayer/MPlayer-1.1.tar.gz) = 17018391 bytes
 SHA1 (mplayer/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f
 RMD160 (mplayer/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c
 Size (mplayer/MidnightLove-1.6.tar.bz2) = 539665 bytes
@@ -39,9 +42,6 @@ Size (mplayer/hwswskin-1.1.tar.bz2) = 20331 bytes
 SHA1 (mplayer/mentalic-1.2.tar.bz2) = 47a0c7f8cebba83b50b381ff923d91904cc5b514
 RMD160 (mplayer/mentalic-1.2.tar.bz2) = d561f0c1c3396c2776175f58f0d69b39623e9fee
 Size (mplayer/mentalic-1.2.tar.bz2) = 166570 bytes
-SHA1 (mplayer/mplayer-20100913.tar.bz2) = 6fd3acb29fa8455636bcd86f9f333da4763daa6d
-RMD160 (mplayer/mplayer-20100913.tar.bz2) = 79085d4ebdb824fc34f7bc128070ef11e874897d
-Size (mplayer/mplayer-20100913.tar.bz2) = 9073690 bytes
 SHA1 (mplayer/neutron-1.5.tar.bz2) = 757a2aef5a6eb6873024d8cafa5f862377af9239
 RMD160 (mplayer/neutron-1.5.tar.bz2) = 9434c545386357c540a43c5cb37f70a6308b1ed7
 Size (mplayer/neutron-1.5.tar.bz2) = 369303 bytes
@@ -63,18 +63,13 @@ Size (mplayer/xanim-1.6.tar.bz2) = 94564 bytes
 SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
 RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
 Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes
-SHA1 (patch-aa) = a1d82fd9999c656bd9ecf703cd9f2c0245330874
-SHA1 (patch-ab) = 1a927d956155a7b9a2daa1a4f522e47d830c5af6
-SHA1 (patch-ac) = 3d037c96537233cdbda582afdb878dcf3f43e923
-SHA1 (patch-ad) = 84ce5a0f5cd8f59831c56b14dd2bc762793427ac
-SHA1 (patch-ae) = 7e1f05cd6e09f8755debfff7061dadf0a8ca3a3f
-SHA1 (patch-ag) = bef25568c913dcb8535afa51976ce7c94a6af5a2
-SHA1 (patch-ah) = dcfc26ec1422581a03ab200cb95926f6fd896d5b
-SHA1 (patch-an) = 3e72fb86abe7ab572f12a4fef002edb623ab6fae
-SHA1 (patch-ar) = df7e7cdc6fb8187bbcf0b285afc14d275a51e17a
-SHA1 (patch-as) = e353a1437101f661e012ce37004d8920913725cd
-SHA1 (patch-libao2_ao_sun.c) = 14eedc06f70dd949da1fb84078877e7cf259eff1
+SHA1 (patch-aa) = bd0dab582534ae216b49eef52c4a6c82288ce23d
+SHA1 (patch-ae) = b9033bc0c6582707e25e469a23e2d7bf6c790717
+SHA1 (patch-an) = 3b1af01b3b3e81d0583abb97b6a837b38476157b
+SHA1 (patch-ar) = f48a889a11e2c958cf9e939d831e371b00474489
+SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-stream_dvb_tune.c) = b663830ff64ab31488684b1a324da50ab52d68cc
 SHA1 (patch-stream_dvbin.h) = 56f6e71fcdf6bf3afccbdbc8682834c806114677
-SHA1 (patch-vb) = ce584c31e0e32865e87aa1f537a1f9e4817c7442
-SHA1 (patch-ve_x264) = 1946a2b2a7643bbc1d3f6a8963e21c4f6cbd2c89
+SHA1 (patch-sub_osd.c) = 47b17b4f7e998341a06ff231a1cbae30ec9651cc
+SHA1 (patch-sub_subreader.c) = 06b7d90e2a46ee63e4385c805e2f5989549336b5
+SHA1 (patch-ve_x264) = 42b133d230bc536d952cdc1b9b172891462fe388