From bf48ef472313325ec17115f40b5f2a3ae03b0dc9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 27 Feb 2015 18:26:32 +0100
Subject: [PATCH] vlc: update to 2.2.0 (soname bump).

---
 common/shlibs                                  |  3 ++-
 srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch | 15 ---------------
 srcpkgs/vlc/template                           | 10 +++++-----
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch

diff --git a/common/shlibs b/common/shlibs
index d27350c9c0..b8f62f9faf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1375,7 +1375,8 @@ libxine.so.2 libxine-1.2.4_1
 libjbig2dec.so.0 libjbig2dec-0.11_1
 libsource-highlight.so.4 libsource-highlight-3.1.7_1
 libvlc.so.5 libvlc-2.1.1_3
-libvlccore.so.7 libvlc-2.1.1_3
+libvlccore.so.8 libvlc-2.2.0_1
+libvlc_vdpau.so.0 libvlc-2.2.0_1
 libbtrfs.so.0 libbtrfs-3.12_1
 libecore_audio.so.1 efl-1.12.0_1
 libecore_con.so.1 efl-1.12.0_1
diff --git a/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch b/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch
deleted file mode 100644
index 3dd93c91d9..0000000000
--- a/srcpkgs/vlc/patches/vlc-2.1.5-ffmpeg-2.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git configure.ac.orig configure.ac
-index a684338..053713a 100644
---- configure.ac.orig
-+++ configure.ac
-@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavcodec < 56],, [
--      AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
-+    PKG_CHECK_EXISTS([libavcodec < 57],, [
-+      AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 5c48e2bb1a..184b0ae4ea 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=2.1.5
-revision=4
+version=2.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --disable-lua --disable-live555 --disable-fluidsynth
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/vlc/"
 license="GPL-2, LGPL-2.1"
 distfiles="http://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz"
-checksum=6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72
+checksum=5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517
 
 lib32disabled=yes
 
@@ -39,7 +39,7 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ] || [ "$XBPS_TARGET_MACHINE" = "x86_64" ];
 	makedepends+=" libvdpau-devel libva-devel MesaLib-devel"
 fi
 
-if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "armv6l" ] || [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
 	# XXX only for rpi
 	configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
 	makedepends+=" rpi-firmware"
@@ -59,7 +59,7 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the
 fi
 
 if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" libnotify qt"
+	build_options_default+=" qt"
 fi
 
 pre_configure() {