Merge svn changes up to r30848

1 files changed, 21 insertions, 52 deletions

diff --git a/configure b/configure
index a3821677fd..bb5c2715a7 100755
--- a/configure
+++ b/configure
@@ -353,7 +353,6 @@ Video output:
   --enable-ivtv            enable IVTV TV-Out video output [autodetect]
   --enable-v4l2            enable V4L2 Decoder audio/video output [autodetect]
   --enable-dvb             enable DVB video output [autodetect]
-  --enable-dvbhead         enable DVB video output (HEAD version) [autodetect]
   --enable-mga             enable mga_vid video output [autodetect]
   --enable-xmga            enable mga_vid X11 video output [autodetect]
   --enable-xv              enable Xv video output [autodetect]
@@ -551,7 +550,6 @@ _svga=auto
 _vesa=auto
 _fbdev=auto
 _dvb=auto
-_dvbhead=auto
 _dxr2=auto
 _dxr3=auto
 _ivtv=auto
@@ -921,8 +919,6 @@ for ac_option do
   --disable-fbdev)      _fbdev=no       ;;
   --enable-dvb)         _dvb=yes        ;;
   --disable-dvb)        _dvb=no         ;;
-  --enable-dvbhead)     _dvbhead=yes    ;;
-  --disable-dvbhead)    _dvbhead=no     ;;
   --enable-dxr2)        _dxr2=yes       ;;
   --disable-dxr2)       _dxr2=no        ;;
   --enable-dxr3)        _dxr3=yes       ;;
@@ -3827,6 +3823,17 @@ fi
 echores "$_setenv"
 
 
+echocheck "setmode()"
+_setmode=no
+def_setmode='#define HAVE_SETMODE 0'
+cat > $TMPC << EOF
+#include <io.h>
+int main(void) { setmode(0, 0); return 0; }
+EOF
+cc_check && _setmode=yes && def_setmode='#define HAVE_SETMODE 1'
+echores "$_setmode"
+
+
 if sunos; then
 echocheck "sysi86()"
 cat > $TMPC << EOF
@@ -4707,36 +4714,6 @@ cat >$TMPC << EOF
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
-#include <ost/dmx.h>
-#include <ost/frontend.h>
-#include <ost/sec.h>
-#include <ost/video.h>
-#include <ost/audio.h>
-int main(void) {return 0;}
-EOF
-  for _inc_tmp in "" "-I/usr/src/DVB/ost/include" ; do
-    cc_check $_inc_tmp && _dvb=yes && \
-     extra_cflags="$extra_cflags $_inc_tmp" && break
-  done
-fi
-echores "$_dvb"
-if test "$_dvb" = yes ; then
-  def_dvb='#define CONFIG_DVB 1'
-  def_dvbin='#define CONFIG_DVBIN 1'
-  _aomodules="mpegpes(dvb) $_aomodules"
-  _vomodules="mpegpes(dvb) $_vomodules"
-fi
-
-echocheck "DVB HEAD"
-if test "$_dvbhead" = auto ; then
-  _dvbhead=no
-
-cat >$TMPC << EOF
-#include <poll.h>
-#include <sys/ioctl.h>
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
@@ -4744,35 +4721,27 @@ cat >$TMPC << EOF
 int main(void) {return 0;}
 EOF
   for _inc_tmp in "" "-I/usr/src/DVB/include" ; do
-    cc_check $_inc_tmp && _dvbhead=yes && \
+    cc_check $_inc_tmp && _dvb=yes && \
       extra_cflags="$extra_cflags $_inc_tmp" && break
   done
 fi
-echores "$_dvbhead"
-if test "$_dvbhead" = yes ; then
+echores "$_dvb"
+if test "$_dvb" = yes ; then
+  _dvbin=yes
+  _inputmodules="dvb $_inputmodules"
   def_dvb='#define CONFIG_DVB 1'
-  def_dvb_head='#define CONFIG_DVB_HEAD 1'
   def_dvbin='#define CONFIG_DVBIN 1'
   _aomodules="mpegpes(dvb) $_aomodules"
   _vomodules="mpegpes(dvb) $_vomodules"
-fi
-
-if test "$_dvbhead" = no && test "$_dvb" = no ; then
+else
+  _dvbin=no
+  _noinputmodules="dvb $_noinputmodules"
   def_dvb='#undef CONFIG_DVB'
-  def_dvb_head='#undef CONFIG_DVB_HEAD'
   def_dvbin='#undef CONFIG_DVBIN '
   _aomodules="mpegpes(file) $_aomodules"
   _vomodules="mpegpes(file) $_vomodules"
 fi
 
-if test "$_dvb" = yes || test "$_dvbhead" = yes ; then
-    _dvbin=yes
-    _inputmodules="dvb $_inputmodules"
-else
-    _dvbin=no
-    _noinputmodules="dvb $_noinputmodules"
-fi
-
 
 if darwin; then
 
@@ -5884,7 +5853,7 @@ fi
 echocheck "VCD support"
 if test "$_vcd" = auto; then
   _vcd=no
-  if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos; then
+  if linux || freebsd || netbsd || openbsd || dragonfly || bsdos || darwin || sunos || os2; then
     _vcd=yes
   elif mingw32; then
     cat > $TMPC << EOF
@@ -8241,6 +8210,7 @@ $def_nanosleep
 $def_posix_select
 $def_select
 $def_setenv
+$def_setmode
 $def_shm
 $def_strsep
 $def_swab
@@ -8445,7 +8415,6 @@ $def_directfb
 $def_directfb_version
 $def_directx
 $def_dvb
-$def_dvb_head
 $def_dvbin
 $def_dxr2
 $def_dxr3