From 1818a640cfdccd52e97edf13564f45bc3d0d93eb Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 8 Dec 2016 11:49:34 +0100 Subject: build: Fix dependencies for alsa/jack/sndio support These components should depend on the availability of the respective libraries, not just on the availability of the respective headers. --- configure | 11 +++++------ libavdevice/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure b/configure index fc2c54aad3..ac47c3d835 100755 --- a/configure +++ b/configure @@ -2367,23 +2367,23 @@ 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_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" dv1394_indev_deps="dv1394" dv1394_indev_select="dv_demuxer" 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" 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" pulse_indev_deps="libpulse" -sndio_indev_deps="sndio_h" -sndio_outdev_deps="sndio_h" +sndio_indev_deps="sndio" +sndio_outdev_deps="sndio" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" 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/ic/bt8xx.h -check_header sndio.h check_header sys/soundcard.h check_header soundcard.h diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 5bb1d3f8c9..664fa0f9ff 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -29,7 +29,7 @@ OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o -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 -- cgit v1.2.3