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
23672367 xwma_demuxer_select="riffdec"
23682368
23692369 # indevs / outdevs
2370−alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
2371−alsa_outdev_deps="alsa_asoundlib_h"
2370+alsa_indev_deps="alsa"
2371+alsa_outdev_deps="alsa"
23722372 avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads"
23732373 avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia"
23742374 bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
23752375 dv1394_indev_deps="dv1394"
23762376 dv1394_indev_select="dv_demuxer"
23772377 fbdev_indev_deps="linux_fb_h"
2378−jack_indev_deps="jack_jack_h"
2378+jack_indev_deps="jack"
23792379 jack_indev_deps_any="sem_timedwait dispatch_dispatch_h"
23802380 libcdio_indev_deps="libcdio"
23812381 libdc1394_indev_deps="libdc1394"
23822382 oss_indev_deps_any="soundcard_h sys_soundcard_h"
23832383 oss_outdev_deps_any="soundcard_h sys_soundcard_h"
23842384 pulse_indev_deps="libpulse"
2385−sndio_indev_deps="sndio_h"
2386−sndio_outdev_deps="sndio_h"
2385+sndio_indev_deps="sndio"
2386+sndio_outdev_deps="sndio"
23872387 v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
23882388 vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
23892389 vfwcap_indev_extralibs="-lavicap32"
@@ -4742,7 +4742,6 @@ check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_def · 2352 unmodified lines
47424742 check_header dev/video/bktr/ioctl_bt848.h; } ||
47434743 check_header dev/ic/bt8xx.h
47444744
4745−check_header sndio.h
47464745 check_header sys/soundcard.h
47474746 check_header soundcard.h
47484747
libavdevice/Makefile+2−2
@@ -29,7 +29,7 @@ OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o · 28 unmodified lines
2929 OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
3030 OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
3131
32−SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h
33−SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h
32+SKIPHEADERS-$(HAVE_ALSA) += alsa.h
33+SKIPHEADERS-$(HAVE_SNDIO) += sndio.h
3434
3535 TESTPROGS-$(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