[FFmpeg-devel] [PATCH] Fixed issue #43 JACK indev support on OSX

[Michael Niedermayer]

On Thu, Feb 18, 2016 at 11:58:25PM +0000, Josh de Kock wrote:
> ---
>  configure          | 14 +++++++++++---
>  libavdevice/jack.c | 12 ++++++++++++
>  2 files changed, 23 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 287896f..f2f7c3d 100755
> --- a/configure
> +++ b/configure
> @@ -1732,6 +1732,7 @@ BUILTIN_LIST="
>      mm_empty
>      rdtsc
>      sarestart
> +    sem_timedwait
>      sync_val_compare_and_swap
>  "
>  HAVE_LIST_CMDLINE="
> @@ -1758,6 +1759,7 @@ HEADERS_LIST="
>      dev_ic_bt8xx_h
>      dev_video_bktr_ioctl_bt848_h
>      dev_video_meteor_ioctl_meteor_h
> +    dispatch_dispatch_h
>      direct_h
>      dirent_h
>      dlfcn_h
> @@ -2757,7 +2759,7 @@ gdigrab_indev_deps="CreateDIBSection"
>  gdigrab_indev_extralibs="-lgdi32"
>  gdigrab_indev_select="bmp_decoder"
>  iec61883_indev_deps="libiec61883"
> -jack_indev_deps="jack_jack_h sem_timedwait"
> +jack_indev_deps="jack_jack_h"
>  lavfi_indev_deps="avfilter"
>  libcdio_indev_deps="libcdio"
>  libdc1394_indev_deps="libdc1394"
> @@ -5303,6 +5305,7 @@ check_func  mprotect
>  check_func_headers time.h nanosleep || { check_func_headers time.h nanosleep -lrt && add_extralibs -lrt && LIBRT="-lrt"; }
>  check_func  sched_getaffinity
>  check_func  setrlimit
> +check_func  sem_timedwait
>  check_struct "sys/stat.h" "struct stat" st_mtim.tv_nsec -D_BSD_SOURCE
>  check_func  strerror_r
>  check_func  sysconf
> @@ -5330,6 +5333,7 @@ check_func_headers glob.h glob
>  enabled xlib &&
>      check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
>  
> +check_header dispatch/dispatch.h
>  check_header direct.h
>  check_header dirent.h
>  check_header dlfcn.h
> @@ -5702,8 +5706,12 @@ check_header soundcard.h
>  enabled_any alsa_indev alsa_outdev &&
>      check_lib2 alsa/asoundlib.h snd_pcm_htimestamp -lasound
>  
> -enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack && check_func sem_timedwait &&
> -    check_func jack_port_get_latency_range -ljack
> +if enabled jack_indev; then
> +    { check_lib2 jack/jack.h jack_client_open -ljack &&
> +      check_func jack_port_get_latency_range -ljack &&
> +      enabled_any sem_timedwait dispatch_dispatch_h; } || 
> +    disable jack_indev
> +fi

this causes jack to be disabled on ubuntu LTS 12.04

grep -i jack config.h
#define HAVE_JACK_PORT_GET_LATENCY_RANGE 1
#define CONFIG_JACK_INDEV 0

previously:
grep -i jack config.h
#define HAVE_JACK_PORT_GET_LATENCY_RANGE 1
#define CONFIG_JACK_INDEV 1


[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

For every action, there is an equal and opposite reaction. -- Newton
For every man jailed for a minor crime, theres one person more that
will hate the government, some of them will become terrorists.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160219/3d4b781e/attachment.sig>