Update mplayer package to 0.90rc3. Changes from rc2 include important bug fixes

and new features. From the ChangeLog: [Go to end for package changes.]

    DOCS:
    * english man page & HTML docs updates
    * audio filter documentation
    * help_diff.sh doesn't depend on BASH any more
    * Hungarian, French, Italian, German, Polish(?) docs synced

    Important fixes:
    * X11 fullscreen switching (yes, again...) rewritten, some x11 code cleanup
    * Voxware and Quicktime DLLs finally work (was broken in some contexts)
    * VIDIX Radeon support cleanup, should really solve the pink screen bugs
    * Cygwin: -vo directx crashes and garbled picture with some files fixed
    * OGM/Ogg seeking (broken frames) fixed, subtitle fixes, XCD support
    * libaf: big (audio filter layer) updates, floating point support, speedup
    * ffwma2 fixed (better error resilience)
    * SPU queueing - fixes missing or early disappearing DVD subtitles
    * the mysterious DVD audio delay (150-300ms) fixed
    * extension-based fileformat detection fixed the .mp3 vs. mpeg-ps conflict
    * cache2 keeps buffer for non-seekable media, fixes quicktime streaming

    Fixes:
    * mp3lib CPU detection part cleanup, 'decwin' linker problem fixed
    * various cddb:// fixes, support of netbsd-1.6
    * libmpdvdkit2: Fix DVD authentication on Solaris 9
    * libmpdvdkit2: libdvdcss upgraded to 1.2.4 (keeping the key cache patch)
    * libmpdvdkit2: fixed decryption from multiple VOB files (hdd or darwin)
    * -ao arts, -ao oss: Fix 8-bit sound support
    * -vop expand + ffmpeg codecs conflicts solved, some other -vop bugs fixed
    * -ac ffmp2 with MPEG files (sig11) fixed
    * QT Qclp audio codec initialization fixed
    * mplayer exit codes cleanup (0 for quit/eof, 1 for error)
    * -ao win32 sync problems solved, -autosync 100 is still recommended
    * -vo gif89a uninit sig11 fixed
    * the usual compiler warning fixes :)
    * use -pphelp instead of -vop pp=help
    * various bigendian fixes
    * 16bpp packed yuv fixes in crop, mirror, rotate filters
    * some -fixed-vo and vo_preinit fixes, -vo sdl,xmga,mga should work...
    * various Solaris compatibility fixes (should work out of the box)
    * mms:// port fixes, tries 1755 if 80 failed
    * libavcodec: various ME fixes, B frames fixes, WMV2 slice decoding fixes
    * -ao alsa9 audio-file playback high cpu usage fixed
    * libaf updates, 2-pass initialization to get better filter path
    * better detection of playlists, support for [Reference]-style format
    * handle quicktime reference media files as playlist
    * cddb:// & cdda:// cdrom device name fixes on linux and *BSD

    Features:
    * -ao esd: new EsounD audio driver
    * -vo dxr3: new NORM option
    * Xanim & RealPlayer binary Codecs working on PPC
    * Radeon 9000 support in VIDIX, colorkey restoring for all Radeons
    * Initial PPC (Big-Endian) support in VIDIX Rage128 driver
    * PNM:// streaming support (ported from xine)
    * Muxer layer: mencoder can now write MPEG-PS format, too (EXPERIMENTAL!)
    * libavcodec: wmv2 decoder (buggy/untested)
    * DVB "HEAD" (aka. NEWSTRUCT) drivers support
    * Subtitles background bounding-box support (optional grey-level & opacity)
    * libaf: 3 new filters: panning, compressor/limiter and a noise gate
    * per-mediafile config file support (for file-specific options)
    * iconv (codepage conversion) support for OGM (Ogg) subtitles
    * v4l: user friendly channel tuning
    * Freetype & old-style RAW font support usable (compilable) at the same time
    * vo_directfb2, vo_dfbmga: DirectFB 0.9.16 support
    * libavcodec: motion estimation pre pass, qpel encoding, trellis quantization
    * libavcodec, liba52, mp3lib: Altivec optimizations
    * keep window's aspect ratio at resizing (x11, xv), requires WM support
    * -geometry option, also accepts X11 syntax
    * real .bin+.cue (S)VCD images support (-vcd 2 -cuefile xxx.cue)
    * postprocess: YUV 411/422/444 support, stride fixes
    * jumping of overlapping subs fixed, sorting is automatical, iconv fixes
    * mpeg2 telecine detection and automatic inverse telecine (mplayer only)

    Gui:
    * correct GTK widget destroy event handler
    * fullscreen switching fixed (sync with x11_common)
    * fix gtk submenu
    * new font render engine
    * added persistant history patch
    * SDL Audio configure window
    * add overlapping to preferences
    * add play bar for subwindow
    * add vertical potmeter for skin
    * fixed 'single pixel bug'
    * fixed some possible crashes


