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

6 files changed, 21 insertions, 309 deletions

diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 94d2a2c3f05..900de4bd07e 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
+$NetBSD: patch-aa,v 1.17 2006/10/31 22:33:28 wiz Exp $
 
---- configure.orig	2006-06-11 19:35:47.000000000 +0100
-+++ configure	2006-10-03 14:25:36.000000000 +0100
-@@ -493,7 +493,7 @@
+--- configure.orig	2006-10-22 22:32:31.000000000 +0000
++++ configure
+@@ -515,7 +515,7 @@ for ac_option do
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
 -    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
 +    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
      ;;
-   --enable-runtime-cpudetection)
-     _runtime_cpudetection=yes
-@@ -694,11 +694,11 @@
+   --extra-libs=*)
+     _extra_libs=`echo $ac_option | cut -d '=' -f 2`
+@@ -719,11 +719,11 @@ if test "$_gcc_check" = yes ; then
    esac
    echores "$cc_version"
   else
@@ -25,16 +25,7 @@ $NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -819,7 +819,7 @@
- elif aix; then
-   # use 'lsattr' on AIX
-   _cpuinfo="lsattr -E -l proc0 -a type"
--elif x86; then
-+elif x86 || x86_64; then
-   # all other OSes try to extract CPU information from a small helper
-   # program TOOLS/cpuinfo instead
-   $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
-@@ -830,7 +830,7 @@
+@@ -855,7 +855,7 @@ if x86 || x86_64 ; then
    # gather more CPU information
    pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
    pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | _head 1`
@@ -43,7 +34,15 @@ $NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
    pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
    pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
  
-@@ -4136,7 +4136,7 @@
+@@ -3034,7 +3034,6 @@ fi
+ echores "$_pthreads"
+ 
+ echocheck "rpath"
+-netbsd &&_rpath=yes
+ if test "$_rpath" = yes ; then
+   for I in `echo $_ld_extra | sed 's/-L//g'` ; do
+     tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
+@@ -4192,7 +4191,7 @@ fi
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then
@@ -52,30 +51,3 @@ $NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
    fi
    _vosrc="$_vosrc vo_aa.c"
    _vomodules="aa $_vomodules"
-@@ -6190,7 +6190,7 @@
-   elif cc_check -lavutil $_ld_lm ; then
-     _libavutil_so=yes
-   fi
--  if test "$_libavutil_so" == yes ; then
-+  if test "$_libavutil_so" = yes ; then
-     _res_comment="using libavutil.so, but static libavutil is recommended"
-   fi
- fi
-@@ -6217,7 +6217,7 @@
-   elif cc_check -lavcodec $_ld_lm ; then
-     _libavcodec_so=yes
-   fi
--  if test "$_libavcodec_so" == yes ; then
-+  if test "$_libavcodec_so" = yes ; then
-     _res_comment="using libavcodec.so, but static libavcodec is recommended"
-   fi
- fi
-@@ -6239,7 +6239,7 @@
-   elif cc_check $_ld_lm -lavformat ; then
-     _libavformat_so=yes  
-   fi
--  if test "$_libavformat_so" == yes ; then
-+  if test "$_libavformat_so" = yes ; then
-     _res_comment="using libavformat.so, but static libavformat is recommended"
-   fi
- fi
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
deleted file mode 100644
index 614bce7884b..00000000000
--- a/multimedia/mplayer-share/patches/patch-ad
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2006/06/15 21:58:55 dogcow Exp $
---- libmpdemux/tvi_bsdbt848.c.orig	2006-06-15 14:41:49.000000000 -0700
-+++ libmpdemux/tvi_bsdbt848.c	2006-06-15 14:42:51.000000000 -0700
-@@ -178,6 +178,7 @@ tvi_handle_t *tvi_init_bsdbt848(char *de
- 
- static int control(priv_t *priv, int cmd, void *arg)
- {
-+    int *bogus = (int *) arg;
-     switch(cmd)
-     {
- 
-@@ -195,13 +196,13 @@ static int control(priv_t *priv, int cmd
-             return(TVI_CONTROL_FALSE);
-             }
- 
--        (int)*(void **)arg = priv->tunerfreq;
-+        *bogus = priv->tunerfreq;
-         return(TVI_CONTROL_TRUE);
-         }
-     
-     case TVI_CONTROL_TUN_SET_FREQ:
-         {
--        priv->tunerfreq = (int)*(void **)arg;
-+        priv->tunerfreq = *bogus;
- 
-         if(ioctl(priv->tunerfd, TVTUNER_SETFREQ, &priv->tunerfreq) < 0) 
-             {
-@@ -225,13 +226,13 @@ static int control(priv_t *priv, int cmd
-             return(TVI_CONTROL_FALSE);
-             }
- 
--        (int)*(void **)arg = priv->input;
-+        *bogus = priv->input;
-         return(TVI_CONTROL_TRUE);
-         }
-     
-     case TVI_CONTROL_SPC_SET_INPUT:
-         {
--        priv->input = getinput((int)*(void **)arg);
-+        priv->input = getinput(*bogus);
- 
-         if(ioctl(priv->btfd, METEORSINPUT, &priv->input) < 0) 
-             {
-@@ -250,17 +251,17 @@ static int control(priv_t *priv, int cmd
- 
-     case TVI_CONTROL_AUD_GET_FORMAT:
-         {
--        (int)*(void **)arg = AF_FORMAT_S16_LE;
-+        *bogus = AF_FORMAT_S16_LE;
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_AUD_GET_CHANNELS:
-         {
--        (int)*(void **)arg = 2;
-+        *bogus = 2;
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_AUD_SET_SAMPLERATE:
-         {
--        int dspspeed = (int)*(void **)arg;
-+        int dspspeed = *bogus;
- 
-            if(ioctl(priv->dspfd, SNDCTL_DSP_SPEED, &dspspeed) == -1) 
-             {
-@@ -279,12 +280,12 @@ static int control(priv_t *priv, int cmd
-         }
-     case TVI_CONTROL_AUD_GET_SAMPLERATE:
-         {
--        (int)*(void **)arg = priv->dspspeed;
-+        *bogus = priv->dspspeed;
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_AUD_GET_SAMPLESIZE:
-         {
--        (int)*(void **)arg = priv->dspsamplesize/8;
-+        *bogus = priv->dspsamplesize/8;
-         return(TVI_CONTROL_TRUE);
-         }
- 
-@@ -296,7 +297,7 @@ static int control(priv_t *priv, int cmd
- 
-     case TVI_CONTROL_TUN_SET_NORM:
-         {
--        int req_mode = (int)*(void **)arg;
-+        int req_mode = *bogus;
- 	u_short tmp_fps;
- 
-         priv->iformat = METEOR_FMT_AUTOMODE;
-@@ -381,19 +382,19 @@ static int control(priv_t *priv, int cmd
-         }
-     
-     case TVI_CONTROL_VID_GET_FORMAT:
--        (int)*(void **)arg = IMGFMT_UYVY;
-+        *bogus = IMGFMT_UYVY;
-         return(TVI_CONTROL_TRUE);
- 
-     case TVI_CONTROL_VID_SET_FORMAT:
-         {
--        int req_fmt = (int)*(void **)arg;
-+        int req_fmt = *bogus;
- 
-         if(req_fmt != IMGFMT_UYVY) return(TVI_CONTROL_FALSE);
- 
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_VID_SET_WIDTH:
--        priv->geom.columns = (int)*(void **)arg;
-+        priv->geom.columns = *bogus;
- 
-         if(priv->geom.columns > priv->maxwidth) 
-             {
-@@ -409,11 +410,11 @@ static int control(priv_t *priv, int cmd
-         return(TVI_CONTROL_TRUE);
- 
-     case TVI_CONTROL_VID_GET_WIDTH:
--        (int)*(void **)arg = priv->geom.columns;
-+        *bogus = priv->geom.columns;
-         return(TVI_CONTROL_TRUE);
- 
-     case TVI_CONTROL_VID_SET_HEIGHT:
--        priv->geom.rows = (int)*(void **)arg;
-+        priv->geom.rows = *bogus;
- 
-         if(priv->geom.rows > priv->maxheight) 
-             {
-@@ -434,7 +435,7 @@ static int control(priv_t *priv, int cmd
-         return(TVI_CONTROL_TRUE);        
- 
-     case TVI_CONTROL_VID_GET_HEIGHT:
--        (int)*(void **)arg = priv->geom.rows;
-+        *bogus = priv->geom.rows;
-         return(TVI_CONTROL_TRUE);        
- 
-     case TVI_CONTROL_VID_GET_FPS:
-@@ -443,7 +444,7 @@ static int control(priv_t *priv, int cmd
- 
- /*
-     case TVI_CONTROL_VID_SET_FPS:
--        priv->fps = (int)*(void **)arg;
-+        priv->fps = *bogus;
- 
-         if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
- 
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-ah
index 1797d7a9b01..4799dca43da 100644
--- a/multimedia/mplayer-share/patches/patch-ah
+++ b/multimedia/mplayer-share/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
+$NetBSD: patch-ah,v 1.3 2006/10/31 22:33:28 wiz Exp $
 
---- subreader.c.orig	2006-06-11 20:35:47.000000000 +0200
+--- subreader.c.orig	2006-10-22 22:32:31.000000000 +0000
 +++ subreader.c
 @@ -74,10 +74,10 @@ static int eol(char p) {
  /* Remove leading and trailing space */
@@ -15,7 +15,7 @@ $NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
  }
  
  static char *stristr(const char *haystack, const char *needle) {
-@@ -628,7 +628,7 @@ subtitle *sub_read_line_pjs(stream_t *st
+@@ -628,7 +628,7 @@ static subtitle *sub_read_line_pjs(strea
      if (!stream_read_line (st, line, LINE_LEN))
  	return NULL;
      /* skip spaces */
@@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
      /* allow empty lines at the end of the file */
      if (*s==0)
  	return NULL;
-@@ -681,7 +681,7 @@ subtitle *sub_read_line_mpsub(stream_t *
+@@ -681,7 +681,7 @@ static subtitle *sub_read_line_mpsub(str
  			else return current;
  		}
  		p=line;
diff --git a/multimedia/mplayer-share/patches/patch-ak b/multimedia/mplayer-share/patches/patch-ak
deleted file mode 100644
index b7843ce5ed0..00000000000
--- a/multimedia/mplayer-share/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/14 10:30:06 drochner Exp $
-
---- libmpdemux/rtp.c.orig	2006-06-14 10:41:54.000000000 +0200
-+++ libmpdemux/rtp.c
-@@ -137,8 +137,8 @@ static int rtp_open_socket( URL_t *url )
- 		}
- 	}
- 
--	tv.tv_sec = 0;
--	tv.tv_usec = (1 * 1000000);	// 1 second timeout
-+	tv.tv_sec = 1;
-+	tv.tv_usec = 0;	// 1 second timeout
- 	FD_ZERO( &set );
- 	FD_SET( socket_server_fd, &set );
- 	err = select(socket_server_fd+1, &set, NULL, NULL, &tv);
diff --git a/multimedia/mplayer-share/patches/patch-ta b/multimedia/mplayer-share/patches/patch-ta
deleted file mode 100644
index 48b259d598d..00000000000
--- a/multimedia/mplayer-share/patches/patch-ta
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ta,v 1.1 2006/10/11 18:32:40 rillig Exp $
-
---- TOOLS/checktree.sh.orig	2006-06-11 20:35:46.000000000 +0200
-+++ TOOLS/checktree.sh	2006-10-11 20:28:37.000000000 +0200
-@@ -71,7 +71,7 @@ printhead() {
- all_filenames() {
-     test "$_files" != "" && echo "$_files" && return
- 
--    if [ "$_cvs" == "no" ]; then
-+    if [ "$_cvs" = "no" ]; then
-         find . -type f \
-         | grep -v "\.\#\|\~$\|\.depend\|\/CVS\/\|config.mak\|^\./config\.h" \
-         | grep -v "^\./version\.h\|\.o$\|\.a$"
-@@ -208,7 +208,7 @@ done
- 
- # Set heading color
- 
--if [ "$_color" == "yes" ]; then
-+if [ "$_color" = "yes" ]; then
-     COLB="\e[36m"
-     COLE="\e[m"
- else
-@@ -220,7 +220,7 @@ fi
- 
- filelist=`all_filenames`
- 
--if [ "$_showcont" == "yes" ]; then
-+if [ "$_showcont" = "yes" ]; then
-   _diffopts="-u"
-   _grepopts="-n -I"
- else
-@@ -234,21 +234,21 @@ fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_spaces" == "yes" ]; then
-+if [ "$_spaces" = "yes" ]; then
-     printhead "checking for spaces in filenames ..."
-     find . | grep " "
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_extensions" == "yes" ]; then
-+if [ "$_extensions" = "yes" ]; then
-     printhead "checking for uppercase extensions ..."
-     echo $filelist | grep "\.[[:upper:]]\+$" | grep -v "\.S$"
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_crlf" == "yes" ]; then
-+if [ "$_crlf" = "yes" ]; then
-     printhead "checking for MSDOS line endings ..."
-     grep $_grepopts "
- " $filelist
-@@ -256,28 +256,28 @@ fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_trailws" == "yes" ]; then
-+if [ "$_trailws" = "yes" ]; then
-     printhead "checking for trailing whitespace ..."
-     grep $_grepopts "[[:space:]]\+$" $filelist
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_rcsid" == "yes" ]; then
-+if [ "$_rcsid" = "yes" ]; then
-     printhead "checking for missing RCS \$Id\$ or \$Revision\$ tags ..."
-     grep -L -I "\$\(Id\|Revision\)[[:print:]]\+\$" $filelist
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_oll" == "yes" ]; then
-+if [ "$_oll" = "yes" ]; then
-     printhead "checking for overly long lines (over 79 characters) ..."
-     grep $_grepopts "^[[:print:]]\{80,\}$" $filelist
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_charset" == "yes" ]; then
-+if [ "$_charset" = "yes" ]; then
-     printhead "checking bad charsets ..."
-     for I in $filelist ; do
-       case "$I" in
diff --git a/multimedia/mplayer-share/patches/patch-tb b/multimedia/mplayer-share/patches/patch-tb
deleted file mode 100644
index 5ffe05413ef..00000000000
--- a/multimedia/mplayer-share/patches/patch-tb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tb,v 1.1 2006/10/11 18:32:40 rillig Exp $
-
---- TOOLS/mencvcd.orig	2006-06-11 20:35:46.000000000 +0200
-+++ TOOLS/mencvcd	2006-10-11 20:29:01.000000000 +0200
-@@ -330,7 +330,7 @@ done
- 
- # some configs
- mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46"
--if [ "$vnorm" == "SVCD" ]; then
-+if [ "$vnorm" = "SVCD" ]; then
-    [ $vbrset -eq 0 ] && vbr=2500
-    mplexnorm="-f $SVCDMODE -m 2 -V -b 230"
-    mpegnorm="-f $SVCDMODE -b $vbr -B 260 -V 230"