ports/87853: [fix] multimedia/mplayer: no bsdbt848 driver compiled in

[Simun Mikecin]

>Number:         87853
>Category:       ports
>Synopsis:       [fix] multimedia/mplayer: no bsdbt848 driver compiled in
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 22 21:30:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Simun Mikecin
>Release:        FreeBSD 6.0-RC1 amd64
>Organization:
>Environment:
System: FreeBSD data.home.hr 6.0-RC1 FreeBSD 6.0-RC1 #0: Thu Oct 20 19:50:48 CEST 2005 root at data.home.hr:/var/obj/usr/src/sys/DATA amd64


	
>Description:
On recent FreeBSD installing multimedia/mplayer port doesn't compile-in
bsdbt848 driver. Cause for this is in the mplayer's 'configure' script that
uses the following code to autodetect the presense of the system bt848 driver:

if defined(__NetBSD__)
#include <dev/ic/bt8xx.h>
#else
#include <machine/ioctl_bt848.h>
#endif

On FreeBSD /usr/include/machine/ioctl_bt848.h is replaced with
/usr/include/dev/bktr/ioctl_bt848.h, so 'configure' script doesn't find it.
Be warned that if you upgraded your FreeBSD installation from the older
version, you will still have /usr/include/machine/ioctl_bt848.h installed on
your system (make installworld doesn't delete old files) and configure
script will not need patching to be able to find the system bt848 driver.
In the fix section I attached a patched 'files/patch-ad' file.
>How-To-Repeat:
On the clean newer FreeBSD installation do:
	cd /usr/ports/multimedia/mplayer && make install clean
	mplayer tv:// -tv driver=bsdbt848

>Fix:
diff -urN mplayer.orig/files/patch-ad mplayer/files/patch-ad
--- mplayer.orig/files/patch-ad	Wed Oct  5 14:14:14 2005
+++ mplayer/files/patch-ad	Sat Oct 22 23:07:43 2005
@@ -1,5 +1,5 @@
 --- configure.orig	Wed Apr 13 13:46:35 2005
-+++ configure	Tue Sep 27 21:31:54 2005
++++ configure	Sat Oct 22 23:07:27 2005
 @@ -29,9 +29,9 @@
    echo >> "$TMPLOG"
    cat "$TMPC" >> "$TMPLOG"
@@ -12,6 +12,15 @@
    TMP="$?"
    echo >> "$TMPLOG"
    echo "ldd $TMPO" >> "$TMPLOG"
+@@ -346,7 +346,7 @@
+   --with-livelibdir=DIR    LIVE.COM Streaming Media libraries in DIR
+   --with-toolamedir=DIR    path to Toolame library and include file
+   --with-xmmsplugindir=DIR XMMS plugins in DIR
+-  --with-xmmslibdir=DIR    libxmms.so.1 in DIR
++  --with-xmmslibdir=DIR    libxmms.so in DIR
+   --with-bio2jack=DIR      libbio2jack.a in DIR
+   --with-cdparanoiaincdir=DIR  cdparanoia headers in DIR (*)
+   --with-cdparanoialibdir=DIR  cdparanoia libraries (libcdda_*) in DIR (*)
 @@ -369,7 +369,7 @@
  
  
@@ -161,6 +170,24 @@
  #error We do not support old versions of x264. Get the latest from SVN.
  #endif
  int main(void) { x264_encoder_open((void*)0); return 0; }
+@@ -6118,7 +6057,7 @@
+ #if defined(__NetBSD__)
+ #include <dev/ic/bt8xx.h>
+ #else
+-#include <machine/ioctl_bt848.h>
++#include <dev/bktr/ioctl_bt848.h>
+ #endif
+ int main(void) { return 0; }
+ EOF
+@@ -6323,7 +6262,7 @@
+   if darwin ; then
+      _xmms_lib="${_xmmslibdir}/libxmms.dylib"
+   else
+-     _xmms_lib="${_xmmslibdir}/libxmms.so.1 -export-dynamic"
++     _xmms_lib="${_xmmslibdir}/libxmms.so -export-dynamic"
+   fi
+ else
+   _def_xmms='#undef HAVE_XMMS'
 @@ -6477,7 +6416,7 @@
    fi
    _stripbinaries=no
@@ -205,3 +232,25 @@
  fi
  if test "$_lirc" = yes ; then
    _def_lirc='#define HAVE_LIRC 1'
+@@ -7282,8 +7222,8 @@
+ #define	DEFAULT_CDROM_DEVICE	"/vol/dev/aliases/cdrom0"
+ #define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+ #elif defined(HPUX)
+-#define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
+-#define DEFAULT_DVD_DEVICE     "/dev/dvd"
++#define DEFAULT_CDROM_DEVICE    "/dev/acd0"
++#define DEFAULT_DVD_DEVICE     "/dev/acd0"
+ #elif defined(WIN32)
+ #define DEFAULT_CDROM_DEVICE    "D:"
+ #define DEFAULT_DVD_DEVICE	"D:"
+@@ -7294,8 +7234,8 @@
+ #define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
+ #define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+ #else
+-#define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
+-#define DEFAULT_DVD_DEVICE	"/dev/dvd"
++#define DEFAULT_CDROM_DEVICE    "/dev/acd0"
++#define DEFAULT_DVD_DEVICE	"/dev/acd0"
+ #endif
+ 
+ 
>Release-Note:
>Audit-Trail:
>Unformatted: