Update mplayer-share, mplayer, mencoder, and gmplayer to 1.0rc9 (which

is upstream 1.0rc1, but we already used rc for the previous versions).

With valuable help from drochner, thanks!

ChangeLog:
MPlayer 1.0rc1: "Codename intentionally left blank"

DOCS:

    * German documentation translation finished
    * Russian documentation translation synced and almost finished

Drivers:

    * IVTV hardware MPEG audio/video decoder output
    * ALSA audio output: AC3 passthrough now works even when the device name of the digital output port has been set by the user
    * bicubic OpenGL scaling works with ATI cards
    * md5sum switched to the libavutil MD5 implementation
    * support for libcaca 1.0 via compatibility layer

Decoders:

    * liba52 updated to 0.7.4 (slightly faster)
    * SSE optimizations for mp3lib
    * removed support for obsolete and non-free divx4 libraries

Demuxers:

    * audio stream switching in MPEG-TS/PS, Matroska and streams supported by libavformat
    * audio stream switching between streams with different codecs
    * libavformat demuxer now honors -alang
    * chapter seeking in Matroska files
    * fixed seeking to absolute and percent position for libavformat demuxer
    * NUT demuxer using libnut
    * Matroska SimpleBlock support

Inputs:

    * split of stream layer from libmpdemux to new stream library
    * PVR input for hardware MPEG encoder based cards, such as Hauppauge WinTV PVR-150/250/350/500 AKA IVTV but also pvrusb2 and cx88 (requires Linux >= 2.6.18 kernel, featuring native V4L2 MPEG API)
    * native RTSP input (handles MPEG-TS over RTP) for generic RTSP servers
    * support for seeking to chapters in dvd:// and dvdnav:// streams
    * radio support (radio://)

FFmpeg/libavcodec:

    * VC-1/WMV3/WMV9 video decoder
    * Vorbis decoding speedup, now default Vorbis decoder
    * VMware Video decoder
    * On2 VP50 and VP62 decoder
    * lossless audio decoders: WavPack, TTA, Shorten
    * CAVS decoder
    * GXF muxer/demuxer
    * MXF demuxer
    * much improved FLAC encoder
    * more H.264 decoding speed improvements, plus support for -lavdopts fast
    * Theora decoder fixes
    * preliminary Vorbis encoder
    * MTV demuxer

GUI:

    * Windows version added
    * drag-and-drop ignored last file
    * save and load cache setting correctly
    * working audio stream selection for Ogg and Matroska files
    * executable names like gmplayer_old etc. will now start GUI as well
    * -gui/-nogui options
    * xinerama fixes, now behaves similar to MPlayer without GUI

Filters:

    * MMX-optimizations for -vf yadif
    * MMX-optimizations for -vf zrmjpeg

MEncoder:

    * support of x264 encoding via libavcodec
    * rewrite -x264encopts option parser to use the 264 option parser; likely breaks 3rd party tools as the syntax of some options has changed
    * removed support for obsolete and non-free divx4 libraries

Ports:

    * partial Intel Mac support, --disable-win32 --disable-mp3lib is needed
    * OpenGL can now create windows > screen size under Windows
    * allow filenames starting with \\ for remote paths on Windows

Others:

    * SSA/ASS subtitle renderer
    * -endpos option for MPlayer
    * -correct-pts option
    * UTF-8 used for OSD and subtitles, some bitmap fonts will no longer work correctly and -subcp must be set for all non-UTF-8 subtitles
    * more audio-truncation fixes
    * libavutil mandatory for MPlayer compilation
    * more intuitive -edlout behaviour
    * -nortc is now default since -rtc has disadvantages with recent kernels

1 files changed, 8 insertions, 9 deletions

diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index f77e3945918..73e7626f914 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2006/10/13 20:13:14 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2006/10/31 22:33:28 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -24,7 +24,7 @@ PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv dvdread png theora vorbis
 .if !empty(PKGNAME:M*mplayer*)
 PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
 PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
-PKG_SUGGESTED_OPTIONS+=		faad
+PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
 
 PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas sdl
 
@@ -86,7 +86,6 @@ CONFIGURE_ARGS+=	--disable-arts
 
 .if !empty(PKG_OPTIONS:Mcdparanoia)
 CONFIGURE_ARGS+=	--enable-cdparanoia
-CONFIGURE_ARGS+=	--with-cdparanoiaincdir="${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia"
 .  include "../../audio/cdparanoia/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cdparanoia
@@ -122,13 +121,13 @@ CONFIGURE_ARGS+=	--disable-esd
 
 
 .if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
-CONFIGURE_ARGS+=	--disable-external-faad
-CONFIGURE_ARGS+=	--disable-internal-faad
+CONFIGURE_ARGS+=	--disable-faad-external
+CONFIGURE_ARGS+=	--disable-faad-internal
 .elif !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+=	--enable-external-faad
+CONFIGURE_ARGS+=	--enable-faad-external
 .  include "../../audio/faad2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--enable-internal-faad
+CONFIGURE_ARGS+=	--enable-faad-internal
 .endif
 
 .if !empty(PKG_OPTIONS:Mggi)
@@ -239,10 +238,10 @@ CONFIGURE_ARGS+=	--disable-theora
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+=	--enable-vorbis
+CONFIGURE_ARGS+=	--enable-libvorbis
 .  include "../../audio/libvorbis/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-vorbis
+CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 .if !empty(PKG_OPTIONS:Mxvid)