From 4bb733e801d390d21a8305fedbc4b81ee5662d86 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdisabwat@gmail.com> Date: Tue, 10 Mar 2020 16:49:02 +0100 Subject: [PATCH 1/3] add TESTED_HASH to manage vlc updates --- compile.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compile.sh b/compile.sh index 484fb39..43c20c6 100755 --- a/compile.sh +++ b/compile.sh @@ -26,11 +26,15 @@ if [ ! -d emsdk ]; then fi cd $WORK_DIR - +TESTED_HASH="1a55c0b9" # Go go go vlc if [ ! -d vlc ]; then diagnostic "VLC source not found, cloning" - git clone http://git.videolan.org/git/vlc.git vlc + git clone http://git.videolan.org/git/vlc.git vlc || checkfail "VLC source: git clone failed" + cd vlc + diagnostic "VLC source: resetting to the TESTED_HASH commit (${TESTED_HASH})" + git reset --hard ${TESTED_HASH} || checkfail "VLC source: TESTED_HASH ${TESTED_HASH} not found" + cd .. checkfail "vlc source: git clone failed" fi -- GitLab From 563c7d210d461cecc9f90163dae1ebd87eca8f07 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdisabwat@gmail.com> Date: Tue, 10 Mar 2020 16:50:12 +0100 Subject: [PATCH 2/3] wip: add patch --- compile.sh | 1 + ...ut-control-only-when-sout-is-enabled.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 vlc_patches/0017-es_out-use-sout-control-only-when-sout-is-enabled.patch diff --git a/compile.sh b/compile.sh index 43c20c6..105a875 100755 --- a/compile.sh +++ b/compile.sh @@ -92,6 +92,7 @@ if [ -d ../vlc_patches ] && [ "$(ls -A ../vlc_patches)" ]; then git am -3 ../vlc_patches/0014-vout-add-emscripten-gl-es2-and-window-modules.patch git am -3 ../vlc_patches/0015-vlc_common-add-weak-attribute-support-for-wasm.patch git am -3 ../vlc_patches/0016-Add-meson_system_name-for-emscripten.patch + git am -3 ../vlc_patches/0017-es_out-use-sout-control-only-when-sout-is-enabled.patch # Add OPENAL support git am -3 ../vlc_patches/openal/* diff --git a/vlc_patches/0017-es_out-use-sout-control-only-when-sout-is-enabled.patch b/vlc_patches/0017-es_out-use-sout-control-only-when-sout-is-enabled.patch new file mode 100644 index 0000000..2b075f0 --- /dev/null +++ b/vlc_patches/0017-es_out-use-sout-control-only-when-sout-is-enabled.patch @@ -0,0 +1,37 @@ +From patchwork Mon Mar 9 23:12:16 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: es_out: use sout control only when sout is enabled +From: Alexandre Janniaux <ajanni@videolabs.io> +X-Patchwork-Id: 26662 +Message-Id: <20200309231216.132003-1-ajanni@videolabs.io> +To: vlc-devel@videolan.org +Date: Tue, 10 Mar 2020 00:12:16 +0100 + +sout_instance_ControlsPace implementation is only compiled when +ENABLE_SOUT is defined, so es_out should only use it in that case. +--- + src/input/es_out.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/input/es_out.c b/src/input/es_out.c +index 118c780c95..e4e0e460ac 100644 +--- a/src/input/es_out.c ++++ b/src/input/es_out.c +@@ -2752,6 +2752,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block ) + return VLC_SUCCESS; + } + ++#ifdef ENABLE_SOUT + /* Check for sout mode */ + if( input_priv(p_input)->p_sout ) + { +@@ -2762,6 +2763,7 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block ) + + input_priv(p_input)->b_out_pace_control = pace; + } ++#endif + + /* Decode */ + if( es->p_dec_record ) -- GitLab From ac54a345114475767e3672247e1a2c4f2a230b3d Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdisabwat@gmail.com> Date: Tue, 10 Mar 2020 16:49:02 +0100 Subject: [PATCH 3/3] add TESTED_HASH to manage vlc updates fixup: update hash --- compile.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compile.sh b/compile.sh index 484fb39..04bac1b 100755 --- a/compile.sh +++ b/compile.sh @@ -26,11 +26,15 @@ if [ ! -d emsdk ]; then fi cd $WORK_DIR - +TESTED_HASH="7bad2a86" # Go go go vlc if [ ! -d vlc ]; then diagnostic "VLC source not found, cloning" - git clone http://git.videolan.org/git/vlc.git vlc + git clone http://git.videolan.org/git/vlc.git vlc || checkfail "VLC source: git clone failed" + cd vlc + diagnostic "VLC source: resetting to the TESTED_HASH commit (${TESTED_HASH})" + git reset --hard ${TESTED_HASH} || checkfail "VLC source: TESTED_HASH ${TESTED_HASH} not found" + cd .. checkfail "vlc source: git clone failed" fi -- GitLab