Attachment #40314 for bug #63363

View | Details | Raw Unified | Return to bug 63363
Collapse All | Expand All




# libdvdread). This only affect mplayer if WITH_DVD is used.
#
# WITH_LIBDVDNAV
# 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


PORTNAME=	mplayer
PORTVERSION=	0.92.0
PORTREVISION=	6
CATEGORIES=	multimedia audio ipv6
MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
		http://www2.mplayerhq.hu/MPlayer/releases/ \

		--with-x11incdir=${X11BASE}/include \
		--enable-png \
		--disable-libfame \
		--disable-tv-v4l \
		--disable-dvdnav

.if defined(WITH_LANG)
CONFIGURE_ARGS+=--language=${WITH_LANG}

WITH_DVD=	yes
.endif

#.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
#WITH_LIBDVDNAV=	yes
#.endif

.if exists(${LOCALBASE}/lib/libungif.so.5)
WITH_LIBUNGIF=	yes

.else
LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
.endif
#.if defined(WITH_LIBDVDNAV)
#LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav

#CONFIGURE_ARGS+=	--enable-dvdnav
#.else
#CONFIGURE_ARGS+=	--disable-dvdnav
#.endif

CONFIGURE_ARGS+=	--enable-css \
			--with-csslibdir=${LOCALBASE}/lib




--- libmpdemux/tvi_bsdbt848.c.orig	Mon Jun  2 00:30:37 2003
+++ libmpdemux/tvi_bsdbt848.c	Sun Jan 18 21:26:15 2004
@@ -39,8 +39,12 @@
 #include <signal.h>
 #include <string.h>

 #else
 #include <machine/ioctl_meteor.h>
 #include <machine/ioctl_bt848.h>
@@ -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);
             }

 
         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");
     }

Line 0 Link Here

(-)mplayer/files/patch-libvo-vo_md5.c (+11 lines)
	1	--- libvo/vo_md5.c.orig Mon Nov 11 10:20:26 2002
	2	+++ libvo/vo_md5.c Sun Jan 11 02:30:52 2004
	3	@@ -56,7 +56,7 @@
	4
	5	video_out_pgm.flip_page();
	6
	7	- snprintf (buf2, 100, "md5sum %s", vo_pgm_filename);
	8	+ snprintf (buf2, 100, "md5 %s", vo_pgm_filename);
	9	f = popen (buf2, "r");
	10	i = fread (buf2, 1, sizeof(buf2), f);
	11	pclose (f);

Lines 13-15 Link Here

(-)mplayer/pkg-message (+4 lines)
13	If you encounter strange problems, please have a look at	13	If you encounter strange problems, please have a look at
14	http://www.rrr.de/~riggs/mplayer/faq_en.html	14	http://www.rrr.de/~riggs/mplayer/faq_en.html
15	before throwing stones at me :-)	15	before throwing stones at me :-)
		16
		17	CAUTION: Please please please don't use
		18	-funroll-loops in your CFLAGS when compiling this port.
		19	It WILL NOT WORK for many CPUs.

Return to bug 63363

Lines 93-99 Link Here

(-)mplayer/Makefile (-12 / +14 lines)
93	# libdvdread). This only affect mplayer if WITH_DVD is used.	93	# libdvdread). This only affect mplayer if WITH_DVD is used.
94	#	94	#
95	# WITH_LIBDVDNAV	95	# WITH_LIBDVDNAV
96	# default: autodetect	96	# Completely disabled at the moment because of incompatibility issues
		97	# with the new libdvdnav. This will probably be fixed in mplayer-1.0.
97	#	98	#
98	# WITH_LIBUNGIF	99	# WITH_LIBUNGIF
99	# default: autodetect	100	# default: autodetect
Lines 170-176 Link Here
170		171
171	PORTNAME= mplayer	172	PORTNAME= mplayer
172	PORTVERSION= 0.92.0	173	PORTVERSION= 0.92.0
173	PORTREVISION= 5	174	PORTREVISION= 6
174	CATEGORIES= multimedia audio ipv6	175	CATEGORIES= multimedia audio ipv6
175	MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \	176	MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
176	http://www2.mplayerhq.hu/MPlayer/releases/ \	177	http://www2.mplayerhq.hu/MPlayer/releases/ \
Lines 207-213 Link Here
207	--with-x11incdir=${X11BASE}/include \	208	--with-x11incdir=${X11BASE}/include \
208	--enable-png \	209	--enable-png \
209	--disable-libfame \	210	--disable-libfame \
210	--disable-tv-v4l	211	--disable-tv-v4l \
		212	--disable-dvdnav
