diff options
| author | seanb <seanb@pkgsrc.org> | 2011-06-16 13:22:48 +0000 |
|---|---|---|
| committer | seanb <seanb@pkgsrc.org> | 2011-06-16 13:22:48 +0000 |
| commit | 3888be9d16fde44a1abca105cce5a6448ec6f1c6 (patch) | |
| tree | 073961f8cb2d0ea46fcb39b4559fbc515d9c87b0 /multimedia | |
| parent | c6950f5b3c35bd19be4e86967dbfe742d3d4e6b9 (diff) | |
| download | pkgsrc-3888be9d16fde44a1abca105cce5a6448ec6f1c6.tar.gz | |
- Use pthread.buildlink3.mk for -lpthread detection.
- QNX patch.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libvpx/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libvpx/patches/patch-ad | 31 |
2 files changed, 28 insertions, 7 deletions
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo index e20d4445b48..7ad793ee114 100644 --- a/multimedia/libvpx/distinfo +++ b/multimedia/libvpx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2011/04/14 07:08:00 adam Exp $ +$NetBSD: distinfo,v 1.4 2011/06/16 13:22:48 seanb Exp $ SHA1 (libvpx-v0.9.6.tar.bz2) = a3522bd2b73d52381ba767ded1cbf4760e9cc6f8 RMD160 (libvpx-v0.9.6.tar.bz2) = b85038b92d911b29b3b912c3d71c60e13f89a551 @@ -6,4 +6,4 @@ Size (libvpx-v0.9.6.tar.bz2) = 1230418 bytes SHA1 (patch-aa) = 7f0816d094a7855cfb059905a7a21e438eb03000 SHA1 (patch-ab) = bd8cc8cf876eb3a8c6dbc317fb9eba3867f2cf2b SHA1 (patch-ac) = e41b971e300a108beb5ae717ab6a57abc25318d9 -SHA1 (patch-ad) = 95be9236d4a534961f77339fc3a0e2f03cff5724 +SHA1 (patch-ad) = e535891d4819a40ce47b1cfdc6e9d5cc1fefcc97 diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad index 489687f6acb..2a5cf49bf9f 100644 --- a/multimedia/libvpx/patches/patch-ad +++ b/multimedia/libvpx/patches/patch-ad @@ -1,10 +1,24 @@ -$NetBSD: patch-ad,v 1.2 2011/04/14 07:08:00 adam Exp $ +$NetBSD: patch-ad,v 1.3 2011/06/16 13:22:48 seanb Exp $ -*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 @@ $NetBSD: patch-ad,v 1.2 2011/04/14 07:08:00 adam Exp $ + add_extralibs -lm -lrt + ;; + linux*) -+ add_extralibs -lm -lrt ++ case ${gcctarget} in ++ *qnx6*) ++ add_extralibs -lm ++ ;; ++ *) ++ add_extralibs -lm -lrt ++ ;; ++ esac + ;; + esac + |