Don't conflict with NetBSD's strtoi. Disable liblive due to incompatible

interface changes.

4 files changed, 27 insertions, 8 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 9259d25bdee..0c80bb897a0 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2015/02/21 23:35:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.180 2015/03/22 20:06:32 joerg Exp $
 
 DISTNAME=		vlc-${VLC_VERSION}
 PKGREVISION=		50
@@ -28,6 +28,9 @@ PTHREAD_OPTS+=		require
 USE_LANGUAGES=		c99 c++
 PLIST_VARS+=		x86simd altivec v4l2
 
+# Incompatible with current versions
+CONFIGURE_ARGS+=	--disable-live555
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -121,7 +124,6 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../net/liblive/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libebml/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 13e801c20e2..54c0247c8f6 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2013/11/28 10:12:25 martin Exp $
+@comment $NetBSD: PLIST,v 1.55 2015/03/22 20:06:32 joerg Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -191,7 +191,6 @@ lib/vlc/plugins/demux/libdirac_plugin.la
 lib/vlc/plugins/demux/libes_plugin.la
 lib/vlc/plugins/demux/libflacsys_plugin.la
 lib/vlc/plugins/demux/libh264_plugin.la
-lib/vlc/plugins/demux/liblive555_plugin.la
 lib/vlc/plugins/demux/libmjpeg_plugin.la
 lib/vlc/plugins/demux/libmkv_plugin.la
 lib/vlc/plugins/demux/libmp4_plugin.la
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index dba5648ef56..84c13e9b18d 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2014/11/17 11:38:10 prlw1 Exp $
+$NetBSD: distinfo,v 1.65 2015/03/22 20:06:32 joerg Exp $
 
 SHA1 (vlc-1.1.13.tar.bz2) = 05bbc7ff427f3b919b29a45ce014caff9ba92648
 RMD160 (vlc-1.1.13.tar.bz2) = c5aa438a9085ddbf28e849df442b75475693290d
@@ -24,6 +24,6 @@ SHA1 (patch-modules_codec_flac.c) = 962783164f505a8b9e5c1be18e162dfdc7917cb3
 SHA1 (patch-modules_misc_freetype.c) = c362cdb0c1223398b14dd1a08525140c646668a7
 SHA1 (patch-modules_misc_rtsp.c) = 586e0228cf21ca2f976451e61e4390278afb6fee
 SHA1 (patch-modules_visualization_projectm.cpp) = 8e3c6ec0d9588f432c5baa75e36c1c2248780b6b
-SHA1 (patch-src_config_file.c) = f6938d98f0f9b14cd13f8020807aac3c818c58d1
+SHA1 (patch-src_config_file.c) = dfec35d5655722e624ed524fc27adc9e72f60552
 SHA1 (patch-src_misc_messages.c) = 855e82349ec80f7d68404da6b40f367776a74327
 SHA1 (patch-src_text_charset.c) = b8dfc376f23655565f671849971293d8527f5e3e
diff --git a/multimedia/vlc/patches/patch-src_config_file.c b/multimedia/vlc/patches/patch-src_config_file.c
index de972809bd9..9448a2eaa15 100644
--- a/multimedia/vlc/patches/patch-src_config_file.c
+++ b/multimedia/vlc/patches/patch-src_config_file.c
@@ -1,7 +1,16 @@
-$NetBSD: patch-src_config_file.c,v 1.1 2013/09/08 16:28:27 joerg Exp $
+$NetBSD: patch-src_config_file.c,v 1.2 2015/03/22 20:06:32 joerg Exp $
 
---- src/config/file.c.orig	2013-05-15 20:27:58.000000000 +0000
+--- src/config/file.c.orig	2010-04-15 16:56:14.000000000 +0000
 +++ src/config/file.c
+@@ -135,7 +135,7 @@ static FILE *config_OpenConfigFile( vlc_
+ }
+ 
+ 
+-static int strtoi (const char *str)
++static int my_strtoi (const char *str)
+ {
+     char *end;
+     long l;
 @@ -187,8 +187,10 @@ int config_LoadConfigFile( vlc_object_t 
      section[0] = '\0';
  
@@ -13,6 +22,15 @@ $NetBSD: patch-src_config_file.c,v 1.1 2013/09/08 16:28:27 joerg Exp $
  
      vlc_rwlock_wrlock (&config_lock);
      while (fgets (line, 1024, file) != NULL)
+@@ -270,7 +272,7 @@ int config_LoadConfigFile( vlc_object_t 
+                 case CONFIG_ITEM_BOOL:
+                 case CONFIG_ITEM_INTEGER:
+                 {
+-                    long l = strtoi (psz_option_value);
++                    long l = my_strtoi (psz_option_value);
+                     if (errno)
+                         msg_Warn (p_this, "Integer value (%s) for %s: %m",
+                                   psz_option_value, psz_option_name);
 @@ -282,7 +284,7 @@ int config_LoadConfigFile( vlc_object_t 
                  case CONFIG_ITEM_FLOAT:
                      if( !*psz_option_value )