Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:18:52 +0000 (16:18 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 19:19:50 +0000 (16:19 -0300)
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h

Merged-by: James Almer <jamrial@gmail.com>
1  2 
configure
libavdevice/oss.c
libavdevice/oss_dec.c
libavdevice/oss_enc.c

diff --cc configure
+++ b/configure
@@@ -1931,10 -1574,7 +1931,9 @@@ HEADERS_LIST=
      machine_ioctl_bt848_h
      machine_ioctl_meteor_h
      malloc_h
 +    opencv2_core_core_c_h
 +    OpenGL_gl3_h
      poll_h
-     soundcard_h
      stdatomic_h
      sys_param_h
      sys_resource_h
@@@ -3067,41 -2454,19 +3066,41 @@@ xwma_demuxer_select="riffdec
  # indevs / outdevs
  alsa_indev_deps="alsa"
  alsa_outdev_deps="alsa"
 -avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
 -avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
 +avfoundation_indev_deps="avfoundation corevideo coremedia pthreads"
 +avfoundation_indev_suggest="coregraphics applicationservices"
 +avfoundation_indev_extralibs="-framework Foundation"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 -dv1394_indev_deps="dv1394"
 -dv1394_indev_select="dv_demuxer"
 +caca_outdev_deps="libcaca"
 +decklink_deps_any="libdl LoadLibrary"
 +decklink_indev_deps="decklink threads"
 +decklink_indev_extralibs="-lstdc++"
 +decklink_outdev_deps="decklink threads"
 +decklink_outdev_extralibs="-lstdc++"
 +libndi_newtek_indev_deps="libndi_newtek"
 +libndi_newtek_indev_extralibs="-lndi"
 +libndi_newtek_outdev_deps="libndi_newtek"
 +libndi_newtek_outdev_extralibs="-lndi"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
  fbdev_indev_deps="linux_fb_h"
 +fbdev_outdev_deps="linux_fb_h"
 +gdigrab_indev_deps="CreateDIBSection"
 +gdigrab_indev_extralibs="-lgdi32"
 +gdigrab_indev_select="bmp_decoder"
 +iec61883_indev_deps="libiec61883"
  jack_indev_deps="libjack"
  jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
 +kmsgrab_indev_deps="libdrm"
 +lavfi_indev_deps="avfilter"
  libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
- oss_indev_deps_any="soundcard_h sys_soundcard_h"
- oss_outdev_deps_any="soundcard_h sys_soundcard_h"
 +openal_indev_deps="openal"
 +opengl_outdev_deps="opengl"
+ oss_indev_deps_any="sys_soundcard_h"
+ oss_outdev_deps_any="sys_soundcard_h"
  pulse_indev_deps="libpulse"
 +pulse_outdev_deps="libpulse"
 +sdl2_outdev_deps="sdl2"
  sndio_indev_deps="sndio"
  sndio_outdev_deps="sndio"
  v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
@@@ -6176,17 -4855,9 +6175,16 @@@ check_type "dshow.h" IBaseFilte
    check_header dev/video/bktr/ioctl_bt848.h; } ||
  check_header dev/ic/bt8xx.h
  
 -check_header sys/soundcard.h
 +if check_struct sys/soundcard.h audio_buf_info bytes; then
 +    enable_sanitized sys/soundcard.h
 +else
 +    check_cc -D__BSD_VISIBLE -D__XSI_VISIBLE <<EOF && add_cppflags -D__BSD_VISIBLE -D__XSI_VISIBLE && enable_sanitized sys/soundcard.h
 +    #include <sys/soundcard.h>
 +    audio_buf_info abc;
 +EOF
 +fi
- check_header soundcard.h
  
 -enabled_any alsa_indev alsa_outdev &&
 +enabled alsa && check_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
      check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
  
  enabled libjack &&
  #include "config.h"
  
  #include <string.h>
- #if HAVE_SOUNDCARD_H
- #include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
 +
 +#if HAVE_UNISTD_H
  #include <unistd.h>
 +#endif
  #include <fcntl.h>
  #include <sys/ioctl.h>
+ #include <sys/soundcard.h>
  
  #include "libavutil/log.h"
  
  
  #include <stdint.h>
  
--#if HAVE_SOUNDCARD_H
--#include <soundcard.h>
--#else
--#include <sys/soundcard.h>
--#endif
--
 +#if HAVE_UNISTD_H
  #include <unistd.h>
 +#endif
  #include <fcntl.h>
  #include <sys/ioctl.h>
++#include <sys/soundcard.h>
  
  #include "libavutil/internal.h"
  #include "libavutil/opt.h"
  
  #include "config.h"
  
--#if HAVE_SOUNDCARD_H
--#include <soundcard.h>
--#else
--#include <sys/soundcard.h>
--#endif
--
 +#if HAVE_UNISTD_H
  #include <unistd.h>
 +#endif
  #include <fcntl.h>
  #include <sys/ioctl.h>
++#include <sys/soundcard.h>
  
  #include "libavutil/internal.h"