[FFmpeg-cvslog] Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'

Clément Bœsch git at videolan.org
Mon Apr 17 10:33:27 EEST 2017 

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr 15 18:42:30 2017 +0200| [9ae1ffe64126bda204e498c83e414dad7ff078f8] | committer: Clément Bœsch

Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'

* commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb':
  build: Fix dependencies for alsa/jack/sndio support

Added explicit enable (which will be automatically added later on in
ee480790c) to actually fix this commit. Without the explicit enables,
alsa, jack and sndio gets disabled.

Also added jack, alsa and sndio to the have list so the HAVE_* are
populated to make (this fixes the SKIPHEADERS chunks).

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ae1ffe64126bda204e498c83e414dad7ff078f8
---

 configure            | 20 +++++++++++---------
 libavdevice/Makefile |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index e6fe05a6ee..d3b733cf66 100755
--- a/configure
+++ b/configure
@@ -2063,10 +2063,12 @@ HAVE_LIST="
     $THREADS_LIST
     $TOOLCHAIN_FEATURES
     $TYPES_LIST
+    alsa
     atomics_native
     dos_paths
     dxva2_lib
     dxva2api_cobj
+    jack
     libc_msvcrt
     makeinfo
     makeinfo_html
@@ -2075,6 +2077,7 @@ HAVE_LIST="
     pod2man
     sdl2
     section_data_rel_ro
+    sndio
     texi2html
     threads
     vaapi_drm
@@ -2987,8 +2990,8 @@ xmv_demuxer_select="riffdec"
 xwma_demuxer_select="riffdec"
 
 # indevs / outdevs
-alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
-alsa_outdev_deps="alsa_asoundlib_h"
+alsa_indev_deps="alsa"
+alsa_outdev_deps="alsa"
 avfoundation_indev_deps="pthreads"
 avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
 bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
@@ -3007,7 +3010,7 @@ gdigrab_indev_deps="CreateDIBSection"
 gdigrab_indev_extralibs="-lgdi32"
 gdigrab_indev_select="bmp_decoder"
 iec61883_indev_deps="libiec61883"
-jack_indev_deps="jack_jack_h"
+jack_indev_deps="jack"
 jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
 lavfi_indev_deps="avfilter"
 libcdio_indev_deps="libcdio"
@@ -3022,8 +3025,8 @@ pulse_outdev_deps="libpulse"
 qtkit_indev_extralibs="-framework QTKit -framework Foundation -framework QuartzCore"
 qtkit_indev_select="qtkit"
 sdl2_outdev_deps="sdl2"
-sndio_indev_deps="sndio_h"
-sndio_outdev_deps="sndio_h"
+sndio_indev_deps="sndio"
+sndio_outdev_deps="sndio"
 v4l_indev_deps="linux_videodev_h"
 v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
 v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h"
@@ -5986,7 +5989,6 @@ check_type "dshow.h" IBaseFilter
   check_header dev/video/bktr/ioctl_bt848.h; } ||
 check_header dev/ic/bt8xx.h
 
-check_header sndio.h
 if check_struct sys/soundcard.h audio_buf_info bytes; then
     enable_safe sys/soundcard.h
 else
@@ -5998,12 +6000,12 @@ fi
 check_header soundcard.h
 
 enabled_any alsa_indev alsa_outdev &&
-    check_lib alsa/asoundlib.h snd_pcm_htimestamp -lasound
+    check_lib alsa/asoundlib.h snd_pcm_htimestamp -lasound && enable alsa
 
-enabled jack_indev && check_lib jack/jack.h jack_client_open -ljack &&
+enabled jack_indev && check_lib jack/jack.h jack_client_open -ljack && enable jack &&
     check_func jack_port_get_latency_range -ljack
 
-enabled_any sndio_indev sndio_outdev && check_lib sndio.h sio_open -lsndio
+enabled_any sndio_indev sndio_outdev && check_lib sndio.h sio_open -lsndio && enable sndio
 
 if enabled libcdio; then
     check_lib "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 78c42e6564..6139f1944d 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -66,7 +66,7 @@ SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)       += fbdev_common.h
 SKIPHEADERS-$(CONFIG_LIBPULSE)           += pulse_audio_common.h
 SKIPHEADERS-$(CONFIG_V4L2_INDEV)         += v4l2-common.h
 SKIPHEADERS-$(CONFIG_V4L2_OUTDEV)        += v4l2-common.h
-SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa.h
-SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio.h
+SKIPHEADERS-$(HAVE_ALSA)                 += alsa.h
+SKIPHEADERS-$(HAVE_SNDIO)                += sndio.h
 
 TESTPROGS-$(CONFIG_JACK_INDEV)           += timefilter


======================================================================

diff --cc configure
index e6fe05a6ee,ac47c3d835..d3b733cf66
--- a/configure
+++ b/configure
@@@ -2063,19 -1676,12 +2063,22 @@@ HAVE_LIST=
      $THREADS_LIST
      $TOOLCHAIN_FEATURES
      $TYPES_LIST
++    alsa
 +    atomics_native
      dos_paths
      dxva2_lib
 +    dxva2api_cobj
