History

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.

Diego Biurrun committed 9 years ago

Commit 1818a641 parent af451ac2 files · +7 −8Browse files

Unified · Split

2 files
  1. configure +5 −6
  2. libavdevice/Makefile +2 −2
configure+5−6
@@ -2367,23 +2367,23 @@ xmv_demuxer_select="riffdec" · 2366 unmodified lines
2367xwma_demuxer_select="riffdec"2367xwma_demuxer_select="riffdec"
2368 2368
2369# indevs / outdevs2369# indevs / outdevs
2370alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"2370alsa_indev_deps="alsa"
2371alsa_outdev_deps="alsa_asoundlib_h"2371alsa_outdev_deps="alsa"
2372avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"2372avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
2373avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"2373avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
2374bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"2374bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
2375dv1394_indev_deps="dv1394"2375dv1394_indev_deps="dv1394"
2376dv1394_indev_select="dv_demuxer"2376dv1394_indev_select="dv_demuxer"
2377fbdev_indev_deps="linux_fb_h"2377fbdev_indev_deps="linux_fb_h"
2378jack_indev_deps="jack_jack_h"2378jack_indev_deps="jack"
2379jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"2379jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
2380libcdio_indev_deps="libcdio"2380libcdio_indev_deps="libcdio"
2381libdc1394_indev_deps="libdc1394"2381libdc1394_indev_deps="libdc1394"
2382oss_indev_deps_any="soundcard_h sys_soundcard_h"2382oss_indev_deps_any="soundcard_h sys_soundcard_h"
2383oss_outdev_deps_any="soundcard_h sys_soundcard_h"2383oss_outdev_deps_any="soundcard_h sys_soundcard_h"
2384pulse_indev_deps="libpulse"2384pulse_indev_deps="libpulse"
2385sndio_indev_deps="sndio_h"2385sndio_indev_deps="sndio"
2386sndio_outdev_deps="sndio_h"2386sndio_outdev_deps="sndio"
2387v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"2387v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
2388vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"2388vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
2389vfwcap_indev_extralibs="-lavicap32"2389vfwcap_indev_extralibs="-lavicap32"
@@ -4742,7 +4742,6 @@ check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_def · 2352 unmodified lines
4742 check_header dev/video/bktr/ioctl_bt848.h; } ||4742 check_header dev/video/bktr/ioctl_bt848.h; } ||
4743check_header dev/ic/bt8xx.h4743check_header dev/ic/bt8xx.h
4744 4744
4745check_header sndio.h
4746check_header sys/soundcard.h4745check_header sys/soundcard.h
4747check_header soundcard.h4746check_header soundcard.h
4748 4747
libavdevice/Makefile+2−2
@@ -29,7 +29,7 @@ OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o · 28 unmodified lines
29OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o29OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
30OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o30OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
31 31
32SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h32SKIPHEADERS-$(HAVE_ALSA) += alsa.h
33SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h33SKIPHEADERS-$(HAVE_SNDIO) += sndio.h
34 34
35TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter35TESTPROGS-$(CONFIG_JACK_INDEV) += timefilter

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t