pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/vlc2 Fix build on NetBSD-current with strtoi.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6ada02c0c26
branches:  trunk
changeset: 645128:c6ada02c0c26
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jan 23 16:15:42 2015 +0000

description:
Fix build on NetBSD-current with strtoi.
>From Kamil Rytarowski <n54%gmx.com@localhost>

diffstat:

 multimedia/vlc2/distinfo                        |   3 ++-
 multimedia/vlc2/patches/patch-src_config_file.c |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r b9a10f064f34 -r c6ada02c0c26 multimedia/vlc2/distinfo
--- a/multimedia/vlc2/distinfo  Fri Jan 23 16:14:35 2015 +0000
+++ b/multimedia/vlc2/distinfo  Fri Jan 23 16:15:42 2015 +0000
@@ -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_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 -r b9a10f064f34 -r c6ada02c0c26 multimedia/vlc2/patches/patch-src_config_file.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vlc2/patches/patch-src_config_file.c   Fri Jan 23 16:15:42 2015 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index