[Mplayer-cvslog] CVS: main configure,1.447,1.448 mangle.h,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv19906

Modified Files:
	configure mangle.h 
Log Message:
OpenBSD, NetBSD portability patches by
Björn Sandell <biorn at dce.chalmers.se>
Marcus <core at antbear.org>
Bernd Ernesti <mplayer at lists.veego.de>


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- configure	27 Apr 2002 12:25:48 -0000	1.447
+++ configure	27 Apr 2002 22:42:23 -0000	1.448
@@ -264,6 +264,7 @@
     ;;
   --with-extralibdir=*)
     _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+#    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
     ;;
   --enable-runtime-cpudetection)
     _runtime_cpudetection=yes
@@ -1527,11 +1528,28 @@
 cc_check && _sys_soundcard=yes
 if test "$_sys_soundcard" = yes ; then
   _def_sys_soundcard='#define HAVE_SYS_SOUNDCARD_H 1'
+  _inc_soundcard='#include <sys/soundcard.h>'
 else
   _def_sys_soundcard='#undef HAVE_SYS_SOUNDCARD_H'
 fi
 echores "$_sys_soundcard"
 
+if test "$_sys_soundcard" != yes ; then
+echocheck "soundcard.h"
+cat > $TMPC << EOF
+#include <soundcard.h>
+int main(void) { return 0; }
+EOF
+_soundcard=no
+cc_check && _soundcard=yes
+if test "$_soundcard" = yes ; then
+  _def_soundcard='#define HAVE_SOUNDCARD_H 1'
+  _inc_soundcard='#include <soundcard.h>'
+else
+  _def_soundcard='#undef HAVE_SOUNDCARD_H'
+fi
+echores "$_soundcard"
+fi
 
 echocheck "sys/dvdio.h"
 cat > $TMPC << EOF
@@ -2434,7 +2452,7 @@
 echocheck "OSS Audio"
 if test "$_ossaudio" = auto ; then
   cat > $TMPC << EOF
-#include <sys/soundcard.h>
+$_inc_soundcard
 int main(void) { int arg = SNDCTL_DSP_SETFRAGMENT; return 0; }
 EOF
   _ossaudio=no
@@ -2448,7 +2466,11 @@
     _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
     _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"'
   else
-    _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+     if netbsd || openbsd ; then
+       _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
+     else
+       _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+     fi
     _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/mixer"'
   fi  
 else
@@ -2575,7 +2597,7 @@
 
 
 echocheck "VCD support"
-if linux || bsdos || freebsd || sunos ; then
+if linux || bsdos || freebsd || netbsd || sunos ; then
   _inputmodules="vcd $_inputmodules"
   _def_vcd='#define HAVE_VCD 1'
   echores "ok"
@@ -3254,7 +3276,11 @@
  if test "$_tv" = yes ; then
     cat > $TMPC <<EOF
 #include <sys/types.h>
+#ifdef __NetBSD__
+#include <dev/ic/bt8xx.h>
+#else
 #include <machine/ioctl_bt848.h>
+#endif
 int main(void) { return 0; }
 EOF
     cc_check && _tv_bsdbt848=yes
@@ -3482,6 +3508,7 @@
 
 _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
 bsdos && _ld_arch="$_ld_arch -ldvd"
+netbsd && _ld_arch="$_ld_arch -li386 -lossaudio"
 
 _def_debug='#undef MP_DEBUG'
 test "$_debug" && _def_debug='#define MP_DEBUG 1'
@@ -3755,6 +3782,10 @@
 
 /* Define this if your system has the header file for the OSS sound interface */
 $_def_sys_soundcard
+
+/* Define this if you system has the header file for the OSS sound interface
+ * in /usr/include */
+$_def_soundcard
 
 /* Define this if your system uses ftello() for off_t seeking */
 

Index: mangle.h
===================================================================
RCS file: /cvsroot/mplayer/main/mangle.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mangle.h	23 Mar 2002 18:40:54 -0000	1.2
+++ mangle.h	27 Apr 2002 22:42:23 -0000	1.3
@@ -8,7 +8,7 @@
 #define __MANGLE_H
 
 /* Feel free to add more to the list, eg. a.out IMO */
-#if defined(__CYGWIN__) || defined(__OS2__)
+#if defined(__CYGWIN__) || defined(__OS2__) || defined (__OpenBSD__)
 #define MANGLE(a) "_" #a
 #else
 #define MANGLE(a) #a