Updated to version 3.0.6

6 files changed, 215 insertions, 293 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73d00ec4edc2..68de2165b630 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = vlc-decklink
-	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (with decklink support)
-	pkgver = 3.0.4
+	pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
+	pkgver = 3.0.6
 	pkgrel = 1
 	url = https://www.videolan.org/vlc/
-	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	license = GPL2
@@ -22,7 +21,7 @@ pkgbase = vlc-decklink
 	makedepends = twolame
 	makedepends = aalib
 	makedepends = avahi
-	makedepends = libsystemd
+	makedepends = systemd-libs
 	makedepends = libmtp
 	makedepends = libupnp
 	makedepends = libmicrodns
@@ -62,6 +61,9 @@ pkgbase = vlc-decklink
 	makedepends = libgoom2
 	makedepends = projectm
 	makedepends = chromaprint
+	makedepends = aom
+	makedepends = srt
+	makedepends = dav1d
 	makedepends = blackmagic-decklink-sdk
 	depends = a52dec
 	depends = libdvbpsi
@@ -96,7 +98,9 @@ pkgbase = vlc-decklink
 	depends = wayland-protocols
 	depends = aribb24
 	optdepends = avahi: service discovery using bonjour protocol
+	optdepends = aom: AOM AV1 codec
 	optdepends = gst-plugins-base-libs: for libgst plugins
+	optdepends = dav1d: dav1d AV1 decoder
 	optdepends = libdvdcss: decoding encrypted DVDs
 	optdepends = libavc1394: devices using the 1394ta AV/C
 	optdepends = libdc1394: IEEE 1394 access plugin
@@ -109,7 +113,7 @@ pkgbase = vlc-decklink
 	optdepends = libgme: Game Music Emu plugin
 	optdepends = vcdimager: navigate VCD with libvcdinfo
 	optdepends = libmtp: MTP devices discovery
-	optdepends = libsystemd: udev services discovery
+	optdepends = systemd-libs: udev services discovery
 	optdepends = smbclient: SMB access plugin
 	optdepends = libcdio: audio CD playback
 	optdepends = ttf-freefont: subtitle font
@@ -134,13 +138,14 @@ pkgbase = vlc-decklink
 	optdepends = libpng: PNG support
 	optdepends = libjpeg-turbo: JPEG support
 	optdepends = librsvg: SVG plugin
-	optdepends = libx264: H264 encoding
+	optdepends = x264: H264 encoding
 	optdepends = x265: HEVC/H.265 encoder
 	optdepends = zvbi: VBI/Teletext decoding
 	optdepends = libass: Subtitle support
 	optdepends = libkate: Kate codec
 	optdepends = libtiger: Tiger rendering for Kate streams
 	optdepends = sdl_image: SDL image support
+	optdepends = srt: SRT input/output plugin
 	optdepends = aalib: ASCII art video output
 	optdepends = libcaca: colored ASCII art video output
 	optdepends = libpulse: PulseAudio audio output
@@ -157,21 +162,24 @@ pkgbase = vlc-decklink
 	optdepends = gtk3: notification plugin
 	provides = vlc
 	conflicts = vlc
-	conflicts = vlc-git
 	conflicts = vlc-plugin
 	replaces = vlc-plugin
 	options = !emptydirs
-	source = https://download.videolan.org/vlc/3.0.4/vlc-3.0.4.tar.xz
-	source = https://download.videolan.org/vlc/3.0.4/vlc-3.0.4.tar.xz.asc
+	source = https://download.videolan.org/vlc/3.0.6/vlc-3.0.6.tar.xz
+	source = https://download.videolan.org/vlc/3.0.6/vlc-3.0.6.tar.xz.asc
 	source = update-vlc-plugin-cache.hook
 	source = lua53_compat.patch
-	source = vlc-3.0.3-fix-build-with-libx264-git.patch
+	source = vlc-libvpx18.patch::https://github.com/videolan/vlc-3.0/commit/2688feb2742a6021ca211ae5c106b12c3d822946.patch
+	source = vlc-libssh2-ecdsa.patch::https://github.com/videolan/vlc-3.0/commit/db381f6edeac9d70b7545a72bc2840f42266d655.patch
+	source = vlc-decklink-fix-build-with-sdk-11.patch
 	validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC
-	sha256sums = 01f3db3790714038c01f5e23c709e31ecd6f1c046ac93d19e1dde38b3fc05a9e
+	sha256sums = 18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3
 	sha256sums = SKIP
 	sha256sums = c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a
 	sha256sums = d1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa
-	sha256sums = 410064c7f18e08025d365962fd5e17f0f99f74c7334b9a283a90bc89b1d72158
+	sha256sums = 8b7b4cb3982f2dd16bbe8ab53f4d42c70ff9ca7145daab72a61118ce12cb3564
+	sha256sums = 99e85191e972d0939ee62498f47da6820020e01e834a733a995f665fd1ccef45
+	sha256sums = be1ae99f62304d5291eecd181175d593b5a26a4192021528624e88d96ecf3c74
 
 pkgname = vlc-decklink
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d0ef5042496..95adb27305fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
 
 _srcname=vlc
 pkgname=vlc-decklink
-pkgver=3.0.4
+pkgver=3.0.6
 pkgrel=1
-pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (with decklink support)'
+pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn'
          'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad'
@@ -17,23 +17,21 @@ depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn'
          'libarchive' 'qt5-base' 'qt5-x11extras' 'qt5-svg' 'freetype2'
          'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' 'libplacebo'
          'wayland-protocols' 'aribb24')
