vlc: update to 2.2.6

4 files changed, 24 insertions, 22 deletions

diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 149a44fb6..a5395b879 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		vlc
-PKG_VERSION:=		2.2.4
+PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		1
-PKG_HASH:=		1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be
+PKG_HASH:=		c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8
 PKG_DESCR:=		popular media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		libffmpeg xcb-util libgcrypt alsa-lib
diff --git a/package/vlc/patches/patch-configure_ac b/package/vlc/patches/patch-configure_ac
index dcae06228..ff67e1512 100644
--- a/package/vlc/patches/patch-configure_ac
+++ b/package/vlc/patches/patch-configure_ac
@@ -1,5 +1,5 @@
---- vlc-2.2.4.orig/configure.ac	2016-05-31 18:11:07.000000000 +0200
-+++ vlc-2.2.4/configure.ac	2016-09-24 20:38:04.944241100 +0200
+--- vlc-2.2.6.orig/configure.ac	2017-05-24 12:40:16.000000000 +0200
++++ vlc-2.2.6/configure.ac	2017-06-06 22:52:45.841013479 +0200
 @@ -24,7 +24,7 @@ AC_CANONICAL_BUILD
  AC_CANONICAL_HOST
  AC_PRESERVE_HELP_ORDER
@@ -17,7 +17,7 @@
      ;;
    bsdi*)
      SYS=bsdi
-@@ -534,7 +535,7 @@ need_libc=false
+@@ -537,7 +538,7 @@ need_libc=false
  
  dnl Check for usual libc functions
  AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
@@ -26,7 +26,7 @@
  AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
  AC_CHECK_FUNCS(fdatasync,,
    [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
-@@ -864,7 +865,7 @@ dnl
+@@ -867,7 +868,7 @@ dnl
  dnl  Compiler warnings
  dnl
  
@@ -35,7 +35,7 @@
  RDC_PROG_CC_FLAGS([-pipe])
  AC_LANG_PUSH([C++])
  RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
-@@ -2324,7 +2325,7 @@ AC_ARG_ENABLE(avcodec,
+@@ -2318,7 +2319,7 @@ AC_ARG_ENABLE(avcodec,
  AS_IF([test "${enable_avcodec}" != "no"], [
    PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
      PKG_CHECK_EXISTS([libavutil < 55],, [
@@ -44,7 +44,7 @@
      ])
      VLC_SAVE_FLAGS
      CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-@@ -2334,7 +2335,7 @@ AS_IF([test "${enable_avcodec}" != "no"]
+@@ -2328,7 +2329,7 @@ AS_IF([test "${enable_avcodec}" != "no"]
      VLC_RESTORE_FLAGS
      have_avcodec="yes"
    ],[
@@ -53,7 +53,7 @@
    ])
  ], [
    have_avcodec="no"
-@@ -2383,7 +2384,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
+@@ -2377,7 +2378,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
    case "${avfork}" in
      ffmpeg)
        PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
@@ -62,7 +62,7 @@
        ])
        ;;
    esac
-@@ -2417,7 +2418,7 @@ AS_IF([test "${enable_dxva2}" != "no"],
+@@ -2411,7 +2412,7 @@ AS_IF([test "${enable_dxva2}" != "no"],
      case "${avfork}" in
        ffmpeg)
          PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
@@ -71,7 +71,7 @@
          ])
          ;;
      esac
-@@ -2509,7 +2510,7 @@ AS_IF([test "${enable_avformat}" != "no"
+@@ -2503,7 +2504,7 @@ AS_IF([test "${enable_avformat}" != "no"
        ])
        VLC_RESTORE_FLAGS
      ],[
@@ -80,7 +80,7 @@
    ])
  ])
  AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"])
-@@ -2538,7 +2539,7 @@ then
+@@ -2532,7 +2533,7 @@ then
        ])
        VLC_RESTORE_FLAGS
      ],[
@@ -89,7 +89,7 @@
    ])
  fi
  
-@@ -3181,7 +3182,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
+@@ -3175,7 +3176,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
      libav) av_vdpau_ver="55.26.0" ;;
      ffmpeg) av_vdpau_ver="55.42.100"
        PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
@@ -98,7 +98,7 @@
        ])
        ;;
    esac
-@@ -4062,16 +4063,17 @@ dnl
+@@ -4056,16 +4057,17 @@ dnl
  AC_ARG_ENABLE(libgcrypt,
    [  --disable-libgcrypt     gcrypt support (default enabled)])
  AS_IF([test "${enable_libgcrypt}" != "no"], [
diff --git a/package/vlc/patches/patch-include_vlc_fixups_h b/package/vlc/patches/patch-include_vlc_fixups_h
index 229bda74e..968f8d8eb 100644
--- a/package/vlc/patches/patch-include_vlc_fixups_h
+++ b/package/vlc/patches/patch-include_vlc_fixups_h
@@ -1,10 +1,12 @@
---- vlc-2.2.4.orig/include/vlc_fixups.h	2015-02-24 17:58:52.000000000 +0100
-+++ vlc-2.2.4/include/vlc_fixups.h	2016-09-27 12:44:22.190862957 +0200
-@@ -240,7 +240,9 @@ static inline locale_t newlocale(int mas
+--- vlc-2.2.6.orig/include/vlc_fixups.h	2015-04-13 21:54:35.000000000 +0200
++++ vlc-2.2.6/include/vlc_fixups.h	2017-06-06 22:56:59.837313883 +0200
+@@ -239,8 +239,10 @@ static inline locale_t newlocale(int mas
+ }
  #endif
  
- #if !defined (HAVE_STATIC_ASSERT)
+-#if !defined (HAVE_STATIC_ASSERT)
 -# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
++#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
 +# define STATIC_ASSERT_CONCAT_(a, b) a##b
 +# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b)
 +# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })]
diff --git a/package/vlc/patches/patch-modules_codec_avcodec_video_c b/package/vlc/patches/patch-modules_codec_avcodec_video_c
index 07e2728e3..c9d3fb226 100644
--- a/package/vlc/patches/patch-modules_codec_avcodec_video_c
+++ b/package/vlc/patches/patch-modules_codec_avcodec_video_c
@@ -1,5 +1,5 @@
---- vlc-2.2.4.orig/modules/codec/avcodec/video.c	2016-04-07 21:36:15.000000000 +0200
-+++ vlc-2.2.4/modules/codec/avcodec/video.c	2016-09-24 20:35:02.681191261 +0200
+--- vlc-2.2.6.orig/modules/codec/avcodec/video.c	2016-09-27 09:56:26.000000000 +0200
++++ vlc-2.2.6/modules/codec/avcodec/video.c	2017-06-06 22:52:46.745071498 +0200
 @@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
  static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
  static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
@@ -29,7 +29,7 @@
          vlc_sem_destroy( &p_sys->sem_mt );
          free( p_sys );
          return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
+@@ -847,7 +847,7 @@ void EndVideoDec( decoder_t *p_dec )
      wait_mt( p_sys );
  
      if( p_sys->p_ff_pic )
@@ -38,7 +38,7 @@
  
      if( p_sys->p_va )
          vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
+@@ -1334,8 +1334,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
  }
  #endif