NetBSD package changes:

 -- Add cdparanoia support. You can play an Audio CD with

	mplayer -cache 1024 cdda://

 -- Remove commented out "--enable-dvdread" hook, as, in jurisdictions were
    permitted, it would make more sense to comment out "--disable-mpdvdkit".

 -- Add "Makefile.cflags" with some reasonable optimizations.

6 files changed, 34 insertions, 46 deletions

diff --git a/graphics/mplayer-share/Makefile.cflags b/graphics/mplayer-share/Makefile.cflags
new file mode 100644
index 00000000000..72326bd166a
--- /dev/null
+++ b/graphics/mplayer-share/Makefile.cflags
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile.cflags,v 1.1 2003/01/20 07:10:41 fredb Exp $
+
+# This must all come after the last "buildink2.mk" inclusion, as
+# "buildlink2.mk" munges ${CFLAGS}, and if ${CFLAGS} is non-empty,
+# the configure script refuses to add any optimizations at all.
+
+.if ${MPLAYER_ENABLE_RUNTIME_CPU_DETECTION} == YES
+.if ${MACHINE_ARCH} == i386
+# Schedule for the typical machine fast enough to run mplayer. This
+# is nearly optimal for K6-2 as well. Anything slowler will still run
+# (but would probably benefit greatly from turning off the run-time
+# cpu detection).
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
+.else
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
+.endif
+.else
+CFLAGS=		# Let "configure" do its thing.
+.endif
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 79141854f1f..9f0831e40c2 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.21 2002/12/25 03:24:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2003/01/20 07:10:41 fredb Exp $
 
-MPLAYER_DIST_VERSION=	0.90rc2
-#PKGREVISION=		1
-
-# There is no need to change anything below here.
+MPLAYER_DIST_VERSION=	0.90rc3
+#PKGREVISION=		0
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	0.90rc12
+# XXX Add 10, as the "rc" version numbers were used up for the "pre" versions.
+MPLAYER_PKG_VERSION=	0.90rc13
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		graphics
@@ -34,8 +33,8 @@ PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--prefix="${PREFIX}"
 CONFIGURE_ARGS+=	--with-extraincdir="${LOCALBASE}/include"
+CONFIGURE_ARGS+=	--with-cdparanoiaincdir="${LOCALBASE}/include/cdparanoia"
 CONFIGURE_ARGS+=	--with-extralibdir="${LOCALBASE}/lib"
-#CONFIGURE_ARGS+=	--enable-dvdread
 CONFIGURE_ARGS+=	--disable-mpdvdkit
 CONFIGURE_ARGS+=	--enable-faad
 CONFIGURE_ARGS+=	--disable-arts
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 233d37956e6..687753f0fbc 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.9 2002/12/06 14:21:46 wiz Exp $
+# $NetBSD: Makefile.depends,v 1.10 2003/01/20 07:10:41 fredb Exp $
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
 
@@ -15,6 +15,7 @@ DEPENDS+=	realplayer>=8:../../audio/realplayer
 
 USE_X11=	# defined
 
