main/vlc: upgrade to 2.2.0

remove unneeded patches

12 files changed, 38 insertions, 538 deletions

diff --git a/main/vlc/0001-omxil-Release-picture-in-direct-rendering-mode.patch b/main/vlc/0001-omxil-Release-picture-in-direct-rendering-mode.patch
deleted file mode 100644
index 2ff3d82e22..0000000000
--- a/main/vlc/0001-omxil-Release-picture-in-direct-rendering-mode.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fe0d4afb9df270cadeea42675552029471646279 Mon Sep 17 00:00:00 2001
-From: Julian Scheel <julian@jusst.de>
-Date: Wed, 21 Aug 2013 10:53:41 +0200
-Subject: [PATCH] omxil: Release picture in direct rendering mode.
-
-In direct rendering mode a picture reference is acquired from the video output
-module. This reference has to be released when the internal omx buffer which
-uses this reference is freed. This avoids a blocking condition where the video
-output would wait for a picture to be freed forever.
-
-Signed-off-by: Julian Scheel <julian@jusst.de>
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/codec/omxil/omxil.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
-index c49b7e5..71ee9b0 100644
---- a/modules/codec/omxil/omxil.c
-+++ b/modules/codec/omxil/omxil.c
-@@ -1047,6 +1047,8 @@ static OMX_ERRORTYPE PortReconfigure(decoder_t *p_dec, OmxPort *p_port)
-     for(i = 0; i < p_port->i_buffers; i++)
-     {
-         OMX_FIFO_GET(&p_port->fifo, p_buffer);
-+        if (p_buffer->pAppPrivate != NULL)
-+            decoder_DeletePicture( p_dec, p_buffer->pAppPrivate );
-         if (p_buffer->nFlags & SENTINEL_FLAG) {
-             free(p_buffer);
-             i--;
--- 
-1.8.5.2
-
diff --git a/main/vlc/0002-omxil-vout-Handle-dynamic-aspect-changes.patch b/main/vlc/0002-omxil-vout-Handle-dynamic-aspect-changes.patch
deleted file mode 100644
index d2dd8572f9..0000000000
--- a/main/vlc/0002-omxil-vout-Handle-dynamic-aspect-changes.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 3b564f5f943a0687706ff5f1b6a70288eacfd909 Mon Sep 17 00:00:00 2001
-From: Julian Scheel <julian@jusst.de>
-Date: Thu, 5 Sep 2013 16:03:01 +0200
-Subject: [PATCH] omxil: vout: Handle dynamic aspect changes.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Handle changes of aspect ratio through the Control handler.
-
-Signed-off-by: Julian Scheel <julian@jusst.de>
-Signed-off-by: Martin Storsjö <martin@martin.st>
----
- modules/codec/omxil/vout.c | 33 +++++++++++++++++++++++++--------
- 1 file changed, 25 insertions(+), 8 deletions(-)
-
-diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
-index 48aa744..d0864ae 100644
---- a/modules/codec/omxil/vout.c
-+++ b/modules/codec/omxil/vout.c
-@@ -126,6 +126,22 @@ static OMX_ERRORTYPE OmxFillBufferDone(OMX_HANDLETYPE omx_handle,
-     return OMX_ErrorNone;
- }
- 
-+static void UpdateDisplaySize(vout_display_t *vd, vout_display_cfg_t *cfg)
-+{
-+    OMX_CONFIG_DISPLAYREGIONTYPE config_display;
-+    OMX_INIT_STRUCTURE(config_display);
-+
-+    /* OMX_DISPLAY_SET_PIXEL is broadcom specific */
-+    if (strcmp(vd->sys->psz_component, "OMX.broadcom.video_render"))
-+        return;
-+
-+    config_display.nPortIndex = vd->sys->port.i_port_index;
-+    config_display.set = OMX_DISPLAY_SET_PIXEL;
-+    config_display.pixel_x = cfg->display.width  * vd->fmt.i_height;
-+    config_display.pixel_y = cfg->display.height * vd->fmt.i_width;
-+    OMX_SetConfig(vd->sys->omx_handle, OMX_IndexConfigDisplayRegion, &config_display);
-+}
-+
- static int Open(vlc_object_t *p_this)
- {
-     vout_display_t *vd = (vout_display_t *)p_this;
-@@ -261,12 +277,7 @@ static int Open(vlc_object_t *p_this)
-         config_display.fullscreen = OMX_TRUE;
-         OMX_SetConfig(p_sys->omx_handle, OMX_IndexConfigDisplayRegion, &config_display);
- 
--        if (vd->fmt.i_width != vd->cfg->display.width || vd->fmt.i_height != vd->cfg->display.height) {
--            config_display.set = OMX_DISPLAY_SET_PIXEL;
--            config_display.pixel_x = vd->cfg->display.width  * vd->fmt.i_height;
--            config_display.pixel_y = vd->cfg->display.height * vd->fmt.i_width;
--            OMX_SetConfig(p_sys->omx_handle, OMX_IndexConfigDisplayRegion, &config_display);
--        }
-+        UpdateDisplaySize(vd, vd->cfg);
-     }
- 
- 
-@@ -444,12 +455,18 @@ static int Control(vout_display_t *vd, int query, va_list args)
-     default:
-         msg_Err(vd, "Unknown request in omxil vout display");
- 
-+    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
-+        return VLC_SUCCESS;
-+    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
-+    {
-+        const vout_display_cfg_t *cfg = va_arg(args, const vout_display_cfg_t *);
-+        UpdateDisplaySize(vd, cfg);
-+        return VLC_SUCCESS;
-+    }
-     case VOUT_DISPLAY_CHANGE_FULLSCREEN:
-     case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
--    case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
-     case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
-     case VOUT_DISPLAY_CHANGE_ZOOM:
--    case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
-     case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
-     case VOUT_DISPLAY_GET_OPENGL:
-         return VLC_EGENERIC;
--- 
-1.8.5.2
-
diff --git a/main/vlc/0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch b/main/vlc/0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
deleted file mode 100644
index 02e19562f2..0000000000
--- a/main/vlc/0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From d32d532b62595b17dd88ea4e2e424cb11337118a Mon Sep 17 00:00:00 2001
-From: Julian Scheel <julian@jusst.de>
-Date: Thu, 5 Sep 2013 16:10:32 +0200
-Subject: [PATCH] omxil: rpi: Fetch pixel aspect ratio from decoder.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The broadcom omx implementation has a vendor extension to fetch pixel aspect
-information from the decoder. Use this to pass proper aspect information with
-the pictures.
-
-Signed-off-by: Julian Scheel <julian@jusst.de>
-Signed-off-by: Martin Storsjö <martin@martin.st>
----
- modules/codec/omxil/omxil.c | 63 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 63 insertions(+)
-
-diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
-index 59679f6..0fafedf 100644
---- a/modules/codec/omxil/omxil.c
-+++ b/modules/codec/omxil/omxil.c
-@@ -39,6 +39,7 @@
- 
- #include "omxil.h"
- #include "omxil_core.h"
-+#include "OMX_Broadcom.h"
- 
- #ifndef NDEBUG
- # define OMXIL_EXTRA_DEBUG
-@@ -46,6 +47,13 @@
- 
- #define SENTINEL_FLAG 0x10000
- 
-+/* Defined in the broadcom version of OMX_Index.h */
-+#define OMX_IndexConfigRequestCallback 0x7f000063
-+#define OMX_IndexParamBrcmPixelAspectRatio 0x7f00004d
-+
-+/* Defined in the broadcom version of OMX_Core.h */
-+#define OMX_EventParamOrConfigChanged 0x7F000001
-+
- /*****************************************************************************
-  * Local prototypes
-  *****************************************************************************/
-@@ -345,6 +353,34 @@ static OMX_ERRORTYPE SetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
-     return omx_error;
- }
- 
-+
-+/*****************************************************************************
-+ * UpdatePixelAspect: Update vlc pixel aspect based on the aspect reported on
-+ * the omx port - NOTE: Broadcom specific
-+ *****************************************************************************/
-+static OMX_ERRORTYPE UpdatePixelAspect(decoder_t *p_dec)
-+{
-+    decoder_sys_t *p_sys = p_dec->p_sys;
-+    OMX_CONFIG_POINTTYPE pixel_aspect;
-+    OMX_INIT_STRUCTURE(pixel_aspect);
-+    OMX_ERRORTYPE omx_err;
-+
-+    if (strncmp(p_sys->psz_component, "OMX.broadcom.", 13))
-+        return OMX_ErrorNotImplemented;
-+
-+    pixel_aspect.nPortIndex = p_sys->out.i_port_index;
-+    omx_err = OMX_GetParameter(p_sys->omx_handle,
-+            OMX_IndexParamBrcmPixelAspectRatio, &pixel_aspect);
-+    if (omx_err != OMX_ErrorNone) {
-+        msg_Warn(p_dec, "Failed to retrieve aspect ratio");
-+    } else {
-+        p_dec->fmt_out.video.i_sar_num = pixel_aspect.nX;
-+        p_dec->fmt_out.video.i_sar_den = pixel_aspect.nY;
-+    }
-+
-+    return omx_err;
-+}
-+
- /*****************************************************************************
-  * GetPortDefinition: set vlc format based on the definition of the omx port
-  *****************************************************************************/
-@@ -430,6 +466,7 @@ static OMX_ERRORTYPE GetPortDefinition(decoder_t *p_dec, OmxPort *p_port,
-             def->format.video.nStride = p_port->i_frame_stride;
- #endif
-         p_port->i_frame_stride = def->format.video.nStride;
-+        UpdatePixelAspect(p_dec);
-         break;
- 
-     case AUDIO_ES:
-@@ -683,6 +720,23 @@ static OMX_ERRORTYPE InitialiseComponent(decoder_t *p_dec,
-         }
-     }
- 
-+    if(!strncmp(p_sys->psz_component, "OMX.broadcom.", 13))
-+    {
-+        OMX_CONFIG_REQUESTCALLBACKTYPE notifications;
-+        OMX_INIT_STRUCTURE(notifications);
-+
-+        notifications.nPortIndex = p_sys->out.i_port_index;
-+        notifications.nIndex = OMX_IndexParamBrcmPixelAspectRatio;
-+        notifications.bEnable = OMX_TRUE;
-+
-+        omx_error = OMX_SetParameter(omx_handle,
-+                OMX_IndexConfigRequestCallback, &notifications);
-+        if (omx_error == OMX_ErrorNone)
-+            msg_Dbg(p_dec, "Enabled aspect ratio notifications");
-+        else
-+            msg_Dbg(p_dec, "Could not enable aspect ratio notifications");
-+    }
-+
-     /* Set port definitions */
-     for(i = 0; i < p_sys->ports; i++)
-     {
-@@ -796,6 +850,12 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
-         p_dec->fmt_out.video = p_dec->fmt_in.video;
-         p_dec->fmt_out.audio = p_dec->fmt_in.audio;
-         p_dec->fmt_out.i_codec = 0;
-+
-+        /* set default aspect of 1, if parser did not set it */
-+        if (p_dec->fmt_out.video.i_sar_num == 0)
-+            p_dec->fmt_out.video.i_sar_num = 1;
-+        if (p_dec->fmt_out.video.i_sar_den == 0)
-+            p_dec->fmt_out.video.i_sar_den = 1;
-     }
-     p_sys->b_enc = b_encode;
-     InitOmxEventQueue(&p_sys->event_queue);
-@@ -1615,6 +1675,9 @@ static OMX_ERRORTYPE OmxEventHandler( OMX_HANDLETYPE omx_handle,
-             msg_Dbg( p_dec, "Unhandled setting change %x", (unsigned int)data_2 );
-         }
-         break;
-+    case OMX_EventParamOrConfigChanged:
-+        UpdatePixelAspect(p_dec);
-+        break;
- 
-     default:
-         break;
--- 
-1.8.5.2
-
diff --git a/main/vlc/0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch b/main/vlc/0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
deleted file mode 100644
index 502f9671ce..0000000000
--- a/main/vlc/0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 18cbe9639c57d5d3cc676909c64acd89997bcac3 Mon Sep 17 00:00:00 2001
-From: Julian Scheel <julian@jusst.de>
-Date: Thu, 12 Sep 2013 10:14:13 +0200
-Subject: [PATCH] omxil: bcm: h264: Don't wait for error free frame.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The bcm h264 decoder is not able to detect when the first error free frame has
-been decoded for certain h264 streams. To avoid not getting any frames out of
-the decoder, disable the StartWithValidFrame flag until that is fixed at bcm.
-See https://github.com/huceke/omxplayer/issues/96 for details.
-
-Signed-off-by: Julian Scheel <julian@jusst.de>
-Signed-off-by: Martin Storsjö <martin@martin.st>
----
- modules/codec/omxil/omxil.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
-index 0fafedf..da86e23 100644
---- a/modules/codec/omxil/omxil.c
-+++ b/modules/codec/omxil/omxil.c
-@@ -50,6 +50,7 @@
- /* Defined in the broadcom version of OMX_Index.h */
- #define OMX_IndexConfigRequestCallback 0x7f000063
- #define OMX_IndexParamBrcmPixelAspectRatio 0x7f00004d
-+#define OMX_IndexParamBrcmVideoDecodeErrorConcealment 0x7f000080
- 
- /* Defined in the broadcom version of OMX_Core.h */
- #define OMX_EventParamOrConfigChanged 0x7F000001
-@@ -745,6 +746,21 @@ static OMX_ERRORTYPE InitialiseComponent(decoder_t *p_dec,
-         if(omx_error != OMX_ErrorNone) goto error;
-     }
- 
-+    if(!strncmp(p_sys->psz_component, "OMX.broadcom.", 13) &&
-+        p_sys->in.p_fmt->i_codec == VLC_CODEC_H264)
-+    {
-+        OMX_PARAM_BRCMVIDEODECODEERRORCONCEALMENTTYPE concanParam;
-+        OMX_INIT_STRUCTURE(concanParam);
-+        concanParam.bStartWithValidFrame = OMX_FALSE;
-+
-+        omx_error = OMX_SetParameter(omx_handle,
-+                OMX_IndexParamBrcmVideoDecodeErrorConcealment, &concanParam);
-+        if (omx_error == OMX_ErrorNone)
-+            msg_Dbg(p_dec, "StartWithValidFrame disabled.");
-+        else
-+            msg_Dbg(p_dec, "Could not disable StartWithValidFrame.");
-+    }
-+
-     /* Allocate our array for the omx buffers and enable ports */
-     for(i = 0; i < p_sys->ports; i++)
-     {
--- 
-1.8.5.2
-
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 5464c43a71..c82cbefbd0 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -2,10 +2,10 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vlc
-pkgver=2.1.5
+pkgver=2.2.0
 _pkgver=${pkgver/_/-}
 _ver=${_pkgver%[a-z]}
-pkgrel=6
+pkgrel=0
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
 pkgusers="vlc"
@@ -106,14 +106,7 @@ makedepends="
 	"
 source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz
 	fix-waitpid-usage.patch
-	sout-transcode-monosrc.patch
-
-	0001-omxil-Release-picture-in-direct-rendering-mode.patch
-	0002-omxil-vout-Handle-dynamic-aspect-changes.patch
-	0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
-	0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
-	0010-omxil-rpi-codecs.patch
-	vlc-2.1.5-ffmpeg-2.5.patch
+	omxil-rpi-codecs.patch
 
 	vlc-libs.trigger"
 
@@ -343,33 +336,15 @@ plugins_video_filter()		{ _mv_plugins video_filter; }
 plugins_video_output()		{ _mv_plugins video_output; }
 plugins_visualization()		{ _mv_plugins visualization; }
 
-md5sums="3941b561f590cc95ca5e795213cba2f2  vlc-2.1.5.tar.xz
-7b1a482e521b9d6dcdb6710aff51894f  fix-waitpid-usage.patch
-4ba0ed24327f342e1f52dff14ca38faf  sout-transcode-monosrc.patch
-76ab721e5d303158201293c4ae5b5ba9  0001-omxil-Release-picture-in-direct-rendering-mode.patch
-3d39249940b63e20ac6c84c68ee67677  0002-omxil-vout-Handle-dynamic-aspect-changes.patch
-4209dd3c03001a921ece0f8647ecb1c5  0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
-616a2e6dc58810732146ea922819aea2  0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
-d43b448ee0ba6980ecfc5fdfa655f473  0010-omxil-rpi-codecs.patch
-068a1b792064bb1aff0765a3ffa8a27a  vlc-2.1.5-ffmpeg-2.5.patch
+md5sums="faeceb614bf3946e5f90ef0d1f51db45  vlc-2.2.0.tar.xz
+b28925fdf3d1b0bd13e3af89668995a4  fix-waitpid-usage.patch
+b90177830fe33b93849915752eb957ce  omxil-rpi-codecs.patch
 dd899a9926ad84db9446d92890a5aa3e  vlc-libs.trigger"
-sha256sums="6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72  vlc-2.1.5.tar.xz
-0c802698c215dd2d2ad9a4889b1d46dfd5d6c304d4cd1b34bacb2bacc35dd3c9  fix-waitpid-usage.patch
-7e04144f61444e455ba1b6c8d6529506a122983764d55e0f6d4ba9884d7654a3  sout-transcode-monosrc.patch
-3ff97e9c1b4055ac9a0981fa90b6f55abe72e44d5606a963f9b66f6274672822  0001-omxil-Release-picture-in-direct-rendering-mode.patch
-f9e5d27aa46cc4ebb929afaa30f53343eb40347915ec827cf461a42745fa525a  0002-omxil-vout-Handle-dynamic-aspect-changes.patch
-7709d3fa0090e4aa8fb21eff55320fa11b681e6b7a8faab24b4473645cda3112  0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
-fe0b937e0b0a05b7d2cccd27dab49df77e84928e49fb148bae3d0effeb261d2f  0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
-11db39f206ddb968d6a4411c75bfa6102189cb8e784316c491dd964ee9a3dfaf  0010-omxil-rpi-codecs.patch
-250949a9c984e5b98adbcf57c39a2d6508a10f18190fe072fb47a08ae42b478f  vlc-2.1.5-ffmpeg-2.5.patch
+sha256sums="5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517  vlc-2.2.0.tar.xz
+4f017a932d4177ba838ebd7bb0e36d8606103e62519805adff81e5edbda41026  fix-waitpid-usage.patch
+27e8f960ca091216b491980a6ffd4e35b28f2091677231ba1d317fc81b6ee039  omxil-rpi-codecs.patch
 1c93af2feb217a06f6adc3cd51def8f00eea431f9d26ace7b90c377f7e85fc7a  vlc-libs.trigger"
-sha512sums="37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32  vlc-2.1.5.tar.xz
-3c6ff4f25b7e1f0041bc47872a2b59b6c4f8bc1747d6830e9f2d9c35ee75cd2581558a12225070dede37d6a2287b0fc5c089c8f4f8ae26784aa6aded7177bed0  fix-waitpid-usage.patch
-2ee570e9a3ccd6deef7d0a2084a4e50e844fb102a7a5865266b1774f9c80668f6a5a5cc57c319c42feb1f2eda581213b486367b4a92b35c18adb974cf6219b97  sout-transcode-monosrc.patch
-0dc1c827af73f29fe715e3d75812ca916d0feac355d7c5f7ac1696bfbf3aca31dabbdd0ec05174a1c15713c530748f9dcb1b4b87819f3a6570c86c71ac503954  0001-omxil-Release-picture-in-direct-rendering-mode.patch
-c276962f33c38ad64caa6c4f8ca673c4367635b8998ee8a1003047f89e652c535027c68a836822d9b762d1b76ad04bd04dc0d19bbfabc5c3b7d14a7ee1cdd744  0002-omxil-vout-Handle-dynamic-aspect-changes.patch
-db15b7488768b429f26e4e7fdf82259ffc834fa2bdf1461b297b36111aad87603f7b015b0855afb8bc797fb351311dee555bbef0dc0a5d029748b057a3c23f92  0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
-a9bd6f622a9868de3e0a9f6643b906a73cabcfbc79ffebafbac00a45e3eec31cbb7bc9c9ec2748c58c928e95f45b29878ac78f654e5e658413687b60aaf52683  0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
-6fb242c37bd9af224b7bcd78702ac1b5612748c7363405e594c509288940a18ae4334f032497e9d6e11f83e870b9437a5c3197db0271123c95de24db63b8802e  0010-omxil-rpi-codecs.patch
-b741e90e59eb01b7ec1ac8e99a69379eb5addcc311a9d9a0a70ed367258dfc77c607ceaffe63a5be566d3784e97eb76bca81a67bdabba4237718ff1401a917e5  vlc-2.1.5-ffmpeg-2.5.patch
+sha512sums="41162ff2dcc35edb47721c5a0f5d1346a0bcf3099c641e317ca1ce50baadeec3eef38f10355396a82e029474f6decd1e4355bbf218cadb795ccad3ff81a585bb  vlc-2.2.0.tar.xz
+680cfa3eed5501ba6f06c51eae508204f4c77d2bdd07eead1a3da3939b433abfe84025d133e7a1c7a869e4ffac374bd5eba2bd3dd242ec4645e1d1c6122d0ffb  fix-waitpid-usage.patch
+e13e398b7bfd977f6e099bcb6cf8dc5cd5bad6dea3eff715881826246dc4329468846084aff2576de2b7fd28d3f06e7c327a6e4511a28d22e5cd198a81146c89  omxil-rpi-codecs.patch
 b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406  vlc-libs.trigger"
diff --git a/main/vlc/dbus-fmaxf.patch b/main/vlc/dbus-fmaxf.patch
deleted file mode 100644
index 09561e604c..0000000000
--- a/main/vlc/dbus-fmaxf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-uclibc don't have fmaxf()
-
---- ./modules/control/dbus/dbus_player.c.orig	2013-12-11 15:00:16.338111047 +0000
-+++ ./modules/control/dbus/dbus_player.c	2013-12-11 15:01:48.649150243 +0000
-@@ -179,7 +179,7 @@
-     if( VLC_SUCCESS != DemarshalSetPropertyValue( p_from, &d_dbus_vol ) )
-         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- 
--    playlist_VolumeSet( PL, fmaxf( d_dbus_vol, 0.f ) );
-+    playlist_VolumeSet( PL, d_dbus_vol > 0.f ? d_dbus_vol : 0.f );
- 
-     REPLY_SEND;
- }
-
diff --git a/main/vlc/fix-waitpid-usage.patch b/main/vlc/fix-waitpid-usage.patch
index 01b9e1c501..dc64a4f3e1 100644
--- a/main/vlc/fix-waitpid-usage.patch
+++ b/main/vlc/fix-waitpid-usage.patch
@@ -1,6 +1,15 @@
---- vlc-2.1.0.orig/modules/misc/inhibit/xdg.c	2013-06-24 21:00:38.000000000 +0300
-+++ vlc-2.1.0/modules/misc/inhibit/xdg.c	2013-10-07 14:06:43.450029073 +0300
-@@ -66,7 +66,7 @@
+diff -ru vlc-2.2.0.orig/modules/misc/inhibit/xdg.c vlc-2.2.0/modules/misc/inhibit/xdg.c
+--- vlc-2.2.0.orig/modules/misc/inhibit/xdg.c	2015-02-28 08:48:24.264968381 -0200
++++ vlc-2.2.0/modules/misc/inhibit/xdg.c	2015-02-28 08:48:43.081636013 -0200
+@@ -26,6 +26,7 @@
+ #include <vlc_plugin.h>
+ #include <vlc_inhibit.h>
+ #include <assert.h>
++#include <errno.h>
+ #include <signal.h>
+ #include <spawn.h>
+ #include <sys/wait.h>
+@@ -65,7 +66,7 @@
      {
          int status;
  
@@ -8,10 +17,11 @@
 +        while (waitpid (pid, &status, 0) == -1 && errno != ECHILD);
      }
      else
-     {
---- vlc-2.1.0.orig/modules/stream_filter/decomp.c	2013-09-12 18:18:33.000000000 +0300
-+++ vlc-2.1.0/modules/stream_filter/decomp.c	2013-10-07 14:07:58.616288530 +0300
-@@ -386,7 +386,7 @@
+         msg_Warn (ih, "error starting xdg-screensaver: %s",
+diff -ru vlc-2.2.0.orig/modules/stream_filter/decomp.c vlc-2.2.0/modules/stream_filter/decomp.c
+--- vlc-2.2.0.orig/modules/stream_filter/decomp.c	2015-02-28 08:48:24.264968381 -0200
++++ vlc-2.2.0/modules/stream_filter/decomp.c	2015-02-28 08:40:58.824945520 -0200
+@@ -404,7 +404,7 @@
          return VLC_SUCCESS;
  
      if (p_sys->pid != -1)
@@ -20,7 +30,7 @@
      vlc_mutex_destroy (&p_sys->lock);
      vlc_cond_destroy (&p_sys->wait);
      free (p_sys);
-@@ -411,7 +411,7 @@
+@@ -429,7 +429,7 @@
          close (p_sys->write_fd);
  
      msg_Dbg (obj, "waiting for PID %u", (unsigned)p_sys->pid);
@@ -29,8 +39,9 @@
      msg_Dbg (obj, "exit status %d", status);
  
      if (p_sys->peeked)
---- vlc-2.1.0.orig/src/posix/netconf.c	2013-06-24 21:00:39.000000000 +0300
-+++ vlc-2.1.0/src/posix/netconf.c	2013-10-07 14:05:49.603654117 +0300
+diff -ru vlc-2.2.0.orig/src/posix/netconf.c vlc-2.2.0/src/posix/netconf.c
+--- vlc-2.2.0.orig/src/posix/netconf.c	2015-02-28 08:48:24.264968381 -0200
++++ vlc-2.2.0/src/posix/netconf.c	2015-02-28 08:40:58.824945520 -0200
 @@ -28,6 +28,7 @@
  
  #include <sys/types.h>
@@ -39,7 +50,7 @@
  #include <fcntl.h>
  #include <spawn.h>
  #include <unistd.h>
-@@ -93,7 +93,7 @@
+@@ -94,7 +95,7 @@
          while (len < sizeof (buf));
  
          close(fd[0]);
diff --git a/main/vlc/0010-omxil-rpi-codecs.patch b/main/vlc/omxil-rpi-codecs.patch
index 8fb8017e76..9b7accfe79 100644
--- a/main/vlc/0010-omxil-rpi-codecs.patch
+++ b/main/vlc/omxil-rpi-codecs.patch
@@ -1,11 +1,10 @@
---- vlc-2.1.2.orig/modules/codec/omxil/omxil_core.c
-+++ vlc-2.1.2/modules/codec/omxil/omxil_core.c
-@@ -202,6 +202,13 @@
- {
+--- vlc-2.2.0/modules/codec/omxil/omxil_core.c.orig	2015-02-28 08:37:54.044936036 -0200
++++ vlc-2.2.0/modules/codec/omxil/omxil_core.c	2015-02-28 08:38:38.738271654 -0200
+@@ -204,6 +204,12 @@
  #ifdef RPI_OMX
      { "video_decoder.avc", "OMX.broadcom.video_decode" },
+     { "video_decoder.mpeg2", "OMX.broadcom.video_decode" },
 +    { "video_decoder.mpeg4", "OMX.broadcom.video_decode" },
-+    { "video_decoder.mpeg2", "OMX.broadcom.video_decode" },
 +    { "video_decoder.vp6", "OMX.broadcom.video_decode" },
 +    { "video_decoder.vp8", "OMX.broadcom.video_decode" },
 +    { "video_decoder.theora", "OMX.broadcom.video_decode" },
diff --git a/main/vlc/sout-transcode-monosrc.patch b/main/vlc/sout-transcode-monosrc.patch
deleted file mode 100644
index 9509b535e3..0000000000
--- a/main/vlc/sout-transcode-monosrc.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Timo Teräs
-
-Posted upstream, see:
-https://trac.videolan.org/vlc/ticket/12122
-
-diff -ru vlc-2.1.5.orig/modules/audio_filter/channel_mixer/trivial.c vlc-2.1.5/modules/audio_filter/channel_mixer/trivial.c
---- vlc-2.1.5.orig/modules/audio_filter/channel_mixer/trivial.c	2013-06-24 21:00:38.000000000 -0300
-+++ vlc-2.1.5/modules/audio_filter/channel_mixer/trivial.c	2014-09-12 16:16:49.288413334 -0300
-@@ -133,7 +133,9 @@
-         {
-             p_src++;
-         }
--        if ( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_CENTER )
-+        if ( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_CENTER ||
-+             p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_LEFT ||
-+             p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_RIGHT )
-         {
-             /* Mono mode */
-             for ( i = p_in_buf->i_nb_samples; i--; )
-diff -ru vlc-2.1.5.orig/modules/stream_out/transcode/audio.c vlc-2.1.5/modules/stream_out/transcode/audio.c
---- vlc-2.1.5.orig/modules/stream_out/transcode/audio.c	2014-04-22 11:03:57.000000000 -0300
-+++ vlc-2.1.5/modules/stream_out/transcode/audio.c	2014-09-12 16:28:50.805087137 -0300
-@@ -35,6 +35,11 @@
- #include <vlc_meta.h>
- #include <vlc_modules.h>
- 
-+static const int pi_mono_channel_maps[3] =
-+{
-+    AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
-+};
-+
- static const int pi_channels_maps[6] =
- {
-     0,
-@@ -167,7 +172,11 @@
-     if( !id->p_encoder->fmt_in.audio.i_physical_channels
-      || !id->p_encoder->fmt_in.audio.i_original_channels )
-     {
--        if( id->p_encoder->fmt_in.audio.i_channels < 6 )
-+        if (id->p_encoder->fmt_in.audio.i_channels == 1)
-+            id->p_encoder->fmt_in.audio.i_physical_channels =
-+            id->p_encoder->fmt_in.audio.i_original_channels =
-+                      pi_mono_channel_maps[p_sys->i_mono_source];
-+        else if( id->p_encoder->fmt_in.audio.i_channels < 6 )
-             id->p_encoder->fmt_in.audio.i_physical_channels =
-             id->p_encoder->fmt_in.audio.i_original_channels =
-                       pi_channels_maps[id->p_encoder->fmt_in.audio.i_channels];
-diff -ru vlc-2.1.5.orig/modules/stream_out/transcode/transcode.c vlc-2.1.5/modules/stream_out/transcode/transcode.c
---- vlc-2.1.5.orig/modules/stream_out/transcode/transcode.c	2013-06-24 21:00:38.000000000 -0300
-+++ vlc-2.1.5/modules/stream_out/transcode/transcode.c	2014-09-12 11:58:28.988259972 -0300
-@@ -99,6 +99,9 @@
- #define ACHANS_TEXT N_("Audio channels")
- #define ACHANS_LONGTEXT N_( \
-     "Number of audio channels in the transcoded streams." )
-+#define AMONOSRC_TEXT N_("Audio source for mono")
-+#define AMONOSRC_LONGTEXT N_( \
-+    "Audio source channel for mono output (0=center, 1=left, 2=right)." )
- #define AFILTER_TEXT N_("Audio filter")
- #define AFILTER_LONGTEXT N_( \
-     "Audio filters will be applied to the audio streams (after conversion " \
-@@ -199,6 +202,8 @@
-                 ALANG_LONGTEXT, true )
-     add_integer( SOUT_CFG_PREFIX "channels", 0, ACHANS_TEXT,
-                  ACHANS_LONGTEXT, false )
-+    add_integer( SOUT_CFG_PREFIX "monosrc", 0, AMONOSRC_TEXT,
-+                 AMONOSRC_LONGTEXT, false )
-     add_integer( SOUT_CFG_PREFIX "samplerate", 0, ARATE_TEXT,
-                  ARATE_LONGTEXT, true )
-     add_bool( SOUT_CFG_PREFIX "audio-sync", false, ASYNC_TEXT,
-@@ -232,7 +237,7 @@
-     "venc", "vcodec", "vb",
-     "scale", "fps", "width", "height", "vfilter", "deinterlace",
-     "deinterlace-module", "threads", "hurry-up", "aenc", "acodec", "ab", "alang",
--    "afilter", "samplerate", "channels", "senc", "scodec", "soverlay",
-+    "afilter", "samplerate", "channels", "monosrc", "senc", "scodec", "soverlay",
-     "sfilter", "osd", "audio-sync", "high-priority", "maxwidth", "maxheight",
-     NULL
- };
-@@ -296,6 +301,8 @@
- 
-     p_sys->i_channels = var_GetInteger( p_stream, SOUT_CFG_PREFIX "channels" );
- 
-+    p_sys->i_mono_source = var_GetInteger( p_stream, SOUT_CFG_PREFIX "monosrc" );
-+
-     if( p_sys->i_acodec )
-     {
-         if( ( p_sys->i_acodec == VLC_CODEC_MP3 ||
-diff -ru vlc-2.1.5.orig/modules/stream_out/transcode/transcode.h vlc-2.1.5/modules/stream_out/transcode/transcode.h
---- vlc-2.1.5.orig/modules/stream_out/transcode/transcode.h	2014-04-22 11:03:57.000000000 -0300
-+++ vlc-2.1.5/modules/stream_out/transcode/transcode.h	2014-09-12 11:50:13.548255065 -0300
-@@ -31,6 +31,7 @@
-     config_chain_t  *p_audio_cfg;
-     uint32_t        i_sample_rate;
-     uint32_t        i_channels;
-+    uint32_t        i_mono_source;
-     int             i_abitrate;
- 
-     char            *psz_af;
-diff -ru vlc-2.1.5.orig/src/audio_output/common.c vlc-2.1.5/src/audio_output/common.c
---- vlc-2.1.5.orig/src/audio_output/common.c	2013-12-03 11:12:35.000000000 -0200
-+++ vlc-2.1.5/src/audio_output/common.c	2014-09-12 16:26:54.821752658 -0300
-@@ -107,13 +107,12 @@
-     case AOUT_CHAN_LEFT:
-     case AOUT_CHAN_RIGHT:
-     case AOUT_CHAN_CENTER:
--        if ( (p_format->i_original_channels & AOUT_CHAN_CENTER)
--              || (p_format->i_original_channels
--                   & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
--            return "Mono";
--        else if ( p_format->i_original_channels & AOUT_CHAN_LEFT )
-+        if ( p_format->i_original_channels & AOUT_CHAN_LEFT )
-             return "Left";
--        return "Right";
-+        else if ( p_format->i_original_channels & AOUT_CHAN_RIGHT )
-+            return "Right";
-+        return "Mono";
-+
-     case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
-         if ( p_format->i_original_channels & AOUT_CHAN_REVERSESTEREO )
-         {
diff --git a/main/vlc/uclibc-define-fminf.patch b/main/vlc/uclibc-define-fminf.patch
deleted file mode 100644
index 7524b7dafe..0000000000
--- a/main/vlc/uclibc-define-fminf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rupN a/src/audio_output/volume.c b/src/audio_output/volume.c
---- a/src/audio_output/volume.c	2013-09-12 17:18:34.000000000 +0200
-+++ b/src/audio_output/volume.c	2013-09-26 15:43:35.889675700 +0200
-@@ -33,6 +33,13 @@
- #include <vlc_aout_volume.h>
- #include "aout_internal.h"
- 
-+#ifdef __UCLIBC__
-+float fminf(float a, float b)
-+{
-+    return (a < b) ? a : b;
-+}
-+#endif
-+
- struct aout_volume
- {
-     audio_volume_t object;
diff --git a/main/vlc/uclibc-fix-idn.patch b/main/vlc/uclibc-fix-idn.patch
deleted file mode 100644
index a93a26b85e..0000000000
--- a/main/vlc/uclibc-fix-idn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru vlc-2.1.0.orig/include/vlc_network.h vlc-2.1.0/include/vlc_network.h
---- vlc-2.1.0.orig/include/vlc_network.h	2013-06-24 21:00:38.000000000 +0300
-+++ vlc-2.1.0/include/vlc_network.h	2013-10-06 21:59:53.275530885 +0300
-@@ -222,6 +222,9 @@
- #ifndef AI_NUMERICSERV
- # define AI_NUMERICSERV 0
- #endif
-+#if defined(__UCLIBC__)
-+#undef AI_IDN
-+#endif
- #ifndef AI_IDN
- # define AI_IDN 0 /* GNU/libc extension */
- #endif
diff --git a/main/vlc/vlc-2.1.5-ffmpeg-2.5.patch b/main/vlc/vlc-2.1.5-ffmpeg-2.5.patch
deleted file mode 100644
index 2bd0949ecf..0000000000
--- a/main/vlc/vlc-2.1.5-ffmpeg-2.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a684338..053713a 100644
---- a/configure.ac
-+++ b/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}"