Re: ffmpeg vs pthread / qnx

[Sean Boudreau <seanb%qnx.com@localhost>]

Title should have been 'libvpx ...', not ffmpeg.

-seanb

On Mon, Jun 13, 2011 at 11:18:57AM -0400, Sean Boudreau wrote:
> 
> Hi,
> 
> Similiar to the recent change to xf86-video-intel for
> pthreads plus a qnx'ism.
> 
> Any concerns?
> 
> Thanks,
> 
> -seanb

> Index: distinfo
> ===================================================================
> RCS file: /cvsroot/pkgsrc/multimedia/libvpx/distinfo,v
> retrieving revision 1.3
> diff -u -r1.3 distinfo
> --- distinfo  14 Apr 2011 07:08:00 -0000      1.3
> +++ distinfo  13 Jun 2011 15:12:23 -0000
> @@ -6,4 +6,4 @@
>  SHA1 (patch-aa) = 7f0816d094a7855cfb059905a7a21e438eb03000
>  SHA1 (patch-ab) = bd8cc8cf876eb3a8c6dbc317fb9eba3867f2cf2b
>  SHA1 (patch-ac) = e41b971e300a108beb5ae717ab6a57abc25318d9
> -SHA1 (patch-ad) = 95be9236d4a534961f77339fc3a0e2f03cff5724
> +SHA1 (patch-ad) = e535891d4819a40ce47b1cfdc6e9d5cc1fefcc97
> Index: patches/patch-ad
> ===================================================================
> RCS file: /cvsroot/pkgsrc/multimedia/libvpx/patches/patch-ad,v
> retrieving revision 1.2
> diff -u -r1.2 patch-ad
> --- patches/patch-ad  14 Apr 2011 07:08:00 -0000      1.2
> +++ patches/patch-ad  13 Jun 2011 15:12:23 -0000
> @@ -1,10 +1,24 @@
> -$NetBSD: patch-ad,v 1.2 2011/04/14 07:08:00 adam Exp $
> +$NetBSD$
>  
> -*BSD are identified as linux.
> +*BSD and qnx are identified as linux.
>  
> ---- build/make/configure.sh.orig     2010-10-28 13:14:14.000000000 +0000
> +--- build/make/configure.sh.orig     2011-03-04 20:40:37.000000000 +0000
>  +++ build/make/configure.sh
> -@@ -956,6 +956,18 @@ EOF
> +@@ -559,7 +559,7 @@ process_common_toolchain() {
> +                 [ -z "$tgt_isa" ] && tgt_isa=x86
> +                 tgt_os=win32
> +                 ;;
> +-            *linux*|*bsd*)
> ++            *linux*|*bsd*|*qnx6*)
> +                 tgt_os=linux
> +                 ;;
> +             *solaris2.10)
> +@@ -975,10 +975,29 @@ EOF
> +     if enabled multithread; then
> +         case ${toolchain} in
> +             *-win*);;
> +-            *) check_header pthread.h && add_extralibs -lpthread
> ++            *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} 
> ${PTHREAD_LIBS}
>           esac
>       fi
>   
> @@ -16,7 +30,14 @@
>  +    add_extralibs -lm -lrt
>  +    ;;
>  +    linux*)
> -+    add_extralibs -lm -lrt
> ++    case ${gcctarget} in
> ++    *qnx6*)
> ++        add_extralibs -lm
> ++        ;;
> ++    *)
> ++        add_extralibs -lm -lrt
> ++        ;;
> ++    esac
>  +    ;;
>  +    esac
>  +