Upgrade mplayer/gmplayer to version 0.90pre4:

- X11 fullscreen toggle fixes with various windowmanagers, multifile playback
- DXR2 support (linux only)
- Output into animated GIF
- "cropdetect" video filter to autodetect needed size to crop
- libavcodec marked as default encoder for MEncoder
- manpage rewrite
- lot of other fixes

- gmplayer uses two new skins: CornerMP-aqua and hwswskin

Also patch-ab is no longer needed and patch-aa has only one hunk remaining.

8 files changed, 87 insertions, 82 deletions

diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index 10dad6ef11d..9be0aa2678e 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/05/03 18:00:50 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2002/05/14 22:13:34 veego Exp $
 
 .include "../../graphics/mplayer/Makefile.common"
 
@@ -31,7 +31,9 @@ SKINS +=	default${EXTRACT_SUFX}				\
 		netscape4${EXTRACT_SUFX}			\
 		CubicPlayer${EXTRACT_SUFX}			\
 		AlienMind${EXTRACT_SUFX}			\
-		CornerMP${EXTRACT_SUFX}
+		CornerMP${EXTRACT_SUFX}				\
+		CornerMP-aqua${EXTRACT_SUFX}			\
+		hwswskin${EXTRACT_SUFX}
 
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=	${SKINS}
diff --git a/graphics/gmplayer/PLIST b/graphics/gmplayer/PLIST
index 0b156bb4817..ff1567ecff8 100644
--- a/graphics/gmplayer/PLIST
+++ b/graphics/gmplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/05/06 11:13:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/05/14 22:13:34 veego Exp $
 bin/gmplayer
 man/man1/gmplayer.1
 share/gmplayer/DOCS/DVB
@@ -59,12 +59,14 @@ share/gmplayer/DOCS/Polish/encoding.html
 share/gmplayer/DOCS/Polish/faq.html
 share/gmplayer/DOCS/Polish/formats.html
 share/gmplayer/DOCS/Polish/gcc-2.96-3.0.html
-share/gmplayer/DOCS/Polish/mencoder.1
 share/gmplayer/DOCS/Polish/mplayer.1
-share/gmplayer/DOCS/Polish/skin-en.html
+share/gmplayer/DOCS/Polish/skin-pl.html
 share/gmplayer/DOCS/Polish/sound.html
 share/gmplayer/DOCS/Polish/users_against_developers.html
 share/gmplayer/DOCS/Polish/video.html
+share/gmplayer/DOCS/SGML/DO_NOT_USE
+share/gmplayer/DOCS/SGML/c
+share/gmplayer/DOCS/SGML/docs.sgml
 share/gmplayer/DOCS/bugreports.html
 share/gmplayer/DOCS/cd-dvd.html
 share/gmplayer/DOCS/codecs-in.html
@@ -74,7 +76,6 @@ share/gmplayer/DOCS/encoding.html
 share/gmplayer/DOCS/faq.html
 share/gmplayer/DOCS/formats.html
 share/gmplayer/DOCS/gcc-2.96-3.0.html
-share/gmplayer/DOCS/mencoder.1
 share/gmplayer/DOCS/mplayer.1
 share/gmplayer/DOCS/skin-en.html
 share/gmplayer/DOCS/sound.html
@@ -94,6 +95,7 @@ share/gmplayer/DOCS/tech/osd.txt
 share/gmplayer/DOCS/tech/patches.txt
 share/gmplayer/DOCS/tech/playtree
 share/gmplayer/DOCS/tech/playtree-hun
+share/gmplayer/DOCS/tech/subcp.txt
 share/gmplayer/DOCS/tech/tech-eng.txt
 share/gmplayer/DOCS/tech/vidix.txt
 share/gmplayer/DOCS/tech/vop.txt
@@ -150,6 +152,35 @@ share/gmplayer/Skin/BlueHeart/stop.png
 share/gmplayer/Skin/BlueHeart/sub.png
 share/gmplayer/Skin/BlueHeart/symbols.fnt
 share/gmplayer/Skin/BlueHeart/symbols.png
+share/gmplayer/Skin/CornerMP-aqua/README
+share/gmplayer/Skin/CornerMP-aqua/about.png
+share/gmplayer/Skin/CornerMP-aqua/back.png
+share/gmplayer/Skin/CornerMP-aqua/eqls.png
+share/gmplayer/Skin/CornerMP-aqua/exit.png
+share/gmplayer/Skin/CornerMP-aqua/font.fnt
+share/gmplayer/Skin/CornerMP-aqua/font.png
+share/gmplayer/Skin/CornerMP-aqua/forwd.png
+share/gmplayer/Skin/CornerMP-aqua/full.png
+share/gmplayer/Skin/CornerMP-aqua/icnf.png
+share/gmplayer/Skin/CornerMP-aqua/load.png
+share/gmplayer/Skin/CornerMP-aqua/main.png
+share/gmplayer/Skin/CornerMP-aqua/menu.png
+share/gmplayer/Skin/CornerMP-aqua/menu_ko.png
+share/gmplayer/Skin/CornerMP-aqua/menus.png
+share/gmplayer/Skin/CornerMP-aqua/menus_ko.png
+share/gmplayer/Skin/CornerMP-aqua/next.png
+share/gmplayer/Skin/CornerMP-aqua/pause.png
+share/gmplayer/Skin/CornerMP-aqua/play.png
+share/gmplayer/Skin/CornerMP-aqua/plst.png
+share/gmplayer/Skin/CornerMP-aqua/pos.png
+share/gmplayer/Skin/CornerMP-aqua/prev.png
+share/gmplayer/Skin/CornerMP-aqua/skin
+share/gmplayer/Skin/CornerMP-aqua/stop.png
+share/gmplayer/Skin/CornerMP-aqua/sub.png
+share/gmplayer/Skin/CornerMP-aqua/subt.png
+share/gmplayer/Skin/CornerMP-aqua/symbols.fnt
+share/gmplayer/Skin/CornerMP-aqua/symbols.png
+share/gmplayer/Skin/CornerMP-aqua/vol.png
 share/gmplayer/Skin/CornerMP/README
 share/gmplayer/Skin/CornerMP/about.png
 share/gmplayer/Skin/CornerMP/back.png
@@ -312,6 +343,26 @@ share/gmplayer/Skin/default/subload.png
 share/gmplayer/Skin/default/symbols.fnt
 share/gmplayer/Skin/default/symbols.png
 share/gmplayer/Skin/default/volume.png
+share/gmplayer/Skin/hwswskin/button-about.png
+share/gmplayer/Skin/hwswskin/button-exit.png
+share/gmplayer/Skin/hwswskin/button-forward.png
+share/gmplayer/Skin/hwswskin/button-fullscr.png
+share/gmplayer/Skin/hwswskin/button-next.png
+share/gmplayer/Skin/hwswskin/button-open.png
+share/gmplayer/Skin/hwswskin/button-pause.png
+share/gmplayer/Skin/hwswskin/button-play.png
+share/gmplayer/Skin/hwswskin/button-playlst.png
+share/gmplayer/Skin/hwswskin/button-prev.png
+share/gmplayer/Skin/hwswskin/button-rewind.png
+share/gmplayer/Skin/hwswskin/button-skinbr.png
+share/gmplayer/Skin/hwswskin/button-stop.png
+share/gmplayer/Skin/hwswskin/font.fnt
+share/gmplayer/Skin/hwswskin/font.png
+share/gmplayer/Skin/hwswskin/main.png
+share/gmplayer/Skin/hwswskin/pos.png
+share/gmplayer/Skin/hwswskin/skin
+share/gmplayer/Skin/hwswskin/sub.png
+share/gmplayer/Skin/hwswskin/vol.png
 share/gmplayer/Skin/mentalic/VERSION
 share/gmplayer/Skin/mentalic/about.png
 share/gmplayer/Skin/mentalic/back.png
@@ -565,6 +616,7 @@ share/gmplayer/codecs.conf
 @dirrm share/gmplayer/Skin/neutron
 @dirrm share/gmplayer/Skin/netscape4
 @dirrm share/gmplayer/Skin/mentalic
+@dirrm share/gmplayer/Skin/hwswskin
 @dirrm share/gmplayer/Skin/default
 @dirrm share/gmplayer/Skin/avifile
 @dirrm share/gmplayer/Skin/WindowsMediaPlayer6
@@ -572,10 +624,12 @@ share/gmplayer/codecs.conf
 @dirrm share/gmplayer/Skin/Cyrus
 @dirrm share/gmplayer/Skin/CubicPlayer
 @dirrm share/gmplayer/Skin/CornerMP
+@dirrm share/gmplayer/Skin/CornerMP-aqua
 @dirrm share/gmplayer/Skin/BlueHeart
 @dirrm share/gmplayer/Skin/AlienMind
 @dirrm share/gmplayer/Skin
 @dirrm share/gmplayer/DOCS/tech
