ports/56125: Maintainer-update of multimedia/mplayer
Thomas E. Zander
riggs at rrr.de
Fri Aug 29 10:00:31 UTC 2003
>Number: 56125
>Category: ports
>Synopsis: Maintainer-update of multimedia/mplayer
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 29 03:00:28 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Thomas E. Zander
>Release: FreeBSD 5.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD o503.hadiko.de 5.1-RELEASE-p2 FreeBSD 5.1-RELEASE-p2 #0: Tue Aug 12 20:09:39 CEST 2003 root at o503.hadiko.de:/usr/obj/usr/src/sys/MARVIN i386
>Description:
This patch submitted by Nikolay Nikolaev <nicknickolaev at yahoo.com>
enables the audioid suboption for mplayer -tv.
It introduces 4 new patches to the files/ dir:
o patch-cfg-common.h
o patch-demux-tvi_bsdbt848.c
o patch-demux-tv.h
o patch-demux-tv.c
>How-To-Repeat:
>Fix:
Please apply this patch to multimedia/mplayer:
diff -ruN mplayer-old/Makefile mplayer/Makefile
--- mplayer-old/Makefile Sun Aug 17 20:29:11 2003
+++ mplayer/Makefile Fri Aug 29 11:16:48 2003
@@ -162,7 +162,7 @@
PORTNAME= mplayer
PORTVERSION= 0.90.0.110
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia audio ipv6
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
diff -ruN mplayer-old/files/patch-cfg-common.h mplayer/files/patch-cfg-common.h
--- mplayer-old/files/patch-cfg-common.h Thu Jan 1 01:00:00 1970
+++ mplayer/files/patch-cfg-common.h Fri Aug 29 11:16:08 2003
@@ -0,0 +1,12 @@
+--- cfg-common.h.orig Sat Feb 8 21:52:25 2003
++++ cfg-common.h Fri Aug 29 11:08:51 2003
+@@ -279,8 +279,8 @@
+ {"alsa", &tv_param_alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ #endif
+ {"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
++#endif
+ {"audioid", &tv_param_audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
+-#endif
+ {NULL, NULL, 0, 0, 0, 0, NULL}
+ };
+ #endif
diff -ruN mplayer-old/files/patch-demux-tv.c mplayer/files/patch-demux-tv.c
--- mplayer-old/files/patch-demux-tv.c Thu Jan 1 01:00:00 1970
+++ mplayer/files/patch-demux-tv.c Fri Aug 29 11:16:08 2003
@@ -0,0 +1,13 @@
+--- libmpdemux/tv.c.orig Mon Mar 10 17:00:39 2003
++++ libmpdemux/tv.c Fri Aug 29 11:08:51 2003
+@@ -53,9 +53,9 @@
+ char *tv_param_outfmt = "yv12";
+ float tv_param_fps = -1.0;
+ char **tv_param_channels = NULL;
++int tv_param_audio_id = 0;
+ #ifdef HAVE_TV_V4L
+ int tv_param_amode = -1;
+-int tv_param_audio_id = 0;
+ int tv_param_volume = 60000;
+ int tv_param_bass = -1;
+ int tv_param_treble = -1;
diff -ruN mplayer-old/files/patch-demux-tv.h mplayer/files/patch-demux-tv.h
--- mplayer-old/files/patch-demux-tv.h Thu Jan 1 01:00:00 1970
+++ mplayer/files/patch-demux-tv.h Fri Aug 29 11:16:08 2003
@@ -0,0 +1,13 @@
+--- libmpdemux/tv.h.orig Sat Dec 28 23:57:39 2002
++++ libmpdemux/tv.h Fri Aug 29 11:08:51 2003
+@@ -24,9 +24,9 @@
+ extern int tv_param_noaudio;
+ extern int tv_param_immediate;
+ extern int tv_param_audiorate;
++extern int tv_param_audio_id;
+ #ifdef HAVE_TV_V4L
+ extern int tv_param_amode;
+-extern int tv_param_audio_id;
+ extern int tv_param_volume;
+ extern int tv_param_bass;
+ extern int tv_param_treble;
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 Thu Jan 1 01:00:00 1970
+++ mplayer/files/patch-demux-tvi_bsdbt848.c Fri Aug 29 11:16:08 2003
@@ -0,0 +1,15 @@
+--- libmpdemux/tvi_bsdbt848.c.orig Tue Jan 14 19:20:17 2003
++++ libmpdemux/tvi_bsdbt848.c Fri Aug 29 11:08:51 2003
+@@ -357,6 +357,12 @@
+ perror("fps:ioctl");
+ return(0);
+ }
++ //set audioid after norm has been set
++ if(priv->tunerready == TRUE &&
++ ioctl(priv->tunerfd,BT848_SAUDIO, &tv_param_audio_id)<0)
++ {
++ perror("Unable to set audioid");
++ }
+
+ return(TVI_CONTROL_TRUE);
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list