diff options
| author | wiz <wiz> | 2015-01-23 16:15:42 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2015-01-23 16:15:42 +0000 |
| commit | 56984e485219f7e6a853f4c85e200ecbe58f13c5 (patch) | |
| tree | c7aafac14732a0f164c128774c0f387574dd7e9a /multimedia | |
| parent | 2ce937904a8365290fc48642207221ac578d8e57 (diff) | |
| download | pkgsrc-56984e485219f7e6a853f4c85e200ecbe58f13c5.tar.gz | |
Fix build on NetBSD-current with strtoi.
From Kamil Rytarowski <n54@gmx.com>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc2/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc2/patches/patch-src_config_file.c | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo index 330d1bb2de2..a8332d96060 100644 --- a/multimedia/vlc2/distinfo +++ b/multimedia/vlc2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2014/03/19 21:31:09 wiz Exp $ +$NetBSD: distinfo,v 1.24 2015/01/23 16:15:42 wiz Exp $ SHA1 (vlc-2.0.9.tar.xz) = d82131914023fff2a414859228a38fcc19ab59d9 RMD160 (vlc-2.0.9.tar.xz) = cbdac7bfb9375c2d0de159d063cc27a6969da649 @@ -25,3 +25,4 @@ SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf2 SHA1 (patch-modules_misc_gnutls.c) = 7ab9df9f8b31ea7a7c8e302876d0e6c4e6882c30 SHA1 (patch-modules_text__renderer_freetype.c) = 28d95587be3e2356b32bee21eb0612480b3bbd55 SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b +SHA1 (patch-src_config_file.c) = c9d1195bb10165724cee57f655615e038f5fde7f diff --git a/multimedia/vlc2/patches/patch-src_config_file.c b/multimedia/vlc2/patches/patch-src_config_file.c new file mode 100644 index 00000000000..42b10377d90 --- /dev/null +++ b/multimedia/vlc2/patches/patch-src_config_file.c @@ -0,0 +1,24 @@ +$NetBSD: patch-src_config_file.c,v 1.1 2015/01/23 16:15:42 wiz Exp $ + +Fix conflict with NetBSD's strtoi function. + +--- src/config/file.c.orig 2011-12-08 18:00:28.000000000 +0000 ++++ src/config/file.c +@@ -139,7 +139,7 @@ static FILE *config_OpenConfigFile( vlc_ + } + + +-static int64_t strtoi (const char *str) ++static int64_t vlc_strtoi (const char *str) + { + char *end; + long long l; +@@ -224,7 +224,7 @@ int config_LoadConfigFile( vlc_object_t + int64_t l; + + errno = 0; +- l = strtoi (psz_option_value); ++ l = vlc_strtoi (psz_option_value); + if ((l > item->max.i) || (l < item->min.i)) + errno = ERANGE; + if (errno) |