ports/60123: mplayer won't compile on -CURRENT

[Vincent]

>Number:         60123
>Category:       ports
>Synopsis:       mplayer won't compile on -CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 10 15:20:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Vincent
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD tchoubou.scientiae.net 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed Dec 10 15:37:15 CET 2003 viny at tchoubou.scientiae.net:/usr/obj/usr/src/sys/TCHOUBOU i386


>Description:
	I just did a portupgrade today after a make buildworld, and mplayer
	compilation died on :

/usr/local/bin/ccache gcc -c -O -pipe -march=athlon-tbird -D_THREAD_SAFE
-D_LARG EFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I../loader
-I/usr/local/include/freetype2 -I/usr/local/include    -o tvi_bsdbt848.o
tvi_bsdbt848.c
In file included from tvi_bsdbt848.c:45:
/usr/include/machine/ioctl_meteor.h:33:2: warning: #warning Include
dev/bktr/ioctl_meteor.h instead of this header.
In file included from tvi_bsdbt848.c:46:
/usr/include/machine/ioctl_bt848.h:33:2: warning: #warning Include
dev/bktr/ioctl_bt848.h instead of this header.
tvi_bsdbt848.c:101: error: field `geom' has incomplete type
tvi_bsdbt848.c:102: error: field `capframe' has incomplete type
tvi_bsdbt848.c:123: error: field `cset' has incomplete type
tvi_bsdbt848.c: In function `control':
tvi_bsdbt848.c:183: error: `TVTUNER_GETFREQ' undeclared (first use in this
function)
tvi_bsdbt848.c:183: error: (Each undeclared identifier is reported only once
tvi_bsdbt848.c:183: error: for each function it appears in.)
tvi_bsdbt848.c:197: error: `TVTUNER_SETFREQ' undeclared (first use in this
function)
[snip]
gmake[1]: *** [tvi_bsdbt848.o] Erreur 1
gmake[1]: Leaving directory
`/usr/ports/multimedia/mplayer/work/MPlayer-0.92/lib mpdemux'
gmake: *** [libmpdemux/libmpdemux.a] Erreur 2
*** Error code 2

	Indeed files /machine/ioctl_meteor.h and machine/ioctl_bt848.h have
been moved to dev/bktr/ioctl_meteor.h and dev/bktr/ioctl_bt848.h two days ago.

>How-To-Repeat:
	On -CURRENT, cd /usr/ports/multimedia/mplayer && make install clean
>Fix:

	Change files/patch-demux-tvi_bsdbt848.c to this :

--- libmpdemux/tvi_bsdbt848.c.orig Wed Dec 10 23:35:18 2003
+++ libmpdemux/tvi_bsdbt848.c      Wed Dec 10 23:35:18 2003
@@ -42,8 +42,8 @@
 #ifdef __NetBSD__
 #include <dev/ic/bt8xx.h>
 #else
-#include <machine/ioctl_meteor.h>
-#include <machine/ioctl_bt848.h>
+#include <dev/bktr/ioctl_meteor.h>
+#include <dev/bktr/ioctl_bt848.h>
 #endif

 #ifdef HAVE_SYS_SOUNDCARD_H
@@ -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: