update to 1.0pre7

some relevant changes:
-RTSP/MMST security patches now in main distribution
-documentation improvements
-x86_64 support fixes
-integrated Tremor decoder for Ogg/Vorbis
-expose support for 422P and 444P raw formats
-dropped support of old FAAD2 versions (<= 1.1)
-support for 32 bit float and extended WAV files
-support for multichannel WAV files
-ALAC (QuickTime lossless audio) support via lavc
-vqf demuxer
-support for Real multirate files
-more user-friendly info about audio and subtitle tracks in Ogg files
-streaming improvements
-ffmpeg updates
-MEncoder usability improvements
-many fixes and cleanups

6 files changed, 113 insertions, 67 deletions

diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 6002e09d20d..5e9b440f0ee 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.19 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/04/18 17:49:41 drochner Exp $
 
-MPLAYER_DIST_VERSION=	1.0pre6a
+MPLAYER_DIST_VERSION=	1.0pre7
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc6
+MPLAYER_PKG_VERSION=	1.0rc7
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		multimedia
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index d60db562e16..fa6a0ca85e1 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,5 +1,74 @@
-@comment $NetBSD: PLIST,v 1.4 2005/01/05 15:39:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/04/18 17:49:41 drochner Exp $
 man/man1/mplayer.1
+share/mplayer/DOCS/HTML/cs/amiga.html
+share/mplayer/DOCS/HTML/cs/aspect.html
+share/mplayer/DOCS/HTML/cs/audio.html
+share/mplayer/DOCS/HTML/cs/bsd.html
+share/mplayer/DOCS/HTML/cs/bugreports.html
+share/mplayer/DOCS/HTML/cs/bugreports_advusers.html
+share/mplayer/DOCS/HTML/cs/bugreports_fix.html
+share/mplayer/DOCS/HTML/cs/bugreports_report.html
+share/mplayer/DOCS/HTML/cs/bugreports_what.html
+share/mplayer/DOCS/HTML/cs/bugreports_where.html
+share/mplayer/DOCS/HTML/cs/bugs-audio.html
+share/mplayer/DOCS/HTML/cs/bugs-special.html
+share/mplayer/DOCS/HTML/cs/bugs.html
+share/mplayer/DOCS/HTML/cs/cd-dvd.html
+share/mplayer/DOCS/HTML/cs/codecs.html
+share/mplayer/DOCS/HTML/cs/commandline.html
+share/mplayer/DOCS/HTML/cs/control.html
+share/mplayer/DOCS/HTML/cs/custommatrices.html
+share/mplayer/DOCS/HTML/cs/default.css
+share/mplayer/DOCS/HTML/cs/drives.html
+share/mplayer/DOCS/HTML/cs/dvd.html
+share/mplayer/DOCS/HTML/cs/edl.html
+share/mplayer/DOCS/HTML/cs/faq.html
+share/mplayer/DOCS/HTML/cs/features.html
+share/mplayer/DOCS/HTML/cs/formats.html
+share/mplayer/DOCS/HTML/cs/gcc-296.html
+share/mplayer/DOCS/HTML/cs/gui.html
+share/mplayer/DOCS/HTML/cs/history.html
+share/mplayer/DOCS/HTML/cs/howtoread.html
+share/mplayer/DOCS/HTML/cs/hp-ux.html
+share/mplayer/DOCS/HTML/cs/index.html
+share/mplayer/DOCS/HTML/cs/install.html
+share/mplayer/DOCS/HTML/cs/intro.html
+share/mplayer/DOCS/HTML/cs/irix.html
+share/mplayer/DOCS/HTML/cs/joe-barr.html
+share/mplayer/DOCS/HTML/cs/linux.html
+share/mplayer/DOCS/HTML/cs/macos.html
+share/mplayer/DOCS/HTML/cs/mailinglists.html
+share/mplayer/DOCS/HTML/cs/menc-feat-dvd-mpeg4.html
+share/mplayer/DOCS/HTML/cs/menc-feat-enc-images.html
+share/mplayer/DOCS/HTML/cs/menc-feat-enc-libavcodec.html
+share/mplayer/DOCS/HTML/cs/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/cs/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/cs/menc-feat-mpeg4.html
+share/mplayer/DOCS/HTML/cs/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/cs/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/cs/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/cs/mencoder.html
+share/mplayer/DOCS/HTML/cs/mplayer-binary.html
+share/mplayer/DOCS/HTML/cs/mpst.html
+share/mplayer/DOCS/HTML/cs/nvidia-opinions.html
+share/mplayer/DOCS/HTML/cs/patches.html
+share/mplayer/DOCS/HTML/cs/ports.html
+share/mplayer/DOCS/HTML/cs/qnx.html
+share/mplayer/DOCS/HTML/cs/rtc.html
+share/mplayer/DOCS/HTML/cs/skin-file.html
+share/mplayer/DOCS/HTML/cs/skin-fonts.html
+share/mplayer/DOCS/HTML/cs/skin-gui.html
+share/mplayer/DOCS/HTML/cs/skin-overview.html
+share/mplayer/DOCS/HTML/cs/skin.html
+share/mplayer/DOCS/HTML/cs/solaris.html
+share/mplayer/DOCS/HTML/cs/streaming.html
+share/mplayer/DOCS/HTML/cs/subosd.html
+share/mplayer/DOCS/HTML/cs/tv-input.html
+share/mplayer/DOCS/HTML/cs/usage.html
+share/mplayer/DOCS/HTML/cs/users-vs-dev.html
+share/mplayer/DOCS/HTML/cs/vcd.html
+share/mplayer/DOCS/HTML/cs/video.html
+share/mplayer/DOCS/HTML/cs/windows.html
 share/mplayer/DOCS/HTML/en/amiga.html
 share/mplayer/DOCS/HTML/en/aspect.html
 share/mplayer/DOCS/HTML/en/audio.html
