diff options
author | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-08-29 10:27:25 +0000 |
---|---|---|
committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-08-29 10:27:25 +0000 |
commit | a43b788411c644aefacc5f8d076bb5924bd14f8f (patch) | |
tree | 9a1868a751f9c15b5e904cc52270ceaf3e6b2e9d /multimedia/mplayer | |
parent | Correct package list typo (diff) |
Enables the audioid suboption for mplayer -tv.
PR: ports/56125
Patched by: Nikolay Nikolaev <nicknickolaev@yahoo.com>
Submitted by: Thomas E. Zander <riggs@rrr.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=87968
Diffstat (limited to 'multimedia/mplayer')
-rw-r--r-- | multimedia/mplayer/Makefile | 2 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-cfg-common.h | 12 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-demux-tv.c | 13 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-demux-tv.h | 13 | ||||
-rw-r--r-- | multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c | 15 |
5 files changed, 54 insertions, 1 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index d0f225401d05..1462cb3ab255 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 --git a/multimedia/mplayer/files/patch-cfg-common.h b/multimedia/mplayer/files/patch-cfg-common.h new file mode 100644 index 000000000000..8de2c7301a3d --- /dev/null +++ b/multimedia/mplayer/files/patch-cfg-common.h @@ -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 --git a/multimedia/mplayer/files/patch-demux-tv.c b/multimedia/mplayer/files/patch-demux-tv.c new file mode 100644 index 000000000000..4a43b3588e18 --- /dev/null +++ b/multimedia/mplayer/files/patch-demux-tv.c @@ -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 --git a/multimedia/mplayer/files/patch-demux-tv.h b/multimedia/mplayer/files/patch-demux-tv.h new file mode 100644 index 000000000000..97c2ed388e6d --- /dev/null +++ b/multimedia/mplayer/files/patch-demux-tv.h @@ -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 --git a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c new file mode 100644 index 000000000000..900a5c11bb99 --- /dev/null +++ b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c @@ -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); + } |