summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/vlc21/distinfo3
-rw-r--r--multimedia/vlc21/patches/patch-src_config_file.c25
2 files changed, 27 insertions, 1 deletions
diff --git a/multimedia/vlc21/distinfo b/multimedia/vlc21/distinfo
index a1b43d80917..35280b6b391 100644
--- a/multimedia/vlc21/distinfo
+++ b/multimedia/vlc21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2014/12/13 11:15:45 wiz Exp $
+$NetBSD: distinfo,v 1.2 2015/01/23 16:01:40 wiz Exp $
SHA1 (vlc-2.1.5.tar.xz) = 7f1cb6324a04cf393896bbb5976ca9febd7b3efc
RMD160 (vlc-2.1.5.tar.xz) = 4a18210f0f01ac8dfaf166926ab10eea6d97fbae
@@ -23,3 +23,4 @@ SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f
SHA1 (patch-modules_access_rtp_Makefile.in) = 3d8dccd16a486b2fe4fa3f7ef7a7cca3dd2c00de
SHA1 (patch-modules_audio__output_pulse.c) = 39fe574ef63ad3c4ce9ca4db92a80e42755cdde9
SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b
+SHA1 (patch-src_config_file.c) = 9a3c19da1425d3617b6221b5e3e2c90ad2ae53f9
diff --git a/multimedia/vlc21/patches/patch-src_config_file.c b/multimedia/vlc21/patches/patch-src_config_file.c
new file mode 100644
index 00000000000..a7c6583fc88
--- /dev/null
+++ b/multimedia/vlc21/patches/patch-src_config_file.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_config_file.c,v 1.1 2015/01/23 16:01:40 wiz Exp $
+
+Rename strtoi to vlc_strtoi to avoid conflict with NetBSD built-in
+function strtoi.
+
+--- src/config/file.c.orig 2013-06-24 18:00:39.000000000 +0000
++++ src/config/file.c
+@@ -140,7 +140,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;
+@@ -225,7 +225,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)