+@dirrm share/gmplayer/DOCS/SGML
 @dirrm share/gmplayer/DOCS/Polish
 @dirrm share/gmplayer/DOCS/Italian
 @dirrm share/gmplayer/DOCS/Hungarian
diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index 1b244fd2285..fda89ded824 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2002/05/09 20:22:37 wiz Exp $
+$NetBSD: distinfo,v 1.9 2002/05/14 22:13:34 veego Exp $
 
-SHA1 (gmplayer/MPlayer-0.90pre3.tar.bz2) = 0ed1d70787488ce55699826752d492aed3425795
-Size (gmplayer/MPlayer-0.90pre3.tar.bz2) = 2322749 bytes
+SHA1 (gmplayer/MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
+Size (gmplayer/MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
 SHA1 (gmplayer/default.tar.bz2) = 40319dd1f8a8f2ff8b85d5efb1d4294d62530535
 Size (gmplayer/default.tar.bz2) = 167762 bytes
 SHA1 (gmplayer/MidnightLove.tar.bz2) = 7eaeb8acfef8a4584485083fd6659631a05fa0f8
@@ -38,5 +38,8 @@ SHA1 (gmplayer/AlienMind.tar.bz2) = 8bd483aa6b52c10ee826c458a2c509c90a57e0f7
 Size (gmplayer/AlienMind.tar.bz2) = 129515 bytes
 SHA1 (gmplayer/CornerMP.tar.bz2) = d46a59c33abcc27ddc24be3124d3f4d23361e836
 Size (gmplayer/CornerMP.tar.bz2) = 237492 bytes
-SHA1 (patch-aa) = f24f92892d3bfa2e4e45efbbb685b209b5e1ac3b
-SHA1 (patch-ab) = a90f1dda80a3208695e5435b63fa4f2b11689a63
+SHA1 (gmplayer/CornerMP-aqua.tar.bz2) = f46260401e036f5529cdb6f2be4a555f0fa0ae74
+Size (gmplayer/CornerMP-aqua.tar.bz2) = 247987 bytes
+SHA1 (gmplayer/hwswskin.tar.bz2) = 2b5b59d2e91bfa5c01011773c71db0ab2b48edec
+Size (gmplayer/hwswskin.tar.bz2) = 20275 bytes
+SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
diff --git a/graphics/mplayer/Makefile.common b/graphics/mplayer/Makefile.common
index 73ed29d9a73..e29ce28a829 100644
--- a/graphics/mplayer/Makefile.common
+++ b/graphics/mplayer/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.11 2002/05/07 22:08:03 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2002/05/14 22:13:35 veego Exp $
 
-MPLAYER_DIST_VERSION=	0.90pre3
+MPLAYER_DIST_VERSION=	0.90pre4
 MPLAYER_PKG_VERSION=	${MPLAYER_DIST_VERSION:S/pre/rc/}
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
diff --git a/graphics/mplayer/PLIST b/graphics/mplayer/PLIST
index 5e7a278eb4a..9b6b3d32356 100644
--- a/graphics/mplayer/PLIST
+++ b/graphics/mplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/05/06 11:13:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/05/14 22:13:35 veego Exp $
 bin/mplayer
 man/man1/mplayer.1
 share/mplayer/DOCS/DVB
@@ -59,12 +59,14 @@ share/mplayer/DOCS/Polish/encoding.html
 share/mplayer/DOCS/Polish/faq.html
 share/mplayer/DOCS/Polish/formats.html
 share/mplayer/DOCS/Polish/gcc-2.96-3.0.html
-share/mplayer/DOCS/Polish/mencoder.1
 share/mplayer/DOCS/Polish/mplayer.1
-share/mplayer/DOCS/Polish/skin-en.html
+share/mplayer/DOCS/Polish/skin-pl.html
 share/mplayer/DOCS/Polish/sound.html
 share/mplayer/DOCS/Polish/users_against_developers.html
 share/mplayer/DOCS/Polish/video.html
+share/mplayer/DOCS/SGML/DO_NOT_USE
+share/mplayer/DOCS/SGML/c
+share/mplayer/DOCS/SGML/docs.sgml
 share/mplayer/DOCS/bugreports.html
 share/mplayer/DOCS/cd-dvd.html
 share/mplayer/DOCS/codecs-in.html
@@ -74,7 +76,6 @@ share/mplayer/DOCS/encoding.html
 share/mplayer/DOCS/faq.html
 share/mplayer/DOCS/formats.html
 share/mplayer/DOCS/gcc-2.96-3.0.html
-share/mplayer/DOCS/mencoder.1
 share/mplayer/DOCS/mplayer.1
 share/mplayer/DOCS/skin-en.html
 share/mplayer/DOCS/sound.html
@@ -94,6 +95,7 @@ share/mplayer/DOCS/tech/osd.txt
 share/mplayer/DOCS/tech/patches.txt
 share/mplayer/DOCS/tech/playtree
 share/mplayer/DOCS/tech/playtree-hun
+share/mplayer/DOCS/tech/subcp.txt
 share/mplayer/DOCS/tech/tech-eng.txt
 share/mplayer/DOCS/tech/vidix.txt
 share/mplayer/DOCS/tech/vop.txt
@@ -101,6 +103,7 @@ share/mplayer/DOCS/users_against_developers.html
 share/mplayer/DOCS/video.html
 share/mplayer/codecs.conf
 @dirrm share/mplayer/DOCS/tech
+@dirrm share/mplayer/DOCS/SGML
 @dirrm share/mplayer/DOCS/Polish
 @dirrm share/mplayer/DOCS/Italian
 @dirrm share/mplayer/DOCS/Hungarian
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index cbf89d4305e..a1ae0789268 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2002/05/09 20:22:38 wiz Exp $
+$NetBSD: distinfo,v 1.12 2002/05/14 22:13:35 veego Exp $
 
-SHA1 (MPlayer-0.90pre3.tar.bz2) = 0ed1d70787488ce55699826752d492aed3425795
-Size (MPlayer-0.90pre3.tar.bz2) = 2322749 bytes
-SHA1 (patch-aa) = f24f92892d3bfa2e4e45efbbb685b209b5e1ac3b
-SHA1 (patch-ab) = a90f1dda80a3208695e5435b63fa4f2b11689a63
+SHA1 (MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
+Size (MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
+SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
diff --git a/graphics/mplayer/patches/patch-aa b/graphics/mplayer/patches/patch-aa
index ef937c0faa9..730d1371d91 100644
--- a/graphics/mplayer/patches/patch-aa
+++ b/graphics/mplayer/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/05/09 20:22:38 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2002/05/14 22:13:35 veego Exp $
 
---- configure.orig	Sat May  4 00:13:06 2002
-+++ configure
-@@ -31,7 +31,7 @@
-   cat "$TMPC" >> "$TMPLOG"
-   echo >> "$TMPLOG"
-   echo "$_cc $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG"
--  > "$TMPO"
-+  rm -f "$TMPO"
-   ( "$_cc" $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
-   TMP="$?"
-   echo >> "$TMPLOG"
-@@ -264,8 +264,8 @@
+--- configure.orig	Mon May 13 22:52:10 2002
++++ configure	Tue May 14 18:57:42 2002
+@@ -269,8 +269,8 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -22,12 +13,3 @@ $NetBSD: patch-aa,v 1.7 2002/05/09 20:22:38 wiz Exp $
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -2642,7 +2642,7 @@
- echocheck "DVD support (libmpdvdkit)"
- if test "$_dvdkit" = auto ; then
-  _dvdkit=no
-- if linux || freebsd ; then
-+ if linux || freebsd || netbsd ; then
-   test -f "./libmpdvdkit/Makefile" && _dvdkit=yes
-  fi
- fi
diff --git a/graphics/mplayer/patches/patch-ab b/graphics/mplayer/patches/patch-ab
deleted file mode 100644
index 3d4cc5b8e46..00000000000
--- a/graphics/mplayer/patches/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/05/07 20:26:13 wiz Exp $
-
---- libdha/mtrr.c.orig	Sun Apr 28 00:42:24 2002
-+++ libdha/mtrr.c
-@@ -13,11 +13,14 @@
- #include "AsmMacros.h"
- 
- #if defined (__i386__) && defined (__NetBSD__)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ > 105240000
- #include <stdint.h>
- #include <stdlib.h>
- #include <machine/mtrr.h>
- #include <machine/sysarch.h>
- #endif
-+#endif
- 
- #if defined( __i386__ )
- int	mtrr_set_type(unsigned base,unsigned size,int type)
-@@ -47,6 +50,7 @@
-     }
-     return ENOSYS;
- #elif defined (__NetBSD__)
-+#if __NetBSD_Version__ > 105240000
-     struct mtrr *mtrrp;
-     int n;
- 
-@@ -64,6 +68,10 @@
-     free(mtrrp);
-     return 0;
- #else
-+    /* NetBSD prior to 1.5Y doesn't have MTRR support */
-+    return ENOSYS;
-+#endif
-+#else
- #warning Please port MTRR stuff!!!
-     return ENOSYS;
- #endif