-makedepends=(
-    # official repositories:
-        'gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
-        'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
-        'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'libsystemd'
-        'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient'
-        'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
-        'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
-        'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
-        'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
-        'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
-        'lirc' 'libgoom2' 'projectm' 'chromaprint'
-    # AUR:
-        'blackmagic-decklink-sdk'
-)
+makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
+             'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
+             'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs'
+             'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient'
+             'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
+             'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
+             'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
+             'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
+             'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
+             'lirc' 'libgoom2' 'projectm' 'chromaprint' 'aom' 'srt' 'dav1d'
+             'blackmagic-decklink-sdk')
 optdepends=('avahi: service discovery using bonjour protocol'
+            'aom: AOM AV1 codec'
             'gst-plugins-base-libs: for libgst plugins'
+            'dav1d: dav1d AV1 decoder'
             'libdvdcss: decoding encrypted DVDs'
             'libavc1394: devices using the 1394ta AV/C'
             'libdc1394: IEEE 1394 access plugin'
@@ -46,13 +44,12 @@ optdepends=('avahi: service discovery using bonjour protocol'
             'libgme: Game Music Emu plugin'
             'vcdimager: navigate VCD with libvcdinfo'
             'libmtp: MTP devices discovery'
-            'libsystemd: udev services discovery'
+            'systemd-libs: udev services discovery'
             'smbclient: SMB access plugin'
             'libcdio: audio CD playback'
             'ttf-freefont: subtitle font '
             'ttf-dejavu: subtitle font'
             'libssh2: sftp access'
-            #'opencv: opencv video'
             'libnfs: NFS access'
             'mpg123: mpg123 codec'
             'protobuf: chromecast streaming'
@@ -72,13 +69,14 @@ optdepends=('avahi: service discovery using bonjour protocol'
             'libpng: PNG support'
             'libjpeg-turbo: JPEG support'
             'librsvg: SVG plugin'
-            'libx264: H264 encoding'
+            'x264: H264 encoding'
             'x265: HEVC/H.265 encoder'
             'zvbi: VBI/Teletext decoding'
             'libass: Subtitle support'
             'libkate: Kate codec'
             'libtiger: Tiger rendering for Kate streams'
             'sdl_image: SDL image support'
+            'srt: SRT input/output plugin'
             'aalib: ASCII art video output'
             'libcaca: colored ASCII art video output'
             'libpulse: PulseAudio audio output'
@@ -94,18 +92,22 @@ optdepends=('avahi: service discovery using bonjour protocol'
             'libnotify: notification plugin'
             'gtk3: notification plugin')
 provides=('vlc')
-conflicts=('vlc' 'vlc-git' 'vlc-plugin')
+conflicts=('vlc' 'vlc-plugin')
 replaces=('vlc-plugin')
 options=('!emptydirs')
 source=("https://download.videolan.org/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.xz"{,.asc}
         'update-vlc-plugin-cache.hook'
         'lua53_compat.patch'
-        'vlc-3.0.3-fix-build-with-libx264-git.patch')
-sha256sums=('01f3db3790714038c01f5e23c709e31ecd6f1c046ac93d19e1dde38b3fc05a9e'
+        'vlc-libvpx18.patch'::'https://github.com/videolan/vlc-3.0/commit/2688feb2742a6021ca211ae5c106b12c3d822946.patch'
+        'vlc-libssh2-ecdsa.patch'::'https://github.com/videolan/vlc-3.0/commit/db381f6edeac9d70b7545a72bc2840f42266d655.patch'
+        'vlc-decklink-fix-build-with-sdk-11.patch')
+sha256sums=('18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3'
             'SKIP'
             'c6f60c50375ae688755557dbfc5bd4a90a8998f8cf4d356c10d872a1a0b44f3a'
             'd1cb88a1037120ea83ef75b2a13039a16825516b776d71597d0e2eae5df2d8fa'
-            '410064c7f18e08025d365962fd5e17f0f99f74c7334b9a283a90bc89b1d72158')
+            '8b7b4cb3982f2dd16bbe8ab53f4d42c70ff9ca7145daab72a61118ce12cb3564'
+            '99e85191e972d0939ee62498f47da6820020e01e834a733a995f665fd1ccef45'
+            'be1ae99f62304d5291eecd181175d593b5a26a4192021528624e88d96ecf3c74')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
@@ -117,20 +119,27 @@ prepare() {
     sed 's|whoami|echo builduser|g' -i configure
     sed 's|hostname -f|echo arch|g' -i configure
     
-    patch -Np1 -i "${srcdir}/lua53_compat.patch"
-    patch -Np1 -i "${srcdir}/vlc-3.0.3-fix-build-with-libx264-git.patch"
+    local _src
+    for _src in "${source[@]}"
+    do
+        _src="${_src%%::*}"
+        _src="${_src##*/}"
+        [[ "$_src" = *.patch ]] || continue
+        printf '%s\n' "  -> Applying patch '${_src}'..."
+        patch -Np1 -i "../${_src}"
+    done
 }
 
 build() {
     cd "${_srcname}-${pkgver}"
     
-    export CFLAGS+=" -I/usr/include/samba-4.0"
-    export CPPFLAGS+=" -I/usr/include/samba-4.0"
-    export CXXFLAGS+=" -std=c++11"
+    export CFLAGS+=' -I/usr/include/samba-4.0'
+    export CPPFLAGS+=' -I/usr/include/samba-4.0'
+    export CXXFLAGS+=' -std=c++11'
     export LUAC='/usr/bin/luac'
     export LUA_LIBS="$(pkg-config --libs lua)"
     export RCC='/usr/bin/rcc-qt5'
-    
+
     ./configure \
         --prefix='/usr' \
         --sysconfdir='/etc' \
@@ -224,6 +233,9 @@ build() {
         --enable-libplacebo \
         --enable-vlc \
         --enable-aribsub \
+        --enable-aom \
+        --enable-srt \
+        --enable-dav1d \
         --enable-decklink
         
     make
diff --git a/aom-remove-unsupported-pixel-formats.patch b/aom-remove-unsupported-pixel-formats.patch
deleted file mode 100644
index 0a75d424f477..000000000000
--- a/aom-remove-unsupported-pixel-formats.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 622360c2c4335fff793f81f5e673326a581f5c0c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Thu, 19 Apr 2018 18:25:07 +0300
-Subject: [PATCH] aom: Remove unsupported pixel formats
-
-Support for these was apparently never in the codebase, and the enum
-values were recently removed from the public headers [1].
-
-This fixes build with latest libaom build.
-
-[1] https://aomedia.googlesource.com/aom/+/3f29cc20e3a4c348cb41a797c68de856ddb84e12
----
- modules/codec/aom.c | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/modules/codec/aom.c b/modules/codec/aom.c
-index 5bb442b5d50..60034158c47 100644
---- a/modules/codec/aom.c
-+++ b/modules/codec/aom.c
-@@ -116,17 +116,6 @@ static const struct
- 
-     { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
-     { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
--    { VLC_CODEC_YUYV, AOM_IMG_FMT_YUY2, 8, 0 },
--    { VLC_CODEC_UYVY, AOM_IMG_FMT_UYVY, 8, 0 },
--    { VLC_CODEC_YVYU, AOM_IMG_FMT_YVYU, 8, 0 },
--
--    { VLC_CODEC_RGB15, AOM_IMG_FMT_RGB555, 8, 0 },
--    { VLC_CODEC_RGB16, AOM_IMG_FMT_RGB565, 8, 0 },
--    { VLC_CODEC_RGB24, AOM_IMG_FMT_RGB24, 8, 0 },
--    { VLC_CODEC_RGB32, AOM_IMG_FMT_RGB32, 8, 0 },
--
--    { VLC_CODEC_ARGB, AOM_IMG_FMT_ARGB, 8, 0 },
--    { VLC_CODEC_BGRA, AOM_IMG_FMT_ARGB_LE, 8, 0 },
- 
-     { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
-     { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },
diff --git a/vlc-3.0.3-fix-build-with-libx264-git.patch b/vlc-3.0.3-fix-build-with-libx264-git.patch
deleted file mode 100644
index 0d866da61749..000000000000
--- a/vlc-3.0.3-fix-build-with-libx264-git.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From a8953ba707cca1f2de372ca24513296bcfcdaaa8 Mon Sep 17 00:00:00 2001
-From: Ilkka Ollakka <ileoo@videolan.org>
-Date: Sat, 24 Mar 2018 13:23:33 +0200
-Subject: [PATCH] x264: drop <148 build support and fix 10bit support
-
-Drop old #if as 148 is not that recent anymore.
-
-fixes #19581
----
- modules/codec/x264.c | 65 ++++++++--------------------------------------------
- 1 file changed, 10 insertions(+), 55 deletions(-)
-
-diff --git a/modules/codec/x264.c b/modules/codec/x264.c
-index e02048f0757..bcf3c89a10f 100644
---- a/modules/codec/x264.c
-+++ b/modules/codec/x264.c
-@@ -84,13 +84,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
-     "I-frames, but do not start a new GOP." )
- 
- #define OPENGOP_TEXT N_("Use recovery points to close GOPs")
--#if X264_BUILD < 115
--#define OPENGOP_LONGTEXT N_("none: use closed GOPs only\n"\
--    "normal: use standard open GOPs\n" \
--    "bluray: use Blu-ray compatible open GOPs" )
--#else
- #define OPENGOP_LONGTEXT N_("use open GOP, for bluray compatibility use also bluray-compat option")
--#endif
- 
- #define BLURAY_TEXT N_("Enable compatibility hacks for Blu-ray support")
- #define BLURAY_LONGTEXT N_("Enable hacks for Blu-ray support, this doesn't enforce every aspect of Blu-ray compatibility\n" \
-@@ -469,16 +463,10 @@ vlc_module_begin ()
-     add_integer( SOUT_CFG_PREFIX "min-keyint", 25, MIN_KEYINT_TEXT,
-                  MIN_KEYINT_LONGTEXT, true )
- 
--#if X264_BUILD >= 102 && X264_BUILD <= 114
--    add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT,
--               OPENGOP_LONGTEXT, true )
--        change_string_list( x264_open_gop_names, x264_open_gop_names )
--#elif X264_BUILD > 114
-     add_bool( SOUT_CFG_PREFIX "opengop", false, OPENGOP_TEXT,
-                OPENGOP_LONGTEXT, true )
-     add_bool( SOUT_CFG_PREFIX "bluray-compat", false, BLURAY_TEXT,
-                BLURAY_LONGTEXT, true )
--#endif
- 
-     add_integer( SOUT_CFG_PREFIX "scenecut", 40, SCENE_TEXT,
-                  SCENE_LONGTEXT, true )
-@@ -498,13 +486,8 @@ vlc_module_begin ()
-                  B_BIAS_LONGTEXT, true )
-         change_integer_range( -100, 100 )
- 
--#if X264_BUILD >= 87
-     add_string( SOUT_CFG_PREFIX "bpyramid", "normal", BPYRAMID_TEXT,
-               BPYRAMID_LONGTEXT, true )
--#else
--    add_string( SOUT_CFG_PREFIX "bpyramid", "none", BPYRAMID_TEXT,
--              BPYRAMID_LONGTEXT, true )
--#endif
-         change_string_list( bpyramid_list, bpyramid_list )
- 
-     add_bool( SOUT_CFG_PREFIX "cabac", true, CABAC_TEXT, CABAC_LONGTEXT,
-@@ -541,22 +524,18 @@ vlc_module_begin ()
-     add_bool( SOUT_CFG_PREFIX "interlaced", false, INTERLACED_TEXT, INTERLACED_LONGTEXT,
-               true )
- 
--#if X264_BUILD >= 111
-     add_integer( SOUT_CFG_PREFIX "frame-packing", -1, FRAMEPACKING_TEXT, FRAMEPACKING_LONGTEXT, true )
-         change_integer_list( framepacking_list, framepacking_list_text )
-         change_integer_range( -1, 6)
--#endif
- 
-     add_integer( SOUT_CFG_PREFIX "slices", 0, SLICE_COUNT, SLICE_COUNT_LONGTEXT, true )
-     add_integer( SOUT_CFG_PREFIX "slice-max-size", 0, SLICE_MAX_SIZE, SLICE_MAX_SIZE_LONGTEXT, true )
-     add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, true )
- 
--#if X264_BUILD >= 89
-     add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_TEXT, true )
-         vlc_config_set (VLC_CONFIG_LIST,
-             (sizeof(x264_nal_hrd_names) / sizeof (char*)) - 1,
-             x264_nal_hrd_names, x264_nal_hrd_names);
--#endif
- 
- 
- /* Ratecontrol */
-@@ -842,20 +821,14 @@ static int  Open ( vlc_object_t *p_this )
-     fullrange |= p_enc->fmt_in.video.b_color_range_full;
-     p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
-     p_sys->i_colorspace = X264_CSP_I420;
--#if X264_BUILD >= 118
-     char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
--    if( psz_profile )
--    {
--        const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;
--
--
- # ifdef MODULE_NAME_IS_x26410b
--        if( mask == 0)
--        {
--            msg_Err( p_enc, "Only high bit depth encoding supported, bit depth:%d", x264_bit_depth);
--            return VLC_EGENERIC;
--        }
-+    const int mask = X264_CSP_HIGH_DEPTH;
-+# else
-+    const int mask = 0;
- # endif
-+    if( psz_profile )
-+    {
- 
-         if( !strcmp( psz_profile, "high10" ) )
-         {
-@@ -878,7 +851,6 @@ static int  Open ( vlc_object_t *p_this )
-             msg_Err( p_enc, "Only high-profiles and 10-bit are supported");
-             return VLC_EGENERIC;
-         }
--
- # endif
-     }
- # ifdef MODULE_NAME_IS_x26410b
-@@ -889,7 +861,6 @@ static int  Open ( vlc_object_t *p_this )
-     }
- # endif
-     free( psz_profile );
--#endif //X264_BUILD
- 
-     p_enc->pf_encode_video = Encode;
-     p_enc->pf_encode_audio = NULL;
-@@ -912,6 +883,10 @@ static int  Open ( vlc_object_t *p_this )
- #else
-     x264_param_default( &p_sys->param );
-     x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
-+# if X264_BUILD > 152
-+    if( mask )
-+        p_sys->param.i_bitdepth = 10;
-+# endif
- #endif
-     free( psz_preset );
-     free( psz_tune );
-@@ -1089,10 +1064,8 @@ static int  Open ( vlc_object_t *p_this )
-     if( fabs( var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" ) - 1.0) > 0.005 )
-        p_sys->param.rc.f_aq_strength = var_GetFloat( p_enc, SOUT_CFG_PREFIX "aq-strength" );
- 
--#if X264_BUILD >= 111
-     if( var_GetInteger( p_enc, SOUT_CFG_PREFIX "frame-packing" ) > -1 )
-        p_sys->param.i_frame_packing = var_GetInteger( p_enc, SOUT_CFG_PREFIX "frame-packing" );
--#endif
- 
-     if( var_GetBool( p_enc, SOUT_CFG_PREFIX "verbose" ) )
-         p_sys->param.i_log_level = X264_LOG_DEBUG;
-@@ -1108,26 +1081,14 @@ static int  Open ( vlc_object_t *p_this )
- 
-     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "keyint" );
-     if( i_val > 0 && i_val != 250 ) p_sys->param.i_keyint_max = i_val;
--#if X264_BUILD >= 102
-     if( i_val == -1 ) p_sys->param.i_keyint_max = X264_KEYINT_MAX_INFINITE;
--#endif
- 
-     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "min-keyint" );
-     if( i_val > 0 && i_val != 25 ) p_sys->param.i_keyint_min = i_val;
- 
--#if X264_BUILD >= 102 && X264_BUILD <= 114
--    psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "opengop" );
--    if( !strcmp( psz_val, "none" ) )
--        p_sys->param.i_open_gop = X264_OPEN_GOP_NONE;
--    else if( !strcmp( psz_val, "normal" ) )
--        p_sys->param.i_open_gop = X264_OPEN_GOP_NORMAL;
--    else if( !strcmp( psz_val, "bluray" ) )
--        p_sys->param.i_open_gop = X264_OPEN_GOP_BLURAY;
--    free( psz_val );
--#elif X264_BUILD >= 115
-     p_sys->param.b_open_gop = var_GetBool( p_enc, SOUT_CFG_PREFIX "opengop" );
-     p_sys->param.b_bluray_compat = var_GetBool( p_enc, SOUT_CFG_PREFIX "bluray-compat" );
--#endif
-+
-     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "bframes" );
-     if( i_val >= 0 && i_val <= 16 && i_val != 3 )
-         p_sys->param.i_bframe = i_val;
-@@ -1165,14 +1126,12 @@ static int  Open ( vlc_object_t *p_this )
-     if( i_val >= 1 && i_val != 7 )
-         p_sys->param.analyse.i_subpel_refine = i_val;
- 
--#if X264_BUILD >= 89
-     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "hrd");
-     if( !strcmp( psz_val, "vbr" ) )
-         p_sys->param.i_nal_hrd = X264_NAL_HRD_VBR;
-     else if( !strcmp( psz_val, "cbr" ) )
-         p_sys->param.i_nal_hrd = X264_NAL_HRD_CBR;
-     free( psz_val );
--#endif
- 
-     //TODO: psz_val == NULL ?
-     psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "me" );
-@@ -1531,11 +1490,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
-     int i_nal=0, i_out=0, i=0;
- 
-     /* init pic */
--#if X264_BUILD >= 98
-     x264_picture_init( &pic );
--#else
--    memset( &pic, 0, sizeof( x264_picture_t ) );
--#endif
-     if( likely(p_pict) ) {
-        pic.i_pts = p_pict->date;
-        pic.img.i_csp = p_sys->i_colorspace;
diff --git a/vlc-decklink-fix-build-with-sdk-11.patch b/vlc-decklink-fix-build-with-sdk-11.patch
new file mode 100644
index 000000000000..fa53fd924a0a
--- /dev/null
+++ b/vlc-decklink-fix-build-with-sdk-11.patch
@@ -0,0 +1,152 @@
+From 774a96ae649ff66e4842c43c5a047b118dc411e4 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie <fcvlcdev@free.fr>
+Date: Thu, 9 May 2019 10:38:01 +0200
+Subject: [PATCH] decklink: fix compilation with SDK 11.1 (fix #22276)
+
+provided deprecated api entries just does not work
+
+(cherry picked from commit 10d6549f4eb577670cf657768bb0ad82ef6c69c1)
+---
+ modules/access/decklink.cpp       |  9 +++++--
+ modules/video_output/decklink.cpp | 42 +++++++++++++++++++++----------
+ 2 files changed, 36 insertions(+), 15 deletions(-)
+
+diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
+index 04f0b469f4a..c0ded3f051a 100644
+--- a/modules/access/decklink.cpp
++++ b/modules/access/decklink.cpp
+@@ -35,6 +35,11 @@
+ 
+ #include <DeckLinkAPI.h>
+ #include <DeckLinkAPIDispatch.cpp>
++#include <DeckLinkAPIVersion.h>
++#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b010000
++ #define IID_IDeckLinkProfileAttributes IID_IDeckLinkAttributes
++ #define IDeckLinkProfileAttributes IDeckLinkAttributes
++#endif
+ 
+ #include "sdi.h"
+ 
+@@ -135,7 +140,7 @@ struct demux_sys_t
+     /* We need to hold onto the IDeckLinkConfiguration object, or our settings will not apply.
+        See section 2.4.15 of the Blackmagic DeckLink SDK documentation. */
+     IDeckLinkConfiguration *config;
+-    IDeckLinkAttributes *attributes;
++    IDeckLinkProfileAttributes *attributes;
+ 
+     bool autodetect;
+ 
+@@ -542,7 +547,7 @@ static int Open(vlc_object_t *p_this)
+         goto finish;
+     }
+ 
+-    if (sys->card->QueryInterface(IID_IDeckLinkAttributes, (void**)&sys->attributes) != S_OK) {
++    if (sys->card->QueryInterface(IID_IDeckLinkProfileAttributes, (void**)&sys->attributes) != S_OK) {
+         msg_Err(demux, "Failed to get attributes interface");
+         goto finish;
+     }
+diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
+index 1e504610873..23909b86c61 100644
+--- a/modules/video_output/decklink.cpp
++++ b/modules/video_output/decklink.cpp
+@@ -47,6 +47,11 @@
+ 
+ #include <DeckLinkAPI.h>
+ #include <DeckLinkAPIDispatch.cpp>
++#include <DeckLinkAPIVersion.h>
++#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b010000
++ #define IID_IDeckLinkProfileAttributes IID_IDeckLinkAttributes
++ #define IDeckLinkProfileAttributes IDeckLinkAttributes
++#endif
+ 
+ #define FRAME_SIZE 1920
+ #define CHANNELS_MAX 6
+@@ -463,7 +468,7 @@ static picture_t * CreateNoSignalPicture(vlc_object_t *p_this, const video_forma
+ static IDeckLinkDisplayMode * MatchDisplayMode(vout_display_t *vd,
+                                                IDeckLinkOutput *output,
+                                                const video_format_t *fmt,
+-                                               BMDDisplayMode forcedmode = bmdDisplayModeNotSupported)
++                                               BMDDisplayMode forcedmode = bmdModeUnknown)
+ {
+     HRESULT result;
+     IDeckLinkDisplayMode *p_selected = NULL;
+@@ -507,7 +512,7 @@ static IDeckLinkDisplayMode * MatchDisplayMode(vout_display_t *vd,
+                     continue;
+                 }
+ 
+-                if(forcedmode != bmdDisplayModeNotSupported && unlikely(!p_selected))
++                if(forcedmode != bmdModeUnknown && unlikely(!p_selected))
+                 {
+                     BMDDisplayMode modenl = htonl(forcedmode);
+                     msg_Dbg(vd, "Forced mode '%4.4s'", (char *)&modenl);
+@@ -518,7 +523,7 @@ static IDeckLinkDisplayMode * MatchDisplayMode(vout_display_t *vd,
+                     continue;
+                 }
+ 
+-                if(p_selected == NULL && forcedmode == bmdDisplayModeNotSupported)
++                if(p_selected == NULL && forcedmode == bmdModeUnknown)
+                 {
+                     if(i_width >> i_div == p_mode->GetWidth() >> i_div &&
+                        i_height >> i_div == p_mode->GetHeight() >> i_div)
+@@ -564,9 +569,9 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys)
+     IDeckLinkIterator *decklink_iterator = NULL;
+     IDeckLinkDisplayMode *p_display_mode = NULL;
+     IDeckLinkConfiguration *p_config = NULL;
+-    IDeckLinkAttributes *p_attributes = NULL;
++    IDeckLinkProfileAttributes *p_attributes = NULL;
+     IDeckLink *p_card = NULL;
+-    BMDDisplayMode wanted_mode_id = bmdDisplayModeNotSupported;
++    BMDDisplayMode wanted_mode_id = bmdModeUnknown;
+ 
+     vlc_mutex_lock(&sys->lock);
+ 
+@@ -622,7 +627,7 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys)
+ 
+     /* Read attributes */
+ 
+-    result = p_card->QueryInterface(IID_IDeckLinkAttributes, (void**)&p_attributes);
++    result = p_card->QueryInterface(IID_IDeckLinkProfileAttributes, (void**)&p_attributes);
+     CHECK("Could not get IDeckLinkAttributes");
+ 
+     int64_t vconn;
+@@ -662,6 +667,7 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys)
+         BMDDisplayMode modenl = htonl(mode_id);
+         msg_Dbg(vd, "Selected mode '%4.4s'", (char *) &modenl);
+ 
++        BMDPixelFormat pixelFormat = sys->video.tenbits ? bmdFormat10BitYUV : bmdFormat8BitYUV;
+         BMDVideoOutputFlags flags = bmdVideoOutputVANC;
+         if (mode_id == bmdModeNTSC ||
+             mode_id == bmdModeNTSC2398 ||
+@@ -669,15 +675,25 @@ static int OpenDecklink(vout_display_t *vd, decklink_sys_t *sys)
+         {
+             flags = bmdVideoOutputVITC;
+         }
+-
+-        BMDDisplayModeSupport support;
+-        IDeckLinkDisplayMode *resultMode;
+-
++        bool supported;
++#if BLACKMAGIC_DECKLINK_API_VERSION < 0x0b010000
++        BMDDisplayModeSupport support = bmdDisplayModeNotSupported;
+         result = sys->p_output->DoesSupportVideoMode(mode_id,
+-                                                              sys->video.tenbits ? bmdFormat10BitYUV : bmdFormat8BitYUV,
+-                                                              flags, &support, &resultMode);
++                                                pixelFormat,
++                                                flags,
++                                                &support,
++                                                NULL);
++        supported = (support != bmdDisplayModeNotSupported);
++#else
++        result = sys->p_output->DoesSupportVideoMode(vconn,
++                                                mode_id,
++                                                pixelFormat,
++                                                bmdSupportedVideoModeDefault,
++                                                NULL,
++                                                &supported);
++#endif
+         CHECK("Does not support video mode");
+-        if (support == bmdDisplayModeNotSupported)
++        if (!supported)
+         {
+             msg_Err(vd, "Video mode not supported");
+             goto error;
diff --git a/vlc-qt5.11.patch b/vlc-qt5.11.patch
deleted file mode 100644
index c99d89882478..000000000000
--- a/vlc-qt5.11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/modules/gui/qt/components/simple_preferences.cpp	2018-01-25 17:57:40.000000000 +0100
-+++ b/modules/gui/qt/components/simple_preferences.cpp	2018-03-18 21:08:51.212556781 +0100
-@@ -33,6 +33,7 @@
- #include <vlc_config_cat.h>
- #include <vlc_configuration.h>
- 
-+#include <QButtonGroup>
- #include <QString>
- #include <QFont>
- #include <QToolButton>