4 files changed, 65 insertions, 14 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b8adce2f5d50..348612b873ac 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -93,7 +93,8 @@
 # libdvdread). This only affect mplayer if WITH_DVD is used.
 #
 # WITH_LIBDVDNAV
-# default: autodetect
+# Completely disabled at the moment because of incompatibility issues
+# with the new libdvdnav. This will probably be fixed in mplayer-1.0.
 #
 # WITH_LIBUNGIF
 # default: autodetect
@@ -170,7 +171,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.92.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -207,7 +208,8 @@ CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
 		--with-x11incdir=${X11BASE}/include \
 		--enable-png \
 		--disable-libfame \
-		--disable-tv-v4l
+		--disable-tv-v4l \
+		--disable-dvdnav
 
 .if defined(WITH_LANG)
 CONFIGURE_ARGS+=--language=${WITH_LANG}
@@ -249,9 +251,9 @@ WITH_LIBDV=	yes
 WITH_DVD=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
-WITH_LIBDVDNAV=	yes
-.endif
+#.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
+#WITH_LIBDVDNAV=	yes
+#.endif
 
 .if exists(${LOCALBASE}/lib/libungif.so.5)
 WITH_LIBUNGIF=	yes
@@ -369,13 +371,13 @@ LIB_DEPENDS+=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss
 .else
 LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
 .endif
-.if defined(WITH_LIBDVDNAV)
-LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
+#.if defined(WITH_LIBDVDNAV)
+#LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
 
-CONFIGURE_ARGS+=	--enable-dvdnav
-.else
-CONFIGURE_ARGS+=	--disable-dvdnav
-.endif
+#CONFIGURE_ARGS+=	--enable-dvdnav
+#.else
+#CONFIGURE_ARGS+=	--disable-dvdnav
+#.endif
 
 CONFIGURE_ARGS+=	--enable-css \
 			--with-csslibdir=${LOCALBASE}/lib
diff --git a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
index e106acaec16e..39128a408536 100644
--- a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
+++ b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
@@ -1,5 +1,5 @@
 --- libmpdemux/tvi_bsdbt848.c.orig	Mon Jun  2 00:30:37 2003
-+++ libmpdemux/tvi_bsdbt848.c	Tue Dec 16 00:55:43 2003
++++ libmpdemux/tvi_bsdbt848.c	Sun Jan 18 21:26:15 2004
 @@ -39,8 +39,12 @@
  #include <signal.h>
  #include <string.h>
@@ -13,7 +13,22 @@
  #else
  #include <machine/ioctl_meteor.h>
  #include <machine/ioctl_bt848.h>
-@@ -357,6 +361,12 @@
+@@ -287,6 +291,7 @@
+ 
+     case TVI_CONTROL_TUN_SET_NORM:
+         {
++	u_short tmp_fps;
+         int req_mode = (int)*(void **)arg;
+ 
+         priv->iformat = METEOR_FMT_AUTOMODE;
+@@ -352,11 +357,18 @@
+             return(0);
+             }
+ 
+-        if(ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0) 
++	tmp_fps=priv->fps;
++	if(ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
+             {
              perror("fps:ioctl");
              return(0);
              }
@@ -26,3 +41,22 @@
  
          return(TVI_CONTROL_TRUE);
          }
+@@ -453,6 +465,7 @@
+ {
+ int marg;
+ int count;
++u_short tmp_fps;
+ 
+ G_private = priv; /* Oooh, sick */
+ 
+@@ -497,8 +510,9 @@
+     perror("SINPUT:ioctl");
+     }
+ 
++tmp_fps=priv->fps;
+ if(priv->videoready == TRUE &&
+-   ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0) 
++   ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0) 
+     {
+     perror("SFPS:ioctl");
+     }
diff --git a/multimedia/mplayer/files/patch-libvo-vo_md5.c b/multimedia/mplayer/files/patch-libvo-vo_md5.c
new file mode 100644
index 000000000000..fa2a5e5585f7
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libvo-vo_md5.c
@@ -0,0 +1,11 @@
+--- libvo/vo_md5.c.orig	Mon Nov 11 10:20:26 2002
++++ libvo/vo_md5.c	Sun Jan 11 02:30:52 2004
+@@ -56,7 +56,7 @@
+
+     video_out_pgm.flip_page();
+
+-    snprintf (buf2, 100, "md5sum %s", vo_pgm_filename);
++    snprintf (buf2, 100, "md5 %s", vo_pgm_filename);
+     f = popen (buf2, "r");
+     i = fread (buf2, 1, sizeof(buf2), f);
+     pclose (f);
diff --git a/multimedia/mplayer/pkg-message b/multimedia/mplayer/pkg-message
index 29ccbd1264ef..15aba7b53e55 100644
--- a/multimedia/mplayer/pkg-message
+++ b/multimedia/mplayer/pkg-message
@@ -13,3 +13,7 @@ Please take a look at docs in
 If you encounter strange problems, please have a look at
 http://www.rrr.de/~riggs/mplayer/faq_en.html
 before throwing stones at me :-)
+
+CAUTION: Please please please don't use
+-funroll-loops in your CFLAGS when compiling this port.
+It WILL NOT WORK for many CPUs.