211		213
212	.if defined(WITH_LANG)	214	.if defined(WITH_LANG)
213	CONFIGURE_ARGS+=--language=${WITH_LANG}	215	CONFIGURE_ARGS+=--language=${WITH_LANG}
Lines 249-257 Link Here
249	WITH_DVD= yes	251	WITH_DVD= yes
250	.endif	252	.endif
251		253
252	.if exists(${LOCALBASE}/lib/libdvdnav.so.3)	254	#.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
253	WITH_LIBDVDNAV= yes	255	#WITH_LIBDVDNAV= yes
254	.endif	256	#.endif
255		257
256	.if exists(${LOCALBASE}/lib/libungif.so.5)	258	.if exists(${LOCALBASE}/lib/libungif.so.5)
257	WITH_LIBUNGIF= yes	259	WITH_LIBUNGIF= yes
Lines 369-381 Link Here
369	.else	371	.else
370	LIB_DEPENDS+= dvdread.3:${PORTSDIR}/multimedia/libdvdread	372	LIB_DEPENDS+= dvdread.3:${PORTSDIR}/multimedia/libdvdread
371	.endif	373	.endif
372	.if defined(WITH_LIBDVDNAV)	374	#.if defined(WITH_LIBDVDNAV)
373	LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav	375	#LIB_DEPENDS+= dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
374		376
375	CONFIGURE_ARGS+= --enable-dvdnav	377	#CONFIGURE_ARGS+= --enable-dvdnav
376	.else	378	#.else
377	CONFIGURE_ARGS+= --disable-dvdnav	379	#CONFIGURE_ARGS+= --disable-dvdnav
378	.endif	380	#.endif
379		381
380	CONFIGURE_ARGS+= --enable-css \	382	CONFIGURE_ARGS+= --enable-css \
381	--with-csslibdir=${LOCALBASE}/lib	383	--with-csslibdir=${LOCALBASE}/lib

Lines 1-5 Link Here

(-)mplayer/files/patch-demux-tvi_bsdbt848.c (-2 / +36 lines)
1	--- libmpdemux/tvi_bsdbt848.c.orig Mon Jun 2 00:30:37 2003	1	--- libmpdemux/tvi_bsdbt848.c.orig Mon Jun 2 00:30:37 2003
2	+++ libmpdemux/tvi_bsdbt848.c Tue Dec 16 00:55:43 2003	2	+++ libmpdemux/tvi_bsdbt848.c Sun Jan 18 21:26:15 2004
3	@@ -39,8 +39,12 @@	3	@@ -39,8 +39,12 @@
4	#include <signal.h>	4	#include <signal.h>
5	#include <string.h>	5	#include <string.h>
Lines 13-19 Link Here
13	#else	13	#else
14	#include <machine/ioctl_meteor.h>	14	#include <machine/ioctl_meteor.h>
15	#include <machine/ioctl_bt848.h>	15	#include <machine/ioctl_bt848.h>
16	@@ -357,6 +361,12 @@	16	@@ -287,6 +291,7 @@
		17
		18	case TVI_CONTROL_TUN_SET_NORM:
		19	{
		20	+ u_short tmp_fps;
		21	int req_mode = (int)(void *)arg;
		22
		23	priv->iformat = METEOR_FMT_AUTOMODE;
		24	@@ -352,11 +357,18 @@
		25	return(0);
		26	}
		27
		28	- if(ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0)
		29	+ tmp_fps=priv->fps;
		30	+ if(ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
		31	{
17	perror("fps:ioctl");	32	perror("fps:ioctl");
18	return(0);	33	return(0);
19	}	34	}
Lines 26-28 Link Here
26		41
27	return(TVI_CONTROL_TRUE);	42	return(TVI_CONTROL_TRUE);
28	}	43	}
		44	@@ -453,6 +465,7 @@
		45	{
		46	int marg;
		47	int count;
		48	+u_short tmp_fps;
		49
		50	G_private = priv; /* Oooh, sick */
		51
		52	@@ -497,8 +510,9 @@
		53	perror("SINPUT:ioctl");
		54	}
		55
		56	+tmp_fps=priv->fps;
		57	if(priv->videoready == TRUE &&
		58	- ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0)
		59	+ ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
		60	{
		61	perror("SFPS:ioctl");
		62	}