++    jack
      libc_msvcrt
 +    makeinfo
 +    makeinfo_html
      MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
 -    sdl
 +    perl
 +    pod2man
 +    sdl2
      section_data_rel_ro
++    sndio
 +    texi2html
      threads
      vaapi_drm
      vaapi_x11
@@@ -2987,46 -2367,24 +2990,46 @@@ xmv_demuxer_select="riffdec
  xwma_demuxer_select="riffdec"
  
  # indevs / outdevs
- alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
- alsa_outdev_deps="alsa_asoundlib_h"
+ alsa_indev_deps="alsa"
+ alsa_outdev_deps="alsa"
 -avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
 +avfoundation_indev_deps="pthreads"
  avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 +caca_outdev_deps="libcaca"
 +decklink_indev_deps="decklink threads"
 +decklink_indev_extralibs="-lstdc++"
 +decklink_outdev_deps="decklink threads"
 +decklink_outdev_extralibs="-lstdc++"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
  dv1394_indev_deps="dv1394"
  dv1394_indev_select="dv_demuxer"
  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="jack_jack_h"
+ jack_indev_deps="jack"
  jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
 +lavfi_indev_deps="avfilter"
  libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
 +libv4l2_indev_deps="libv4l2"
 +openal_indev_deps="openal"
 +opengl_outdev_deps="opengl"
  oss_indev_deps_any="soundcard_h sys_soundcard_h"
  oss_outdev_deps_any="soundcard_h sys_soundcard_h"
  pulse_indev_deps="libpulse"
 +pulse_outdev_deps="libpulse"
 +qtkit_indev_extralibs="-framework QTKit -framework Foundation -framework QuartzCore"
 +qtkit_indev_select="qtkit"
 +sdl2_outdev_deps="sdl2"
- sndio_indev_deps="sndio_h"
- sndio_outdev_deps="sndio_h"
+ sndio_indev_deps="sndio"
+ sndio_outdev_deps="sndio"
 +v4l_indev_deps="linux_videodev_h"
  v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
 +v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h"
  vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
  vfwcap_indev_extralibs="-lavicap32"
  xcbgrab_indev_deps="libxcb"
@@@ -5986,24 -4742,16 +5989,23 @@@ check_type "dshow.h" IBaseFilte
    check_header dev/video/bktr/ioctl_bt848.h; } ||
  check_header dev/ic/bt8xx.h
  
- check_header sndio.h
 -check_header sys/soundcard.h
 +if check_struct sys/soundcard.h audio_buf_info bytes; then
 +    enable_safe sys/soundcard.h
 +else
 +    check_cc -D__BSD_VISIBLE -D__XSI_VISIBLE <<EOF && add_cppflags -D__BSD_VISIBLE -D__XSI_VISIBLE && enable_safe sys/soundcard.h
 +    #include <sys/soundcard.h>
 +    audio_buf_info abc;
 +EOF
 +fi
  check_header soundcard.h
  
  enabled_any alsa_indev alsa_outdev &&
--    check_lib alsa/asoundlib.h snd_pcm_htimestamp -lasound
++    check_lib alsa/asoundlib.h snd_pcm_htimestamp -lasound && enable alsa
  
--enabled jack_indev && check_lib jack/jack.h jack_client_open -ljack &&
++enabled jack_indev && check_lib jack/jack.h jack_client_open -ljack && enable jack &&
      check_func jack_port_get_latency_range -ljack
  
--enabled_any sndio_indev sndio_outdev && check_lib sndio.h sio_open -lsndio
++enabled_any sndio_indev sndio_outdev && check_lib sndio.h sio_open -lsndio && enable sndio
  
  if enabled libcdio; then
      check_lib "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
diff --cc libavdevice/Makefile
index 78c42e6564,664fa0f9ff..6139f1944d
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@@ -54,19 -29,7 +54,19 @@@ OBJS-$(CONFIG_XV_OUTDEV
  OBJS-$(CONFIG_LIBCDIO_INDEV)             += libcdio.o
  OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
  
 +# Windows resource file
 +SLIBOBJS-$(HAVE_GNU_WINDRES)             += avdeviceres.o
 +
 +SKIPHEADERS                              += decklink_common.h
 +SKIPHEADERS-$(CONFIG_DECKLINK)           += decklink_enc.h decklink_dec.h \
 +                                            decklink_common_c.h
 +SKIPHEADERS-$(CONFIG_DSHOW_INDEV)        += dshow_capture.h
 +SKIPHEADERS-$(CONFIG_FBDEV_INDEV)        += fbdev_common.h
 +SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV)       += fbdev_common.h
 +SKIPHEADERS-$(CONFIG_LIBPULSE)           += pulse_audio_common.h
 +SKIPHEADERS-$(CONFIG_V4L2_INDEV)         += v4l2-common.h
 +SKIPHEADERS-$(CONFIG_V4L2_OUTDEV)        += v4l2-common.h
- SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa.h
- SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio.h
+ SKIPHEADERS-$(HAVE_ALSA)                 += alsa.h
+ SKIPHEADERS-$(HAVE_SNDIO)                += sndio.h
  
  TESTPROGS-$(CONFIG_JACK_INDEV)           += timefilter

More information about the ffmpeg-cvslog mailing list