virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

build: Fix dependencies for alsa/jack/sndio support

Browse Source 
These components should depend on the availability of the respective
libraries, not just on the availability of the respective headers.
This commit is contained in:
Diego Biurrun
2016-12-08 11:49:34 +01:00
parent af451ac0de
commit 1818a640cf
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@@ -2367,23 +2367,23 @@ xmv_demuxer_select="riffdec"
xwma_demuxer_select="riffdec" xwma_demuxer_select="riffdec"
# indevs / outdevs # indevs / outdevs
alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_indev_deps="alsa"
alsa_outdev_deps="alsa_asoundlib_h" alsa_outdev_deps="alsa"
avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads" avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia" 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" 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_deps="dv1394"
dv1394_indev_select="dv_demuxer" dv1394_indev_select="dv_demuxer"
fbdev_indev_deps="linux_fb_h" fbdev_indev_deps="linux_fb_h"
jack_indev_deps="jack_jack_h" jack_indev_deps="jack"
jack_indev_deps_any="sem_timedwait dispatch_dispatch_h" jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
libcdio_indev_deps="libcdio" libcdio_indev_deps="libcdio"
libdc1394_indev_deps="libdc1394" libdc1394_indev_deps="libdc1394"
oss_indev_deps_any="soundcard_h sys_soundcard_h" oss_indev_deps_any="soundcard_h sys_soundcard_h"
oss_outdev_deps_any="soundcard_h sys_soundcard_h" oss_outdev_deps_any="soundcard_h sys_soundcard_h"
pulse_indev_deps="libpulse" pulse_indev_deps="libpulse"
sndio_indev_deps="sndio_h" sndio_indev_deps="sndio"
sndio_outdev_deps="sndio_h" sndio_outdev_deps="sndio"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_indev_extralibs="-lavicap32" vfwcap_indev_extralibs="-lavicap32"
@@ -4742,7 +4742,6 @@ check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_def
check_header dev/video/bktr/ioctl_bt848.h; } || check_header dev/video/bktr/ioctl_bt848.h; } ||
check_header dev/ic/bt8xx.h check_header dev/ic/bt8xx.h
check_header sndio.h
check_header sys/soundcard.h check_header sys/soundcard.h
check_header soundcard.h check_header soundcard.h

4
libavdevice/Makefile
View File

@@ -29,7 +29,7 @@ OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h SKIPHEADERS-$(HAVE_ALSA) += alsa.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h SKIPHEADERS-$(HAVE_SNDIO) += sndio.h
TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter