[FFmpeg-devel] [PATCH] configure - simplify grab device selection

[Måns Rullgård]

Ramiro Ribeiro Polla <ramiro at lisha.ufsc.br> writes:

> Ramiro Ribeiro Polla wrote:
>> Hello,
>>
>> Attached patches simplify configure by treating grab devices like
>> normal demuxers. They have a proper check in configure.
>>
>> grab_1.diff removes specific --disable-{v4l,v4l2,bktr} options from
>> configure (--disable-demuxer={video_grab_v4l,v4l2,video_grab_bktr}
>> should be used instead)
>>
>
> New patch attached seems simpler (it uses the dependency
> checker). Only v4l devices for now, but the same could be done for
> bktr, audio_oss...

Mostly OK, but see below.

>> grab_2.diff and grab_3.diff removes the video_grab_ prefix from v4l
>> and bktr and reorders alphabetically. It's ugly IMHO.
>>
>
> Ok to rename?

I don't mind, but then again, I don't use those bits.

> Index: configure
> ===================================================================
> --- configure	(revision 10292)
> +++ configure	(working copy)
> @@ -122,8 +122,6 @@
>    echo "  --disable-altivec        disable AltiVec usage"
>    echo "  --disable-audio-oss      disable OSS audio support [default=no]"
>    echo "  --disable-audio-beos     disable BeOS audio support [default=no]"
> -  echo "  --disable-v4l            disable video4linux grabbing [default=no]"
> -  echo "  --disable-v4l2           disable video4linux2 grabbing [default=no]"
>    echo "  --disable-bktr           disable bktr video grabbing [default=no]"
>    echo "  --disable-network        disable network support [default=no]"
>    echo "  --disable-ipv6           disable ipv6 support [default=no]"
> @@ -624,8 +622,6 @@
>      small
>      swscaler
>      vhook
> -    v4l
> -    v4l2
>      x11grab
>      zlib
>  "
> @@ -693,6 +689,8 @@
>      getrusage
>      imlib2
>      inet_aton
> +    linux_videodev_h
> +    linux_videodev2_h

This is only needed if the config.h/mak definitions are required.
AFAICT this is not the case, or they would have already been there.

>      lrintf
>      machine_ioctl_bt848_h
>      machine_ioctl_meteor_h
> @@ -790,9 +788,9 @@
>  rtp_muxer_deps="network mpegts_demuxer"
>  rtsp_demuxer_deps="rtp_protocol rtp_muxer"
>  sdp_demuxer_deps="rtsp_demuxer"
> -v4l2_demuxer_deps="v4l2"
> +v4l2_demuxer_deps="linux_videodev2_h"
>  video_grab_bktr_demuxer_deps="bktr"
> -video_grab_v4l_demuxer_deps="v4l"
> +video_grab_v4l_demuxer_deps="linux_videodev_h"
>  x11_grab_device_demuxer_deps="x11grab"
>  
>  # protocols
> @@ -852,8 +850,6 @@
>  # non-library system interfaces
>  audio_oss="yes"
>  bktr="yes"
> -v4l2="yes"
> -v4l="yes"
>  
>  # libraries
>  zlib="yes"
> @@ -1698,8 +1694,8 @@
>  }
>  EOF
>  
> -enabled v4l  && check_header linux/videodev.h  || disable v4l
> -enabled v4l2 && check_header linux/videodev2.h || disable v4l2
> +check_header linux/videodev.h
> +check_header linux/videodev2.h
>  
>  # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
>  if enabled bktr; then

-- 
M?ns Rullg?rd
mans at mansr.com