+.include "../../audio/cdparanoia/buildlink2.mk"
 .include "../../audio/mad/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../audio/faad2/buildlink2.mk"
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index 69a50aa1e0c..1b464273b2e 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/12/25 03:24:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/01/20 07:10:41 fredb Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/Chinese/bugreports.html
 share/mplayer/DOCS/Chinese/cd-dvd.html
@@ -36,6 +36,7 @@ share/mplayer/DOCS/German/faq.html
 share/mplayer/DOCS/German/formats.html
 share/mplayer/DOCS/German/mplayer.1
 share/mplayer/DOCS/German/sound.html
+share/mplayer/DOCS/German/users_against_developers.html
 share/mplayer/DOCS/German/video.html
 share/mplayer/DOCS/Hungarian/bugreports.html
 share/mplayer/DOCS/Hungarian/cd-dvd.html
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index fb744d15a2c..91e118a11fd 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2002/12/26 11:10:02 wiz Exp $
+$NetBSD: distinfo,v 1.18 2003/01/20 07:10:41 fredb Exp $
 
-SHA1 (mplayer/MPlayer-0.90rc2.tar.bz2) = 98bbacfcb3734318a3168303a7acf23a872fabee
-Size (mplayer/MPlayer-0.90rc2.tar.bz2) = 3121703 bytes
+SHA1 (mplayer/MPlayer-0.90rc3.tar.bz2) = f42c9aefd230a20872711c1836d710c11e9389ef
+Size (mplayer/MPlayer-0.90rc3.tar.bz2) = 3285759 bytes
 SHA1 (mplayer/font-arial-iso-8859-1.tar.bz2) = cec0cad6145382dd15c801f9c6e9cda1ab71b1ed
 Size (mplayer/font-arial-iso-8859-1.tar.bz2) = 234810 bytes
 SHA1 (mplayer/font-arial-iso-8859-2.tar.bz2) = 12c05c32f64818378a32699bea0f5d3aa1551afa
 Size (mplayer/font-arial-iso-8859-2.tar.bz2) = 222677 bytes
 SHA1 (mplayer/font-arial-cp1250.tar.bz2) = 7b11d721e348a53abf9656f3ade61d0b99e2e7db
 Size (mplayer/font-arial-cp1250.tar.bz2) = 490101 bytes
-SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45
+SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
diff --git a/graphics/mplayer-share/patches/patch-aa b/graphics/mplayer-share/patches/patch-aa
index 6a3e0048ecb..f53f09caadd 100644
--- a/graphics/mplayer-share/patches/patch-aa
+++ b/graphics/mplayer-share/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/11/01 10:19:18 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2003/01/20 07:10:42 fredb Exp $
 
 --- configure.orig	Thu Oct 24 14:12:40 2002
 +++ configure
@@ -13,35 +13,3 @@ $NetBSD: patch-aa,v 1.4 2002/11/01 10:19:18 jlam Exp $
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -2970,8 +2970,22 @@ if test "$_ossaudio" = yes ; then
-     _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
-     _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"'
-   else
--     if netbsd || openbsd ; then
-+     cat > $TMPC << EOF
-+#include <sys/ioctl.h>
-+$_inc_soundcard
-+#ifdef OPEN_SOUND_SYSTEM
-+int main(void) { return 0; }
-+#else
-+#error Not the real thing
-+#endif
-+EOF
-+     _real_ossaudio=no
-+     cc_check && _real_ossaudio=yes
-+     if test "$_real_ossaudio" = yes; then
-+       _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
-+     elif netbsd || openbsd ; then
-        _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
-+       netbsd && _ld_arch="$_ld_arch -lossaudio"
-        openbsd && _ld_arch="$_ld_arch -lossaudio"
-      else
-        _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
-@@ -4324,7 +4338,6 @@ test "$_real" = yes && _ld_dl_dynamic='-
- _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
- bsdos && _ld_arch="$_ld_arch -ldvd"
- if netbsd ; then
--  _ld_arch="$_ld_arch -lossaudio"
-   x86 && _ld_arch="$_ld_arch -li386"
- fi
-