summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-02 19:57:17 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-02 19:57:17 +0000
commitc106fe7751426c8c30706d2f131491dc8f37ee85 (patch)
tree901dde9aab3fd732c6f78519ba23478a6a7d0aed /configure
parentd83eddc2a81dd9657d0957dc195bab7376a5db64 (diff)
downloadmpv-c106fe7751426c8c30706d2f131491dc8f37ee85.tar.bz2
mpv-c106fe7751426c8c30706d2f131491dc8f37ee85.tar.xz
Drop support for old-style DVB code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure59
1 files changed, 8 insertions, 51 deletions
diff --git a/configure b/configure
index 931b187c9f..17aa2e9f6f 100755
--- a/configure
+++ b/configure
@@ -384,7 +384,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]
@@ -605,7 +604,6 @@ _svga=auto
_vesa=auto
_fbdev=auto
_dvb=auto
-_dvbhead=auto
_dxr2=auto
_dxr3=auto
_ivtv=auto
@@ -982,8 +980,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 ;;
@@ -4965,36 +4961,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>
@@ -5002,35 +4968,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
@@ -9129,7 +9087,6 @@ $def_directfb
$def_directfb_version
$def_directx
$def_dvb
-$def_dvb_head
$def_dvbin
$def_dxr2
$def_dxr3