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

1 files changed, 26 insertions, 28 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}