On 29/03/16 14:28, Luca Barbato wrote:
> On 29/03/16 14:22, Diego Biurrun wrote:
>> On Mon, Mar 28, 2016 at 07:08:38PM +0200, Luca Barbato wrote:
>>> From: Josh de Kock <[email protected]>
>>>
>>> Previously, with JACK installed, the configure script would enabled the
>>> JACK indev; this broke on Mac OS X due to a incomplete pthreads
>>> implementation. Some simple macros to map libdispatch to pthreads if on
>>> OS X.
>>
>> Last sentence no verb.
>>
>> jack: support OS X
>>
>> Previously, with JACK installed, the configure script would enable the
>> JACK indev; this broke on OS X due to an incomplete pthreads
>> implementation. Add some simple macros to map libdispatch to pthreads
>> on OS X.
>
> Sure.
>
>>
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -104,7 +104,7 @@ FFLIBS := avutil
>>>
>>> DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
>>>
>>> -SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
>>> +SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
>>> compat/dispatch_semaphore.h
>>
>> order
>>
>> even better: break the lines
>
> That hunk is now spurious =)
>
>>
>>> --- /dev/null
>>> +++ b/compat/dispatch_semaphore/semaphore.h
>>> @@ -0,0 +1,42 @@
>>> +
>>> +#ifndef COMPAT_DISPATCH_SEMAPHORE_H
>>
>> COMPAT_DISPATCH_SEMAPHORE_SEMAPHORE_H
>
> Right!, thank you!
>
>>
>> Diego
>> _______________________________________________
>> libav-devel mailing list
>> [email protected]
>> https://lists.libav.org/mailman/listinfo/libav-devel
>>
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
>
While I re-read the patch, I noticed it assumed pthreads as -lpthread:
diff --git a/configure b/configure
index 1798f76..546ddc0 100755
--- a/configure
+++ b/configure
@@ -4388,7 +4388,6 @@ fi
check_builtin atomic_cas_ptr atomic.h "void **ptr; void *oldval,
*newval; atomic_cas_ptr(ptr, oldval, newval)"
check_builtin machine_rw_barrier mbarrier.h "__machine_rw_barrier()"
check_builtin MemoryBarrier windows.h "MemoryBarrier()"
-check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0);
sem_timedwait(s,0); sem_destroy(s)" -lpthread
check_builtin sync_val_compare_and_swap "" "int *ptr; int oldval,
newval; __sync_val_compare_and_swap(ptr, oldval, newval)"
case "$custom_allocator" in
@@ -4509,6 +4508,9 @@ if ! disabled pthreads && ! enabled w32threads; then
fi
fi
+enabled pthreads &&
+ check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0);
sem_timedwait(s,0); sem_destroy(s)"
+
disabled zlib || check_lib zlib.h zlibVersion -lz || disable
zlib
disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable
bzlib
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
