diff options
| author | obache <obache@pkgsrc.org> | 2012-03-20 12:06:16 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-03-20 12:06:16 +0000 |
| commit | b56d98082fa5b927917366db215de38f54fd7a2c (patch) | |
| tree | 62ddbec5f9cdb19bf2a0668d4330aa0fcc3d8280 /multimedia/vlc2 | |
| parent | 55627d9468252efd9c53d5e77409d9b3cdef4323 (diff) | |
| download | pkgsrc-b56d98082fa5b927917366db215de38f54fd7a2c.tar.gz | |
NetBSD<5.99.16 does not have popcount(3).
fixes PR 46230.
Diffstat (limited to 'multimedia/vlc2')
| -rw-r--r-- | multimedia/vlc2/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/vlc2/patches/patch-av | 35 |
2 files changed, 33 insertions, 6 deletions
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo index e50f6f1c085..d767217f12d 100644 --- a/multimedia/vlc2/distinfo +++ b/multimedia/vlc2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2012/02/24 17:24:18 wiz Exp $ +$NetBSD: distinfo,v 1.3 2012/03/20 12:06:16 obache Exp $ SHA1 (vlc-2.0.0.tar.xz) = c28c4c8128110fd02a7bdf55c9dad5cc20eb91b8 RMD160 (vlc-2.0.0.tar.xz) = 6c4d1401a7cc5b1c66dde7eb896347a728961d2b @@ -8,7 +8,7 @@ SHA1 (patch-ar) = 153164870e9dc50ad32106d9f8ebd25b35ed3dd3 SHA1 (patch-as) = b53b074b2791d7bf69d5f09c7c32d873608f3086 SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b -SHA1 (patch-av) = af36b4658a650136eb9bdb2f541c9dd5315073d5 +SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6 SHA1 (patch-aw) = 334648f9ba421184e41e4ead0da1eacc61c95b19 SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15 diff --git a/multimedia/vlc2/patches/patch-av b/multimedia/vlc2/patches/patch-av index ce7f2990f21..aa7fcb6ae12 100644 --- a/multimedia/vlc2/patches/patch-av +++ b/multimedia/vlc2/patches/patch-av @@ -1,17 +1,44 @@ -$NetBSD: patch-av,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $ +$NetBSD: patch-av,v 1.2 2012/03/20 12:06:17 obache Exp $ --- include/vlc_common.h.orig 2011-12-11 22:34:47.000000000 +0000 +++ include/vlc_common.h -@@ -625,6 +625,8 @@ static inline unsigned clz (unsigned x) +@@ -51,6 +51,9 @@ + #include <stdio.h> + #include <inttypes.h> + #include <stddef.h> ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif + + #ifndef __cplusplus + # include <stdbool.h> +@@ -625,6 +628,8 @@ static inline unsigned clz (unsigned x) /* XXX: this assumes that int is 32-bits or more */ #define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8)) -+#ifndef __NetBSD__ ++#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 599001600) + /** Bit weight */ VLC_USED static inline unsigned popcount (unsigned x) -@@ -696,6 +698,7 @@ static inline uint64_t bswap64 (uint64_t +@@ -641,6 +646,7 @@ static inline unsigned popcount (unsigne + return count; + #endif + } ++#endif /* NetBSD < 5.99.16 */ + + #ifdef __OS2__ + # undef bswap16 +@@ -648,6 +654,8 @@ static inline unsigned popcount (unsigne + # undef bswap64 + #endif + ++#ifndef __NetBSD__ ++ + /** Byte swap (16 bits) */ + VLC_USED + static inline uint16_t bswap16 (uint16_t x) +@@ -696,6 +704,7 @@ static inline uint64_t bswap64 (uint64_t #endif } |