@@ -42,7 +111,6 @@ share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/en/menc-feat-fix-avi.html
 share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/en/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/en/menc-feat-rescale.html
@@ -251,7 +319,6 @@ share/mplayer/DOCS/HTML/hu/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/hu/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/hu/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/hu/menc-feat-fix-avi.html
 share/mplayer/DOCS/HTML/hu/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/hu/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/hu/menc-feat-rescale.html
@@ -317,15 +384,16 @@ share/mplayer/DOCS/HTML/pl/joe-barr.html
 share/mplayer/DOCS/HTML/pl/linux.html
 share/mplayer/DOCS/HTML/pl/macos.html
 share/mplayer/DOCS/HTML/pl/mailinglists.html
-share/mplayer/DOCS/HTML/pl/menc-feat-divx4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/pl/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/pl/menc-feat-extractsub.html
 share/mplayer/DOCS/HTML/pl/menc-feat-fix-avi.html
 share/mplayer/DOCS/HTML/pl/menc-feat-mpeg.html
+share/mplayer/DOCS/HTML/pl/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-rescale.html
 share/mplayer/DOCS/HTML/pl/menc-feat-streamcopy.html
+share/mplayer/DOCS/HTML/pl/menc-feat-telecine.html
 share/mplayer/DOCS/HTML/pl/mencoder.html
 share/mplayer/DOCS/HTML/pl/mplayer-binary.html
 share/mplayer/DOCS/HTML/pl/mpst.html
@@ -389,7 +457,6 @@ share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/ru/menc-feat-fix-avi.html
 share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/ru/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html
@@ -454,6 +521,7 @@ share/mplayer/DOCS/man/zh/mplayer.1
 share/mplayer/DOCS/tech/Doxyfile
 share/mplayer/DOCS/tech/MAINTAINERS
 share/mplayer/DOCS/tech/TODO
+share/mplayer/DOCS/tech/binary-packaging.txt
 share/mplayer/DOCS/tech/code-documentation.txt
 share/mplayer/DOCS/tech/codec-devel.txt
 share/mplayer/DOCS/tech/codecs-in.html
@@ -484,6 +552,7 @@ share/mplayer/DOCS/tech/realcodecs/streaming.txt
 share/mplayer/DOCS/tech/realcodecs/video-codecs.txt
 share/mplayer/DOCS/tech/release-howto.txt
 share/mplayer/DOCS/tech/slave.txt
