From 2aef9e2ef3a3c69466a3f0a737145f1f72c786f0 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 2 Aug 2012 23:51:54 +0200
Subject: stream: remove V4L TV input and V4L radio support

There are V4L2 drivers, and the old V4L stuff seems plain unnecessary.
---
 configure | 55 ++++---------------------------------------------------
 1 file changed, 4 insertions(+), 51 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 74a3c9ec5e..3a5661fbf7 100755
--- a/configure
+++ b/configure
@@ -304,7 +304,6 @@ Optional features:
   --disable-radio-v4l2   disable Video4Linux2 radio interface [autodetect]
   --disable-radio-bsdbt848   disable BSD BT848 radio interface [autodetect]
   --disable-tv           disable TV interface (TV/DVB grabbers) [enable]
-  --disable-tv-v4l1      disable Video4Linux TV interface [autodetect]
   --disable-tv-v4l2      disable Video4Linux2 TV interface [autodetect]
   --disable-tv-bsdbt848  disable BSD BT848 interface [autodetect]
   --disable-pvr          disable Video4Linux2 MPEG PVR [autodetect]
@@ -508,11 +507,9 @@ _win32dll=no
 _select=yes
 _radio=no
 _radio_capture=no
-_radio_v4l=auto
 _radio_v4l2=auto
 _radio_bsdbt848=auto
 _tv=yes
-_tv_v4l1=auto
 _tv_v4l2=auto
 _tv_bsdbt848=auto
 _tv_dshow=auto
@@ -772,8 +769,6 @@ for ac_option do
   --disable-tv)         _tv=no          ;;
   --enable-tv-bsdbt848)  _tv_bsdbt848=yes ;;
   --disable-tv-bsdbt848) _tv_bsdbt848=no  ;;
-  --enable-tv-v4l1)     _tv_v4l1=yes    ;;
-  --disable-tv-v4l1)    _tv_v4l1=no     ;;
   --enable-tv-v4l2)     _tv_v4l2=yes    ;;
   --disable-tv-v4l2)    _tv_v4l2=no     ;;
   --enable-tv-dshow)    _tv_dshow=yes   ;;
@@ -782,8 +777,6 @@ for ac_option do
   --enable-radio-capture)       _radio_capture=yes      ;;
   --disable-radio-capture)      _radio_capture=no       ;;
   --disable-radio)      _radio=no       ;;
-  --enable-radio-v4l)   _radio_v4l=yes  ;;
-  --disable-radio-v4l)  _radio_v4l=no   ;;
   --enable-radio-v4l2)  _radio_v4l2=yes ;;
   --disable-radio-v4l2) _radio_v4l2=no  ;;
   --enable-radio-bsdbt848)      _radio_bsdbt848=yes     ;;
@@ -1754,9 +1747,9 @@ if test "$_pthreads" = yes ; then
   def_threads='#define HAVE_THREADS 1'
   extra_cflags="$extra_cflags $THREAD_CFLAGS"
 else
-  res_comment="v4l, v4l2, ao_nas, win32 loader disabled"
+  res_comment="v4l2, ao_nas, win32 loader disabled"
   def_pthreads='#undef HAVE_PTHREADS'
-  _nas=no ; _tv_v4l1=no ; _tv_v4l2=no
+  _nas=no ; _tv_v4l2=no
   mingw32 || _win32dll=no
 fi
 echores "$_pthreads"
@@ -3725,26 +3718,6 @@ fi
 echores "$_tv_dshow"
 
 
-echocheck "Video 4 Linux TV interface"
-if test "$_tv_v4l1" = auto ; then
-  _tv_v4l1=no
-  if test "$_tv" = yes && linux ; then
-    header_check_broken sys/time.h linux/videodev.h && _tv_v4l1=yes
-  fi
-fi
-if test "$_tv_v4l1" = yes ; then
-  _audio_input=yes
-  _tv_v4l=yes
-  def_tv_v4l='#define CONFIG_TV_V4L 1'
-  def_tv_v4l1='#define CONFIG_TV_V4L1 1'
-  inputmodules="tv-v4l $inputmodules"
-else
-  noinputmodules="tv-v4l1 $noinputmodules"
-  def_tv_v4l='#undef CONFIG_TV_V4L'
-fi
-echores "$_tv_v4l1"
-
-
 echocheck "Video 4 Linux 2 TV interface"
 if test "$_tv_v4l2" = auto ; then
   _tv_v4l2=no
@@ -3756,8 +3729,6 @@ if test "$_tv_v4l2" = auto ; then
 fi
 if test "$_tv_v4l2" = yes ; then
   _audio_input=yes
-  _tv_v4l=yes
-  def_tv_v4l='#define CONFIG_TV_V4L 1'
   def_tv_v4l2='#define CONFIG_TV_V4L2 1'
   inputmodules="tv-v4l2 $inputmodules"
 else
@@ -3804,19 +3775,6 @@ else
 fi
 echores "$_radio_v4l2"
 
-echocheck "Video 4 Linux Radio interface"
-if test "$_radio_v4l" = auto ; then
-  _radio_v4l=no
-  if test "$_radio" = yes && linux ; then
-    header_check linux/videodev.h && _radio_v4l=yes
-  fi
-fi
-if test "$_radio_v4l" = yes ; then
-  def_radio_v4l='#define CONFIG_RADIO_V4L 1'
-else
-  def_radio_v4l='#undef CONFIG_RADIO_V4L'
-fi
-echores "$_radio_v4l"
 
 if freebsd || netbsd || openbsd || dragonfly &&
   test "$_radio" = yes && test "$_radio_bsdbt848" = auto ; then
@@ -3840,9 +3798,9 @@ else
   def_radio_bsdbt848='#undef CONFIG_RADIO_BSDBT848'
 fi
 
-if test "$_radio_v4l" = no && test "$_radio_v4l2" = no &&
+if test "$_radio_v4l2" = no &&
    test "$_radio_bsdbt848" = no && test "$_radio" = yes ; then
-    die "Radio driver requires BSD BT848,  V4L or V4L2!"
+    die "Radio driver requires BSD BT848 or V4L2!"
 fi
 
 echocheck "Video 4 Linux 2 MPEG PVR interface"
@@ -4183,8 +4141,6 @@ TGA = $_tga
 TV = $_tv
 TV_BSDBT848 = $_tv_bsdbt848
 TV_DSHOW = $_tv_dshow
-TV_V4L  = $_tv_v4l
-TV_V4L1 = $_tv_v4l1
 TV_V4L2 = $_tv_v4l2
 V4L2 = $_v4l2
 VCD = $_vcd
@@ -4417,13 +4373,10 @@ $def_pvr
 $def_radio
 $def_radio_bsdbt848
 $def_radio_capture
-$def_radio_v4l
 $def_radio_v4l2
 $def_tv
 $def_tv_bsdbt848
 $def_tv_dshow
-$def_tv_v4l
-$def_tv_v4l1
 $def_tv_v4l2
 
 
-- 
cgit v1.2.3