Update to upstream version 2.2.3

Differential Revision:	https://reviews.freebsd.org/D6373

6 files changed, 22 insertions, 50 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 666d8e969ddb..fdc91f1b8b8a 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	vlc
-DISTVERSION=	2.2.1
-PORTREVISION=	9
+DISTVERSION=	2.2.3
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -53,6 +52,7 @@ CONFIGURE_ARGS+=--enable-debug
 .endif
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS_i386=	-fomit-frame-pointer
+LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \
 		DVDNAV FAAD FLAC FLUID FRIBIDI GME GNOMEVFS2 GNUTLS \
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index e5b2f1487ed1..32a44f82fc41 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vlc-2.2.1.tar.xz) = 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb
-SIZE (vlc-2.2.1.tar.xz) = 20940288
+TIMESTAMP = 1463236247
+SHA256 (vlc-2.2.3.tar.xz) = b9d7587d35f13c3c981964c8cc8b03f1c7c8edf528be476b3ca1d2efedd5bf5b
+SIZE (vlc-2.2.3.tar.xz) = 21835204
diff --git a/multimedia/vlc/files/patch-configure b/multimedia/vlc/files/patch-configure
index fd0befa99924..331811b65505 100644
--- a/multimedia/vlc/files/patch-configure
+++ b/multimedia/vlc/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig
+--- configure.orig	2016-04-05 00:45:51 UTC
 +++ configure
-@@ -8461,9 +8461,6 @@ case "${host_os}" in
+@@ -8471,9 +8471,6 @@ case "${host_os}" in
      ;;
    freebsd*)
      SYS=freebsd
@@ -10,7 +10,7 @@
      ;;
    openbsd*)
      SYS=openbsd
-@@ -26098,7 +26095,7 @@ main ()
+@@ -25539,7 +25536,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -19,7 +19,7 @@
  
          ac_cv_c_o4=yes
  
-@@ -26142,7 +26139,7 @@ main ()
+@@ -25583,7 +25580,7 @@ main ()
    return 0;
  }
  _ACEOF
@@ -28,7 +28,7 @@
  
            ac_cv_c_o3=yes
  
-@@ -27336,7 +27333,7 @@ _ACEOF
+@@ -26777,7 +26774,7 @@ _ACEOF
  if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_altivec_inline="yes"
  else
@@ -37,7 +37,7 @@
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -27349,7 +27346,7 @@ asm volatile("vperm 0,1,2,3");
+@@ -26790,7 +26787,7 @@ asm volatile("vperm 0,1,2,3");
  }
  _ACEOF
  if ac_fn_c_try_compile "$LINENO"; then :
@@ -46,3 +46,12 @@
  else
    ac_cv_altivec_inline=no
  fi
+@@ -49199,7 +49196,7 @@ fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+ 
+-        as_fn_error $? "\"You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c\"" "$LINENO" 5
++        $as_echo "Qt-5.5.x found. Ensure Qt I78ef29975181ee22429c9bd4b11d96d9e68b7a9c is backported." >&5
+ 
+ fi
+ 
diff --git a/multimedia/vlc/files/patch-share-lua-intf-cli.lua b/multimedia/vlc/files/patch-share-lua-intf-cli.lua
deleted file mode 100644
index 143471138051..000000000000
--- a/multimedia/vlc/files/patch-share-lua-intf-cli.lua
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/lua/intf/cli.lua.orig	2015-07-11 02:39:34.126886159 +0000
-+++ share/lua/intf/cli.lua	2015-07-11 02:54:46.665888389 +0000
-@@ -343,7 +343,7 @@
-                 end
-                 if val.args then str = str .. " " .. val.args end
-                 if #str%2 == 1 then str = str .. " " end
--                str = str .. string.rep(" .",(width-(#str+#val.help)-1)/2)
-+                str = str .. string.rep(" .",math.floor((width-(#str+#val.help)-1)/2))
-                 str = str .. string.rep(" ",width-#str-#val.help) .. val.help
-             end
-             client:append(str)
diff --git a/multimedia/vlc/files/patch-vendor-00-ce91452 b/multimedia/vlc/files/patch-vendor-00-ce91452
deleted file mode 100644
index fa5a6a92a319..000000000000
--- a/multimedia/vlc/files/patch-vendor-00-ce91452
+++ /dev/null
@@ -1,29 +0,0 @@
-From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcartegnie@free.fr>
-Date: Mon, 3 Aug 2015 15:17:32 +0200
-Subject: [PATCH] demux: mp4: correctly match release function
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/demux/mp4/libmp4.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git modules/demux/mp4/libmp4.c modules/demux/mp4/libmp4.c
-index 331262b..f220e51 100644
---- modules/demux/mp4/libmp4.c
-+++ modules/demux/mp4/libmp4.c
-@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
-     {
-         for( i_index = 0; ; i_index++ )
-         {
-+            if ( MP4_Box_Function[i_index].i_parent &&
-+                 p_box->p_father &&
-+                 p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
-+                continue;
-+
-             if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
-                 ( MP4_Box_Function[i_index].i_type == 0 ) )
-             {
--- 
-1.7.10.4
-
diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist
index b15c8062476e..f22fd7c5cb58 100644
--- a/multimedia/vlc/pkg-plist
+++ b/multimedia/vlc/pkg-plist
@@ -170,10 +170,12 @@ share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/km/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/kn/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/vlc.mo
+%%NLS%%share/locale/ks_IN/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ky/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/lg/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/vlc.mo
+%%NLS%%share/locale/mai/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/mn/LC_MESSAGES/vlc.mo