multimedia/vlc: Updated for version 2.2.2

4 files changed, 7 insertions, 62 deletions

diff --git a/multimedia/vlc/patch-freerdp_vlc221.diff b/multimedia/vlc/patch-freerdp_vlc221.diff
deleted file mode 100644
index df3e5c683d..0000000000
--- a/multimedia/vlc/patch-freerdp_vlc221.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- modules/access/rdp.c.orig	2015-04-28 21:38:25.117593997 +1000
-+++ modules/access/rdp.c	2015-04-28 21:42:40.133609568 +1000
-@@ -83,7 +83,7 @@
-     set_category( CAT_INPUT )
-     set_subcategory( SUBCAT_INPUT_ACCESS )
-     set_description( N_("RDP Remote Desktop") )
--    set_capability( "access_demux", 10 )
-+    set_capability( "access_demux", 0 )
- 
-     add_string( CFG_PREFIX "user", NULL, RDP_USER, RDP_USER, false )
-         change_safe()
-@@ -233,7 +233,7 @@
-     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
- 
-     msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
--#if (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )
-+#if defined(FREERDP_VERSION_MAJOR)  && (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )
-              p_instance->settings->DesktopWidth,
-              p_instance->settings->DesktopHeight,
-              p_instance->settings->ColorDepth
-@@ -428,7 +428,9 @@
-     if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
-     p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
- 
-+#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
-     freerdp_channels_global_init();
-+#endif
- 
-     p_sys->p_instance = freerdp_new();
-     if ( !p_sys->p_instance )
-@@ -504,7 +506,9 @@
- 
-     freerdp_disconnect( p_sys->p_instance );
-     freerdp_free( p_sys->p_instance );
-+#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2
-     freerdp_channels_global_uninit();
-+#endif
- 
-     if ( p_sys->p_block )
-         block_Release( p_sys->p_block );
diff --git a/multimedia/vlc/patch-vlc-opencv3.diff b/multimedia/vlc/patch-vlc-opencv3.diff
deleted file mode 100644
index 6ffefa94d1..0000000000
--- a/multimedia/vlc/patch-vlc-opencv3.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
-index ae3af05..998f286 100644
---- a/modules/video_filter/opencv_example.cpp
-+++ b/modules/video_filter/opencv_example.cpp
-@@ -41,6 +41,8 @@
- 
- #include <opencv2/core/core_c.h>
- #include <opencv2/core/core.hpp>
-+#include <opencv2/imgproc/imgproc_c.h>
-+#include <opencv2/imgproc/imgproc.hpp>
- #include <opencv2/objdetect/objdetect.hpp>
- 
- /*****************************************************************************
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild
index 7161b5ccb1..5da0a48c40 100644
--- a/multimedia/vlc/vlc.SlackBuild
+++ b/multimedia/vlc/vlc.SlackBuild
@@ -28,8 +28,8 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=vlc
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.2.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -85,10 +85,8 @@ mkdir -p decklink/include
 unzip -o $CWD/$DECKLINKSDK
 cp -p Blackmagic\ DeckLink\ SDK\ ${DECKLINK_SDK_VERSION}/Linux/include/* decklink/include/
 
-patch -p1 < $CWD/patch-vlc-opencv3.diff
 patch -p0 < $CWD/patch-projectM-fontpath.diff
 patch -p0 < $CWD/patch_vlc_cache_gen.diff
-patch -p0 < $CWD/patch-freerdp_vlc221.diff
 
 autoreconf -f
 
diff --git a/multimedia/vlc/vlc.info b/multimedia/vlc/vlc.info
index 81d482f07e..9233c58077 100644
--- a/multimedia/vlc/vlc.info
+++ b/multimedia/vlc/vlc.info
@@ -1,12 +1,12 @@
 PRGNAM="vlc"
-VERSION="2.2.1"
+VERSION="2.2.2"
 HOMEPAGE="http://www.videolan.org/vlc/"
-DOWNLOAD="http://download.videolan.org/vlc/2.2.1/vlc-2.2.1.tar.xz \
+DOWNLOAD="http://download.videolan.org/vlc/2.2.2/vlc-2.2.2.tar.xz \
           http://software.blackmagicdesign.com/SDK/Blackmagic_DeckLink_SDK_10.1.4.zip"
-MD5SUM="42273945758b521c408fabc7fd6d9946 \
+MD5SUM="f98d60f0f59ef72b6e3407f2ff09bda6 \
         16fbc2f49dc62fecac15835c538f78d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump freerdp libdvdcss fluidsynth schroedinger libminizip chromaprint x265"
+REQUIRES="libass libdc1394 libdvbpsi libmpeg2 libupnp lua portaudio twolame opus gsm opencv libtar libkate faac libdca libmatroska libshout speex avahi projectM jack-audio-connection-kit libsidplay2 zvbi faad2 libavc1394 libmodplug musepack-tools vcdimager dirac vsxu gnome-vfs live555 rtmpdump freerdp libdvdcss fluidsynth schroedinger libminizip chromaprint x264 x265 libbluray"
 MAINTAINER="Christoph Willing"
-EMAIL="chris.willing@iinet.net.au"
+EMAIL="chris.willing@linux.com"