summaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile5
-rw-r--r--multimedia/vlc/PLIST4
-rw-r--r--multimedia/vlc/distinfo12
-rw-r--r--multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp12
4 files changed, 17 insertions, 16 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 050c44276c9..47a9e46e45e 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.188 2016/03/05 11:29:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.189 2016/05/12 15:56:15 wiz Exp $
DISTNAME= vlc-${VLC_VERSION}
-PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vlc/} \
http://download.videolan.org/pub/videolan/vlc/${VLC_VERSION}/
EXTRACT_SUFX= .tar.xz
-VLC_VERSION= 2.2.1
+VLC_VERSION= 2.2.3
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.videolan.org/
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 75586d19197..b07e583a2b8 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2015/10/25 11:00:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.57 2016/05/12 15:56:15 wiz Exp $
bin/cvlc
${PLIST.x11}bin/qvlc
bin/rvlc
@@ -492,10 +492,12 @@ share/locale/kk/LC_MESSAGES/vlc.mo
share/locale/km/LC_MESSAGES/vlc.mo
share/locale/kn/LC_MESSAGES/vlc.mo
share/locale/ko/LC_MESSAGES/vlc.mo
+share/locale/ks_IN/LC_MESSAGES/vlc.mo
share/locale/ky/LC_MESSAGES/vlc.mo
share/locale/lg/LC_MESSAGES/vlc.mo
share/locale/lt/LC_MESSAGES/vlc.mo
share/locale/lv/LC_MESSAGES/vlc.mo
+share/locale/mai/LC_MESSAGES/vlc.mo
share/locale/mk/LC_MESSAGES/vlc.mo
share/locale/ml/LC_MESSAGES/vlc.mo
share/locale/mn/LC_MESSAGES/vlc.mo
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index a0329339ff7..20bece02798 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2015/11/03 23:54:33 agc Exp $
+$NetBSD: distinfo,v 1.69 2016/05/12 15:56:15 wiz Exp $
-SHA1 (vlc-2.2.1.tar.xz) = ee8535c5966217bc2069a74c1d4e8c32609656e9
-RMD160 (vlc-2.2.1.tar.xz) = 3b199e3555e8aa52a760a9ed7b89874c782e0dff
-SHA512 (vlc-2.2.1.tar.xz) = 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de
-Size (vlc-2.2.1.tar.xz) = 20940288 bytes
+SHA1 (vlc-2.2.3.tar.xz) = 8d83c7b81e63956fdcb5cbee58cb2474d06baeae
+RMD160 (vlc-2.2.3.tar.xz) = 8c6d4194da37210fe409c965f430898fbe7f2416
+SHA512 (vlc-2.2.3.tar.xz) = 8469a8e0a6ff7ef4beac940d69d310dd4a4c9d44fb1dc8101dc8b697fc6357b5fda03f8f1096015aae7c425c6cca196415b9567fe7d96a991f020d452f976e5e
+Size (vlc-2.2.3.tar.xz) = 21835204 bytes
SHA1 (patch-bin_override.c) = 0190b65ec29ccdb7ef89d7c6af74a6bfdfc17076
SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd
SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee
@@ -18,7 +18,7 @@ SHA1 (patch-modules_gui_qt4_components_extended__panels.cpp) = eaa7a4732fa5a462d
SHA1 (patch-modules_gui_qt4_components_interface__widgets.cpp) = b630de531ec90afd1f2aecc769f34952780b6ddb
SHA1 (patch-modules_gui_qt4_components_interface__widgets.hpp) = 9ac2782bcb1a306123662fd3e4f44b82149c111a
SHA1 (patch-modules_gui_qt4_dialogs_messages.cpp) = 8f4abf85ecd435bb1d2964e5ac16fc09ecaa5ab0
-SHA1 (patch-modules_gui_qt4_input__manager.cpp) = 81c09ba0d042f0a0684092255f322b6aeaad08be
+SHA1 (patch-modules_gui_qt4_input__manager.cpp) = cf9db2c8a4bd4b6080cca0534dcc5065555c6d4a
SHA1 (patch-modules_gui_qt4_input__manager.hpp) = ccc5f5fd53942f168e95d472731ee3f6a4d8ddb0
SHA1 (patch-modules_gui_qt4_main__interface.cpp) = 11b9600a6e3c11268afc7c38859c5b62a1e8ee0d
SHA1 (patch-modules_gui_qt4_main__interface.hpp) = 1c3028519662d99c023375c5ee74e9f490c16f3c
diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp
index d271e8d40cd..15bf09db7dc 100644
--- a/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp
+++ b/multimedia/vlc/patches/patch-modules_gui_qt4_input__manager.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-modules_gui_qt4_input__manager.cpp,v 1.1 2015/10/25 11:00:18 wiz Exp $
+$NetBSD: patch-modules_gui_qt4_input__manager.cpp,v 1.2 2016/05/12 15:56:15 wiz Exp $
Qt's MOC doesn't handle int64_t, so introduce a meaningful type name
so that slot/signal/connection macros work properly.
---- modules/gui/qt4/input_manager.cpp.orig 2015-04-12 21:29:20.000000000 +0000
+--- modules/gui/qt4/input_manager.cpp.orig 2016-04-18 11:10:31.000000000 +0000
+++ modules/gui/qt4/input_manager.cpp
@@ -138,7 +138,7 @@ void InputManager::setInput( input_threa
!var_GetFloat( p_input, "start-time" ) &&
@@ -12,9 +12,9 @@ so that slot/signal/connection macros work properly.
- emit resumePlayback( (int64_t)i_time * 1000 );
+ emit resumePlayback( (putime_t)i_time * 1000 );
}
- }
-
-@@ -446,7 +446,7 @@ void InputManager::UpdatePosition()
+ playlist_Lock( THEPL );
+ // Add root items only
+@@ -453,7 +453,7 @@ void InputManager::UpdatePosition()
{
/* Update position */
int i_length;
@@ -23,7 +23,7 @@ so that slot/signal/connection macros work properly.
float f_pos;
i_length = var_GetTime( p_input , "length" ) / CLOCK_FREQ;
i_time = var_GetTime( p_input , "time");
-@@ -981,21 +981,21 @@ void InputManager::setAtoB()
+@@ -995,21 +995,21 @@ void InputManager::setAtoB()
{
timeB = var_GetTime( THEMIM->getInput(), "time" );
var_SetTime( THEMIM->getInput(), "time" , timeA );