+share/mplayer/DOCS/tech/snow.txt
 share/mplayer/DOCS/tech/subcp.txt
 share/mplayer/DOCS/tech/swscaler_filters.txt
 share/mplayer/DOCS/tech/swscaler_methods.txt
@@ -495,6 +564,20 @@ share/mplayer/DOCS/xml/Makefile.inc
 share/mplayer/DOCS/xml/README
 share/mplayer/DOCS/xml/README.maintainers
 share/mplayer/DOCS/xml/configure
+share/mplayer/DOCS/xml/cs/Makefile
+share/mplayer/DOCS/xml/cs/audio.xml
+share/mplayer/DOCS/xml/cs/bugreports.xml
+share/mplayer/DOCS/xml/cs/bugs.xml
+share/mplayer/DOCS/xml/cs/cd-dvd.xml
+share/mplayer/DOCS/xml/cs/codecs.xml
+share/mplayer/DOCS/xml/cs/documentation.xml
+share/mplayer/DOCS/xml/cs/faq.xml
+share/mplayer/DOCS/xml/cs/features.xml
+share/mplayer/DOCS/xml/cs/formats.xml
+share/mplayer/DOCS/xml/cs/history.xml
+share/mplayer/DOCS/xml/cs/install.xml
+share/mplayer/DOCS/xml/cs/tvinput.xml
+share/mplayer/DOCS/xml/cs/usage.xml
 share/mplayer/DOCS/xml/default.css
 share/mplayer/DOCS/xml/en/Makefile
 share/mplayer/DOCS/xml/en/audio.xml
@@ -575,7 +658,9 @@ share/mplayer/DOCS/xml/hu/install.xml
 share/mplayer/DOCS/xml/hu/mail-lists.xml
 share/mplayer/DOCS/xml/hu/patches.xml
 share/mplayer/DOCS/xml/hu/ports.xml
+share/mplayer/DOCS/xml/hu/tvinput.xml
 share/mplayer/DOCS/xml/hu/usage.xml
+share/mplayer/DOCS/xml/hu/video.xml
 share/mplayer/DOCS/xml/ldp.dsl
 share/mplayer/DOCS/xml/pl/Makefile
 share/mplayer/DOCS/xml/pl/audio.xml
@@ -722,6 +807,7 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/xml/fr
 @dirrm share/mplayer/DOCS/xml/es
 @dirrm share/mplayer/DOCS/xml/en
+@dirrm share/mplayer/DOCS/xml/cs
 @dirrm share/mplayer/DOCS/xml
 @dirrm share/mplayer/DOCS/tech/realcodecs
 @dirrm share/mplayer/DOCS/tech
@@ -744,6 +830,7 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/HTML/fr
 @dirrm share/mplayer/DOCS/HTML/es
 @dirrm share/mplayer/DOCS/HTML/en
+@dirrm share/mplayer/DOCS/HTML/cs
 @dirrm share/mplayer/DOCS/HTML
 @dirrm share/mplayer/DOCS
 @dirrm share/mplayer
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 133c7ef0a37..d8eae13c6e3 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,21 +1,19 @@
-$NetBSD: distinfo,v 1.18 2005/04/16 17:43:09 drochner Exp $
+$NetBSD: distinfo,v 1.19 2005/04/18 17:49:41 drochner Exp $
 
