Initial revision

2 files changed, 77 insertions, 0 deletions

diff --git a/vlc/build/patches/ffmpeg_avcodec_vp9_10bit_support.patch b/vlc/build/patches/ffmpeg_avcodec_vp9_10bit_support.patch
new file mode 100644
index 00000000..d2265fe6
--- /dev/null
+++ b/vlc/build/patches/ffmpeg_avcodec_vp9_10bit_support.patch
@@ -0,0 +1,35 @@
+From 7e20c8f5ebe96de94694be10e24b791e1ed4ea2d Mon Sep 17 00:00:00 2001
+From: Hendrik Leppkes <h.leppkes@gmail.com>
+Date: Mon, 29 May 2017 12:09:47 +0200
+Subject: [PATCH] avcodec/vp9: add profile 2 10-bit DXVA2/D3D11 decoding
+ support
+
+Fixes trac ticket #7099.
+---
+ libavcodec/vp9.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
+index 0fac638ec9..b1178c9c0c 100644
+--- a/libavcodec/vp9.c
++++ b/libavcodec/vp9.c
+@@ -188,6 +188,7 @@ static int update_size(AVCodecContext *avctx, int w, int h)
+ 
+         switch (s->pix_fmt) {
+         case AV_PIX_FMT_YUV420P:
++        case AV_PIX_FMT_YUV420P10:
+ #if CONFIG_VP9_DXVA2_HWACCEL
+             *fmtp++ = AV_PIX_FMT_DXVA2_VLD;
+ #endif
+@@ -202,7 +203,6 @@ static int update_size(AVCodecContext *avctx, int w, int h)
+             *fmtp++ = AV_PIX_FMT_VAAPI;
+ #endif
+             break;
+-        case AV_PIX_FMT_YUV420P10:
+         case AV_PIX_FMT_YUV420P12:
+ #if CONFIG_VP9_NVDEC_HWACCEL
+             *fmtp++ = AV_PIX_FMT_CUDA;
+-- 
+2.26.0.windows.1
+
+
diff --git a/vlc/build/patches/fribidi_nobins.patch b/vlc/build/patches/fribidi_nobins.patch
new file mode 100644
index 00000000..7eca8acf
--- /dev/null
+++ b/vlc/build/patches/fribidi_nobins.patch
@@ -0,0 +1,42 @@
+From 84d7caf52322a33deed868655d19ed2b41c226a9 Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb@videolan.org>
+Date: Sun, 29 Mar 2020 18:57:39 +0200
+Subject: [PATCH] meson: allow to disable building tests and binaries
+
+---
+ meson.build       | 8 ++++++--
+ meson_options.txt | 4 ++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 75e796e..03e9388 100644
+--- a/meson.build
++++ b/meson.build
+@@ -84,8 +84,12 @@ incs = include_directories('.', 'lib', 'gen.tab')
+ 
+ subdir('gen.tab')
+ subdir('lib')
+-subdir('bin')
+-subdir('test')
++if get_option('bin')
++  subdir('bin')
++endif
++if get_option('tests')
++   subdir('test')
++endif
+ if get_option('docs')
+   subdir('doc')
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index c312fe8..11cae8d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -2,3 +2,7 @@ option('deprecated', type : 'boolean', value : true,
+   description: 'Build deprecated functionality')
+ option('docs', type : 'boolean', value : true,
+   description: 'Build documentation')
++option('bin', type : 'boolean', value : true,
++  description: 'Build binaries')
++option('tests', type : 'boolean', value : true,
++  description: 'Build tests')
+