Attachment 40314 Details for Bug 63363 – file.diff

[patch] file.diff

file.diff (text/plain), 4.17 KB, created by Thomas E. Zander on 2004-02-25 21:20:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas E. Zander

Created: 2004-02-25 21:20:18 UTC

Size: 4.17 KB

patch

obsolete

>diff -ruN mplayer-old/Makefile mplayer/Makefile
>--- mplayer-old/Makefile	Mon Feb 23 10:30:06 2004
>+++ mplayer/Makefile	Wed Feb 25 21:19:21 2004
>@@ -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 @@
> 		--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_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 @@
> .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 -ruN mplayer-old/files/patch-demux-tvi_bsdbt848.c mplayer/files/patch-demux-tvi_bsdbt848.c
>--- mplayer-old/files/patch-demux-tvi_bsdbt848.c	Fri Dec 19 10:23:20 2003
>+++ mplayer/files/patch-demux-tvi_bsdbt848.c	Mon Jan 19 00:25:39 2004
>@@ -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 -ruN mplayer-old/files/patch-libvo-vo_md5.c mplayer/files/patch-libvo-vo_md5.c
>--- mplayer-old/files/patch-libvo-vo_md5.c	Thu Jan  1 01:00:00 1970
>+++ mplayer/files/patch-libvo-vo_md5.c	Wed Feb 25 21:59:01 2004
>@@ -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 -ruN mplayer-old/pkg-message mplayer/pkg-message
>--- mplayer-old/pkg-message	Tue Feb 17 15:14:06 2004
>+++ mplayer/pkg-message	Wed Feb 25 21:19:12 2004
>@@ -13,3 +13,7 @@
> 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.

Actions: View | Diff

Attachments on bug 63363: 40314