-SHA1 (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
-RMD160 (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = a0e866906bd9f87b93ad35e47aaa24f69ef7224e
-Size (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = 6380482 bytes
-SHA1 (mplayer-1.0rc6/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
-RMD160 (mplayer-1.0rc6/font-arial-iso-8859-1.tar.bz2) = 666697cd5efd9387057a898c714175e7c2aacbcd
-Size (mplayer-1.0rc6/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
-SHA1 (mplayer-1.0rc6/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
-RMD160 (mplayer-1.0rc6/font-arial-iso-8859-2.tar.bz2) = 562d4d92c4f5f3d537340fde3ad8d1495ac41acb
-Size (mplayer-1.0rc6/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
-SHA1 (mplayer-1.0rc6/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
-RMD160 (mplayer-1.0rc6/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91
-Size (mplayer-1.0rc6/font-arial-cp1250.tar.bz2) = 249705 bytes
+SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
+RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
+Size (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = 6868877 bytes
+SHA1 (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
+RMD160 (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 666697cd5efd9387057a898c714175e7c2aacbcd
+Size (mplayer-1.0rc7/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
+SHA1 (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
+RMD160 (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 562d4d92c4f5f3d537340fde3ad8d1495ac41acb
+Size (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
+SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
+RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91
+Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes
 SHA1 (patch-aa) = 7f0a858c226fb0e1e0382bff4e31817d510ffca1
 SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
-SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
+SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
 SHA1 (patch-ae) = e3b1a98d86f377b84a4f92673f878d287ae5aa6d
-SHA1 (patch-ba) = be78ddba2d58230cf12f186b746d46b01c2836bc
-SHA1 (patch-bb) = 90e635cf521d8ba0f3f4e9dafc1e298abf8e315f
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
index 2d158c0252b..51389c92ed6 100644
--- a/multimedia/mplayer-share/patches/patch-ad
+++ b/multimedia/mplayer-share/patches/patch-ad
@@ -1,16 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2004/07/17 19:06:36 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2005/04/18 17:49:41 drochner Exp $
 
---- mp_msg.c.orig	2003-09-12 17:46:16.000000000 +0200
+--- mp_msg.c.orig	2005-01-20 14:22:52.000000000 +0100
 +++ mp_msg.c
-@@ -34,6 +34,7 @@ void mp_msg_init(){
+@@ -34,15 +34,19 @@ void mp_msg_init(){
  #ifdef MP_DEBUG
      fprintf(stdout, "Using GNU internationalization\n");
      fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
 +#if 0
      fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
  #endif
-     setlocale(LC_ALL, ""); /* set from the environment variables */
-@@ -41,9 +42,12 @@ void mp_msg_init(){
+     bindtextdomain("mplayer", PREFIX"/share/locale");
      textdomain("mplayer");
  #ifdef MP_DEBUG
      fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
diff --git a/multimedia/mplayer-share/patches/patch-ba b/multimedia/mplayer-share/patches/patch-ba
deleted file mode 100644
index 04a9f0cce6f..00000000000
--- a/multimedia/mplayer-share/patches/patch-ba
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2005/04/16 17:43:09 drochner Exp $
-
---- libmpdemux/realrtsp/rtsp.c.orig	2005-04-16 21:08:44.000000000 +0200
-+++ libmpdemux/realrtsp/rtsp.c
-@@ -397,6 +397,7 @@ static int rtsp_get_answers(rtsp_t *s) {
-   unsigned int answer_seq;
-   char **answer_ptr=s->answers;
-   int code;
-+  int ans_count = 0;
-   
-   answer=rtsp_get(s);
-   if (!answer)
-@@ -448,7 +449,7 @@ static int rtsp_get_answers(rtsp_t *s) {
-     }
-     *answer_ptr=answer;
-     answer_ptr++;
--  } while (strlen(answer)!=0);
-+  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-   
-   s->cseq++;
-   
diff --git a/multimedia/mplayer-share/patches/patch-bb b/multimedia/mplayer-share/patches/patch-bb
deleted file mode 100644
index ab078d1180c..00000000000
--- a/multimedia/mplayer-share/patches/patch-bb
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2005/04/16 17:43:09 drochner Exp $
-
---- libmpdemux/asf_mmst_streaming.c.orig	2005-04-16 21:10:36.000000000 +0200
-+++ libmpdemux/asf_mmst_streaming.c
-@@ -334,8 +334,12 @@ static int interp_header (uint8_t *heade
- 
-       printf ("stream object, stream id: %d\n", stream_id);
- 
-+      if (num_stream_ids < 20) {
-       stream_ids[num_stream_ids] = stream_id;
-       num_stream_ids++;
-+      } else {
-+	printf ("too many id, stream skipped");
-+      }
-       
-     } else {
-       printf ("unknown object\n");