From b992e17dc3c06bb48c277f87b0644a615e57a849 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Wed, 5 Oct 2022 15:18:36 +0200 Subject: [PATCH 01/11] compile.sh: use bash instead of sh The emscripten tools are expecting bash or more, and will fail at runtime if ran with sh. Setting the environment Error: unable to determine 'emsdk' directory. Perhaps you are using a shell or environment that this script does not support. --- compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index 7a6bd25..23bcf98 100755 --- a/compile.sh +++ b/compile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash set -e ## FUNCTIONS -- GitLab From b62949c0a870feee83052af7f461506b9febf6ad Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Wed, 5 Oct 2022 15:19:44 +0200 Subject: [PATCH 02/11] vlc.html: fix vlc_args settings Since the string is passed down to VLC C code, we need to ensure the terminal character has been added, which means that the last parameter to writeAsciiToMemory must be false. --- vlc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.html b/vlc.html index fc7ccc9..311a58f 100644 --- a/vlc.html +++ b/vlc.html @@ -265,7 +265,7 @@ var buffer = Module._malloc(vlc_opts_size); var wrote_size = 0; for (let i in vlc_opts_array) { - Module.writeAsciiToMemory(vlc_opts_array[i], buffer + wrote_size, true); + Module.writeAsciiToMemory(vlc_opts_array[i], buffer + wrote_size, false); wrote_size += vlc_opts_array[i].length + 1; } -- GitLab From 12273f0d3a5eef61ace205c96b3ad618e781ac36 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 23 May 2023 12:05:15 +0200 Subject: [PATCH 03/11] preRun: remove duplicate assignment --- lib/module-loader.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/module-loader.js b/lib/module-loader.js index 318e63a..297560e 100644 --- a/lib/module-loader.js +++ b/lib/module-loader.js @@ -13,9 +13,6 @@ var was_clicked = false; var was_clicked = false; var VlcModuleExt = { - preRun: [ function() { - window.display_overlay = true - }], preRun: [ function() { window.display_overlay = true }], -- GitLab From 4ea1456ddd9f003d7992d3c927f891261f2ca6f1 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 23 May 2023 12:05:52 +0200 Subject: [PATCH 04/11] doc: remove unnecessary emrun option --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7b280c..2d47ef6 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ You can run it locally by launching a webserver on your computer. ```bash source emsdk/emsdk_env.sh -emrun --no_browser --port 8080 vlc.html --emrun +emrun --no_browser --port 8080 vlc.html ``` And seeing the result at url : http://localhost:8080/vlc.html -- GitLab From 4befe62cf750efe41f60166890cdeaa669cd7402 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 23 Jan 2024 10:56:15 +0100 Subject: [PATCH 05/11] build: export debug symbol This provides the DWARF symbols into the resulting artifacts, which can be loaded into Chrome[^1] to provide the real source and line number in stacktraces when an assertion is triggered. [^1]: https://developer.chrome.com/blog/wasm-debugging-2020/ --- compile.sh | 18 +++++++++++++++++- create_main.sh | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/compile.sh b/compile.sh index 23bcf98..b7f3a75 100755 --- a/compile.sh +++ b/compile.sh @@ -59,6 +59,22 @@ cd $WORK_DIR diagnostic "Setting the environment" . emsdk/emsdk_env.sh +EXPORT_DEBUG_SYMBOLS= +while test -n "$1" +do + case "$1" in + --export-debug-symbols) + EXPORT_DEBUG_SYMBOLS="$1" + ;; + *) + echo "Unrecognized options $1" + usage + exit 1 + ;; + esac + shift +done + diagnostic "build libvlc" cd ./vlc/extras/package/wasm-emscripten/ ./build.sh --mode=${SLOW_MODE} @@ -69,4 +85,4 @@ sed -e 's/^/_/' ./vlc/lib/libvlc.sym >> libvlc_wasm.sym cd $WORK_DIR diagnostic "Generating executable" -./create_main.sh +./create_main.sh ${EXPORT_DEBUG_SYMBOLS} diff --git a/create_main.sh b/create_main.sh index 181d200..6a0a100 100755 --- a/create_main.sh +++ b/create_main.sh @@ -34,6 +34,20 @@ SAMPLE_DIR=${SAMPLE_DIR:=./samples} # -s ASYNCIFY_IMPORTS="['init_js_file', 'getVoutMessagePort', 'bindVideoFrame', 'CopyFrameToBuffer', 'probeConfig', 'initDecoderWorkerMessagePort', 'flushAsync', 'initDecoderJS']" +DEBUG_OPTIONS= +while test -n "$1" +do + case "$1" in + --export-debug-symbols) + DEBUG_OPTIONS="-g" + ;; + *) + echo "Unrecognized options $1" + exit 1 + ;; + esac + shift +done emcc --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=2GB -s PTHREAD_POOL_SIZE=25 \ -s OFFSCREEN_FRAMEBUFFER=1 \ @@ -47,6 +61,7 @@ emcc --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=2GB -s PTHREAD_POOL_SIZE=25 \ -I $PATH_VLC/include/ \ main.c exports_media_player.c exports_media.c \ -s EXPORTED_FUNCTIONS=@libvlc_wasm.sym \ + $DEBUG_OPTIONS \ $PATH_VLC/build-emscripten/lib/.libs/libvlc.a \ $PATH_VLC/build-emscripten/vlc-modules.bc \ $PATH_VLC/build-emscripten/modules/.libs/*.a \ @@ -57,11 +72,11 @@ emcc --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=2GB -s PTHREAD_POOL_SIZE=25 \ --js-library vlc/modules/audio_output/webaudio/webaudio.js \ -o experimental.js - #em++ --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=2GB -s PTHREAD_POOL_SIZE=21 \ # -s OFFSCREEN_FRAMEBUFFER=1\ # -s USE_WEBGL2=1 \ # --profiling-funcs \ +# $DEBUG_OPTIONS \ # -s OFFSCREENCANVAS_SUPPORT=1 \ # -s MODULARIZE=1 -s EXPORT_NAME="initModule" \ # -s EXTRA_EXPORTED_RUNTIME_METHODS="[allocateUTF8]" \ -- GitLab From e3b5b0fe0a3c6ced34a4a86e925bd16ecce553b5 Mon Sep 17 00:00:00 2001 From: Alaric Senat <dev.asenat@posteo.net> Date: Wed, 6 Mar 2024 10:06:13 +0100 Subject: [PATCH 06/11] test: opengl: fill display size The interop will use display size rather than coded size to generate textures. --- main_opengl.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main_opengl.cpp b/main_opengl.cpp index ca92ef1..39c2a09 100644 --- a/main_opengl.cpp +++ b/main_opengl.cpp @@ -283,6 +283,8 @@ EM_JS(void, SendVideoFrame, (int worker_id), { format: 'RGBA', codedWidth: 32, codedHeight: 32, + displayWidth: 32, + displayHeight: 32, timestamp: 0, }); self.postMessage({ -- GitLab From f2f28b187b6e84ad66a62b3d491b7af95b8963e2 Mon Sep 17 00:00:00 2001 From: Alaric Senat <alaric@videolabs.io> Date: Thu, 7 Mar 2024 18:54:33 +0100 Subject: [PATCH 07/11] patches: remove gcrypt workaround The fix is available in emcripten since 2.0.24[^1] [^1] https://github.com/emscripten-core/emscripten/commit/79e5c942bdd5e525961a22c701645fd524f7ce32 --- ...utls-add-support-for-wasm-emscripten.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 vlc_patches/aug/0006-contrib-gnutls-add-support-for-wasm-emscripten.patch diff --git a/vlc_patches/aug/0006-contrib-gnutls-add-support-for-wasm-emscripten.patch b/vlc_patches/aug/0006-contrib-gnutls-add-support-for-wasm-emscripten.patch deleted file mode 100644 index df56211..0000000 --- a/vlc_patches/aug/0006-contrib-gnutls-add-support-for-wasm-emscripten.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 907f99dd996a0a34c1f50ba34171da80c64ee0ba Mon Sep 17 00:00:00 2001 -From: Mehdi Sabwat <mehdi@videolabs.io> -Date: Mon, 31 May 2021 00:18:18 +0200 -Subject: [PATCH 06/77] contrib: gnutls: add support for wasm-emscripten - -the contrib is temporarily disabled until this pr is merged: -https://github.com/emscripten-core/emscripten/pull/14352 ---- - contrib/src/gnutls/rules.mak | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak -index edec0ad9ee..fb372f9da1 100644 ---- a/contrib/src/gnutls/rules.mak -+++ b/contrib/src/gnutls/rules.mak -@@ -82,6 +82,10 @@ ifeq ($(ARCH),aarch64) - endif - endif - -+ifdef HAVE_EMSCRIPTEN -+ GNUTLS_CONF += --disable-hardware-acceleration -+endif -+ - .gnutls: gnutls - cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF) - $(call pkg_static,"lib/gnutls.pc") --- -2.35.1 - -- GitLab From cd255caebe66e78ab8c212d88dc3694117ce4b91 Mon Sep 17 00:00:00 2001 From: Alaric Senat <alaric@videolabs.io> Date: Fri, 8 Mar 2024 15:20:24 +0100 Subject: [PATCH 08/11] patches: update patch list No functional changes. --- ...igure-improve-testing-unsupported-GL-functions-f.patch | 6 +++--- ...-modules-disable-libvlc_json-and-ytbdl-vlc.js-17.patch | 6 +++--- ...0003-contrib-ass-add-support-for-wasm-emscripten.patch | 6 +++--- ...4-contrib-gcrypt-add-support-for-wasm-emscripten.patch | 6 +++--- ...0005-contrib-gmp-add-support-for-wasm-emscripten.patch | 6 +++--- ...> 0006-aout-add-emscripten-audio-worklet-module.patch} | 6 +++--- ...alize-formatting-in-audio_output-emscripten.cpp.patch} | 6 +++--- ...mscripten-API-to-get-set-volume-levels-in-audio.patch} | 6 +++--- ...09-Move-some-audio-worklet-logic-out-of-JS-code.patch} | 6 +++--- ...ce-untyped-js_index_load-store-functions-with-C.patch} | 6 +++--- ...olume-handling-in-emscripten-audio_output-modul.patch} | 6 +++--- ...index_wait.patch => 0012-aout-fix-js_index_wait.patch} | 6 +++--- ...gl-display.patch => 0013-opengl-set-egl-display.patch} | 6 +++--- ....patch => 0014-vout-add-emscripten-webgl-module.patch} | 6 +++--- ...15-vout-add-emscripten-window-and-webgl-context.patch} | 6 +++--- ...atch => 0016-module-vout-Allow-C-OpenGL-modules.patch} | 6 +++--- ...=> 0017-TMP-Start-the-vout-from-the-vout-thread.patch} | 6 +++--- ...tch => 0018-build.sh-Forcefully-disable-accept4.patch} | 6 +++--- ...ch => 0019-modules-Convert-emscripten-vout-to-C.patch} | 6 +++--- ...> 0020-codec-Add-a-webcodec-decoder-device-type.patch} | 6 +++--- ...vlc_picture.h-Add-a-webcodec-video-context-type.patch} | 6 +++--- ...ch => 0022-fourcc-Add-an-opaque-webcodec-fourcc.patch} | 6 +++--- ....patch => 0023-emscripten-build.sh-Enable-gles2.patch} | 6 +++--- ... 0024-emscripten-build-Forcefully-disable-pipe2.patch} | 6 +++--- ...ec.patch => 0025-emscripten-build-Disable-nvdec.patch} | 6 +++--- ...oder.patch => 0026-codec-Add-a-webcodec-decoder.patch} | 6 +++--- ...out-Add-an-emscripten-webcodec-glinterop-module.patch} | 6 +++--- ... 0028-vout-emscripten-Adapt-to-webcodec-changes.patch} | 6 +++--- ...pengl-sampler-avoid-crashing-on-unbind-location.patch} | 6 +++--- ...030-audio_output-emscripten-remove-set_category.patch} | 6 +++--- ... => 0031-vlc_vout_window-add-canvas-handle-type.patch} | 6 +++--- ...-opengl-filter-forward-declaration-for-samplers.patch} | 6 +++--- ...> 0033-include-move-vlc_opengl_filter.h-to-core.patch} | 6 +++--- ...pengl-mock-expose-module-on-emscripten-platform.patch} | 6 +++--- ....patch => 0035-vlc_opengl_filter-add-gl-pointer.patch} | 6 +++--- ...=> 0036-opengl-filter-move-to-vlc_opengl_filter.patch} | 6 +++--- ...mock.patch => 0037-opengl-mock-load-API-in-mock.patch} | 6 +++--- ...c_vout_display-VLC_OBJECT-wrap-vout_display_New.patch} | 6 +++--- ...patch => 0039-hw-Add-emscripten-video-converter.patch} | 6 +++--- ...ipten-Add-a-WebCodec-frame-to-software-converte.patch} | 6 +++--- ...-gme.patch => 0041-contrib-disable-ubsan-in-gme.patch} | 6 +++--- ...mscripten-Add-a-picture_pool-to-the-common-code.patch} | 6 +++--- ...ch => 0043-emscripten-webcodec-Use-picture-pool.patch} | 6 +++--- ...-emscripten-converter-Use-picture-pool-untested.patch} | 6 +++--- ... => 0045-emscripten-interop-Use-picture-context.patch} | 6 +++--- ...k.patch => 0046-emscripten-vout-Fix-memory-leak.patch} | 6 +++--- ...ipten-interop-Query-the-frame-to-the-decoder-fr.patch} | 6 +++--- ...ipten-webcodec-Simplify-initialization-and-adap.patch} | 6 +++--- ...ng.patch => 0049-webcodec-Remove-unused-binding.patch} | 6 +++--- ...remove-debug.patch => 0050-interop-remove-debug.patch} | 6 +++--- ...emove-debug.patch => 0051-webcodec-remove-debug.patch} | 6 +++--- ... => 0052-WIP-webcodec-remove-manual-block-queue.patch} | 6 +++--- ...emove-debug.patch => 0053-webcodec-remove-debug.patch} | 6 +++--- ...dec-Only-transfer-a-block-pointer-to-the-decode.patch} | 6 +++--- ...ion.patch => 0055-webcodec-minor-simplification.patch} | 6 +++--- ...dec-Acquire-vout-message-port-before-queuing-pi.patch} | 6 +++--- ...patch => 0057-webcodec-Fix-invalid-error-return.patch} | 6 +++--- ...ebcodec-Reintroduce-a-block-queue-hoping-to-sol.patch} | 6 +++--- ...patch => 0059-wip-setjmp-lgjmp-requires-atomics.patch} | 6 +++--- ...atch => 0060-webcodec-revert-manual-block-queue.patch} | 6 +++--- ...tch => 0061-webcodec-Don-t-optimize-for-latency.patch} | 6 +++--- ...ch => 0062-webcodec-Properly-implement-flushing.patch} | 6 +++--- ...ipten-Handle-late-displayFrame-messages-after-a.patch} | 6 +++--- ...ion.patch => 0064-webcodec-Minor-simplification.patch} | 6 +++--- ...ch => 0065-emscripten-add-js-File-access-plugin.patch} | 6 +++--- ...ch => 0066-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch} | 6 +++--- ...l-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch} | 6 +++--- ...tch => 0068-wip-cast-to-avoid-compilation-error.patch} | 6 +++--- vlc_patches/aug/0069-wip.patch | 6 +++--- .../aug/0070-adapt-to-new-emscripten-version.patch | 6 +++--- .../0071-don-t-call-emscripten_set_main_loop-twice.patch | 6 +++--- ...0072-Revert-emscripten-add-js-File-access-plugin.patch | 6 +++--- .../aug/0073-emscripten-add-js-File-access-plugin.patch | 6 +++--- .../0074-emjsfile-Close-file-access-if-open-failed.patch | 6 +++--- ...0075-emjsfile-document-js_file_size-struct-field.patch | 6 +++--- .../aug/0076-emjsfile-adapt-to-emscripten-change.patch | 6 +++--- .../aug/0077-wip-allow-decoding-NULL-blocks-drain.patch | 6 +++--- vlc_patches/aug/0078-fix-jitter-in-flac-playback.patch | 6 +++--- vlc_patches/aug/0079-replace-audio-output-module.patch | 8 ++++---- .../aug/0080-audio_output-wait-for-initialization.patch | 6 +++--- ...o_output-force-downmixing-when-browser-chan-coun.patch | 8 ++++---- 81 files changed, 245 insertions(+), 245 deletions(-) rename vlc_patches/aug/{0007-aout-add-emscripten-audio-worklet-module.patch => 0006-aout-add-emscripten-audio-worklet-module.patch} (99%) rename vlc_patches/aug/{0008-Normalize-formatting-in-audio_output-emscripten.cpp.patch => 0007-Normalize-formatting-in-audio_output-emscripten.cpp.patch} (98%) rename vlc_patches/aug/{0009-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch => 0008-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch} (92%) rename vlc_patches/aug/{0010-Move-some-audio-worklet-logic-out-of-JS-code.patch => 0009-Move-some-audio-worklet-logic-out-of-JS-code.patch} (96%) rename vlc_patches/aug/{0011-Replace-untyped-js_index_load-store-functions-with-C.patch => 0010-Replace-untyped-js_index_load-store-functions-with-C.patch} (98%) rename vlc_patches/aug/{0012-Fix-volume-handling-in-emscripten-audio_output-modul.patch => 0011-Fix-volume-handling-in-emscripten-audio_output-modul.patch} (96%) rename vlc_patches/aug/{0013-aout-fix-js_index_wait.patch => 0012-aout-fix-js_index_wait.patch} (93%) rename vlc_patches/aug/{0014-opengl-set-egl-display.patch => 0013-opengl-set-egl-display.patch} (90%) rename vlc_patches/aug/{0015-vout-add-emscripten-webgl-module.patch => 0014-vout-add-emscripten-webgl-module.patch} (97%) rename vlc_patches/aug/{0016-vout-add-emscripten-window-and-webgl-context.patch => 0015-vout-add-emscripten-window-and-webgl-context.patch} (88%) rename vlc_patches/aug/{0017-module-vout-Allow-C-OpenGL-modules.patch => 0016-module-vout-Allow-C-OpenGL-modules.patch} (85%) rename vlc_patches/aug/{0018-TMP-Start-the-vout-from-the-vout-thread.patch => 0017-TMP-Start-the-vout-from-the-vout-thread.patch} (95%) rename vlc_patches/aug/{0019-build.sh-Forcefully-disable-accept4.patch => 0018-build.sh-Forcefully-disable-accept4.patch} (87%) rename vlc_patches/aug/{0020-modules-Convert-emscripten-vout-to-C.patch => 0019-modules-Convert-emscripten-vout-to-C.patch} (98%) rename vlc_patches/aug/{0021-codec-Add-a-webcodec-decoder-device-type.patch => 0020-codec-Add-a-webcodec-decoder-device-type.patch} (80%) rename vlc_patches/aug/{0022-vlc_picture.h-Add-a-webcodec-video-context-type.patch => 0021-vlc_picture.h-Add-a-webcodec-video-context-type.patch} (82%) rename vlc_patches/aug/{0023-fourcc-Add-an-opaque-webcodec-fourcc.patch => 0022-fourcc-Add-an-opaque-webcodec-fourcc.patch} (89%) rename vlc_patches/aug/{0024-emscripten-build.sh-Enable-gles2.patch => 0023-emscripten-build.sh-Enable-gles2.patch} (86%) rename vlc_patches/aug/{0025-emscripten-build-Forcefully-disable-pipe2.patch => 0024-emscripten-build-Forcefully-disable-pipe2.patch} (85%) rename vlc_patches/aug/{0026-emscripten-build-Disable-nvdec.patch => 0025-emscripten-build-Disable-nvdec.patch} (85%) rename vlc_patches/aug/{0027-codec-Add-a-webcodec-decoder.patch => 0026-codec-Add-a-webcodec-decoder.patch} (99%) rename vlc_patches/aug/{0028-vout-Add-an-emscripten-webcodec-glinterop-module.patch => 0027-vout-Add-an-emscripten-webcodec-glinterop-module.patch} (98%) rename vlc_patches/aug/{0029-vout-emscripten-Adapt-to-webcodec-changes.patch => 0028-vout-emscripten-Adapt-to-webcodec-changes.patch} (98%) rename vlc_patches/aug/{0030-opengl-sampler-avoid-crashing-on-unbind-location.patch => 0029-opengl-sampler-avoid-crashing-on-unbind-location.patch} (95%) rename vlc_patches/aug/{0031-audio_output-emscripten-remove-set_category.patch => 0030-audio_output-emscripten-remove-set_category.patch} (83%) rename vlc_patches/aug/{0032-vlc_vout_window-add-canvas-handle-type.patch => 0031-vlc_vout_window-add-canvas-handle-type.patch} (83%) rename vlc_patches/aug/{0033-opengl-filter-forward-declaration-for-samplers.patch => 0032-opengl-filter-forward-declaration-for-samplers.patch} (95%) rename vlc_patches/aug/{0034-include-move-vlc_opengl_filter.h-to-core.patch => 0033-include-move-vlc_opengl_filter.h-to-core.patch} (97%) rename vlc_patches/aug/{0035-opengl-mock-expose-module-on-emscripten-platform.patch => 0034-opengl-mock-expose-module-on-emscripten-platform.patch} (87%) rename vlc_patches/aug/{0036-vlc_opengl_filter-add-gl-pointer.patch => 0035-vlc_opengl_filter-add-gl-pointer.patch} (89%) rename vlc_patches/aug/{0037-opengl-filter-move-to-vlc_opengl_filter.patch => 0036-opengl-filter-move-to-vlc_opengl_filter.patch} (98%) rename vlc_patches/aug/{0038-opengl-mock-load-API-in-mock.patch => 0037-opengl-mock-load-API-in-mock.patch} (86%) rename vlc_patches/aug/{0039-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch => 0038-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch} (90%) rename vlc_patches/aug/{0040-hw-Add-emscripten-video-converter.patch => 0039-hw-Add-emscripten-video-converter.patch} (98%) rename vlc_patches/aug/{0041-emscripten-Add-a-WebCodec-frame-to-software-converte.patch => 0040-emscripten-Add-a-WebCodec-frame-to-software-converte.patch} (96%) rename vlc_patches/aug/{0042-contrib-disable-ubsan-in-gme.patch => 0041-contrib-disable-ubsan-in-gme.patch} (87%) rename vlc_patches/aug/{0043-emscripten-Add-a-picture_pool-to-the-common-code.patch => 0042-emscripten-Add-a-picture_pool-to-the-common-code.patch} (97%) rename vlc_patches/aug/{0044-emscripten-webcodec-Use-picture-pool.patch => 0043-emscripten-webcodec-Use-picture-pool.patch} (96%) rename vlc_patches/aug/{0045-emscripten-converter-Use-picture-pool-untested.patch => 0044-emscripten-converter-Use-picture-pool-untested.patch} (96%) rename vlc_patches/aug/{0046-emscripten-interop-Use-picture-context.patch => 0045-emscripten-interop-Use-picture-context.patch} (97%) rename vlc_patches/aug/{0047-emscripten-vout-Fix-memory-leak.patch => 0046-emscripten-vout-Fix-memory-leak.patch} (87%) rename vlc_patches/aug/{0048-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch => 0047-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch} (97%) rename vlc_patches/aug/{0049-emscripten-webcodec-Simplify-initialization-and-adap.patch => 0048-emscripten-webcodec-Simplify-initialization-and-adap.patch} (98%) rename vlc_patches/aug/{0050-webcodec-Remove-unused-binding.patch => 0049-webcodec-Remove-unused-binding.patch} (82%) rename vlc_patches/aug/{0051-interop-remove-debug.patch => 0050-interop-remove-debug.patch} (92%) rename vlc_patches/aug/{0052-webcodec-remove-debug.patch => 0051-webcodec-remove-debug.patch} (86%) rename vlc_patches/aug/{0053-WIP-webcodec-remove-manual-block-queue.patch => 0052-WIP-webcodec-remove-manual-block-queue.patch} (98%) rename vlc_patches/aug/{0054-webcodec-remove-debug.patch => 0053-webcodec-remove-debug.patch} (86%) rename vlc_patches/aug/{0055-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch => 0054-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch} (96%) rename vlc_patches/aug/{0056-webcodec-minor-simplification.patch => 0055-webcodec-minor-simplification.patch} (88%) rename vlc_patches/aug/{0057-webcodec-Acquire-vout-message-port-before-queuing-pi.patch => 0056-webcodec-Acquire-vout-message-port-before-queuing-pi.patch} (89%) rename vlc_patches/aug/{0058-webcodec-Fix-invalid-error-return.patch => 0057-webcodec-Fix-invalid-error-return.patch} (84%) rename vlc_patches/aug/{0059-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch => 0058-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch} (96%) rename vlc_patches/aug/{0060-wip-setjmp-lgjmp-requires-atomics.patch => 0059-wip-setjmp-lgjmp-requires-atomics.patch} (92%) rename vlc_patches/aug/{0061-webcodec-revert-manual-block-queue.patch => 0060-webcodec-revert-manual-block-queue.patch} (96%) rename vlc_patches/aug/{0062-webcodec-Don-t-optimize-for-latency.patch => 0061-webcodec-Don-t-optimize-for-latency.patch} (88%) rename vlc_patches/aug/{0063-webcodec-Properly-implement-flushing.patch => 0062-webcodec-Properly-implement-flushing.patch} (94%) rename vlc_patches/aug/{0064-emscripten-Handle-late-displayFrame-messages-after-a.patch => 0063-emscripten-Handle-late-displayFrame-messages-after-a.patch} (93%) rename vlc_patches/aug/{0065-webcodec-Minor-simplification.patch => 0064-webcodec-Minor-simplification.patch} (87%) rename vlc_patches/aug/{0066-emscripten-add-js-File-access-plugin.patch => 0065-emscripten-add-js-File-access-plugin.patch} (98%) rename vlc_patches/aug/{0067-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch => 0066-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch} (84%) rename vlc_patches/aug/{0068-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch => 0067-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch} (91%) rename vlc_patches/aug/{0069-wip-cast-to-avoid-compilation-error.patch => 0068-wip-cast-to-avoid-compilation-error.patch} (80%) diff --git a/vlc_patches/aug/0001-configure-improve-testing-unsupported-GL-functions-f.patch b/vlc_patches/aug/0001-configure-improve-testing-unsupported-GL-functions-f.patch index 832087c..b4e02d3 100644 --- a/vlc_patches/aug/0001-configure-improve-testing-unsupported-GL-functions-f.patch +++ b/vlc_patches/aug/0001-configure-improve-testing-unsupported-GL-functions-f.patch @@ -1,7 +1,7 @@ -From cdd64a1c6c680245cd89a66c957347318be707ec Mon Sep 17 00:00:00 2001 +From 5313b66414926b8dfb682b782373bfbf9f48fdca Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Tue, 27 Apr 2021 15:34:23 +0200 -Subject: [PATCH 01/77] configure: improve testing unsupported GL functions for +Subject: [PATCH 01/85] configure: improve testing unsupported GL functions for emscripten The build system assumes OpenGL functions are implemented if the headers are defined. @@ -39,5 +39,5 @@ index a5771e36f4..5bde060fb7 100644 GL_CFLAGS="" AS_IF([test "${SYS}" != "mingw32"], [ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0002-modules-disable-libvlc_json-and-ytbdl-vlc.js-17.patch b/vlc_patches/aug/0002-modules-disable-libvlc_json-and-ytbdl-vlc.js-17.patch index 93b1def..ace3b43 100644 --- a/vlc_patches/aug/0002-modules-disable-libvlc_json-and-ytbdl-vlc.js-17.patch +++ b/vlc_patches/aug/0002-modules-disable-libvlc_json-and-ytbdl-vlc.js-17.patch @@ -1,7 +1,7 @@ -From bcc3fabcc3dadb03cd0768daa137d019fc45d4c5 Mon Sep 17 00:00:00 2001 +From c28bc1c8c4b32683ea0811898fac66a6e8d25816 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Fri, 16 Apr 2021 11:32:33 +0200 -Subject: [PATCH 02/77] modules: disable libvlc_json and ytbdl vlc.js#17 +Subject: [PATCH 02/85] modules: disable libvlc_json and ytbdl vlc.js#17 The libjson library is not linkable with emsdk v2.0.17, this commit should be reverted when the ticket is resolved. @@ -21,5 +21,5 @@ index 86dfd8abee..3e64246e4d 100644 noinst_LTLIBRARIES += libvlc_json.la +endif -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0003-contrib-ass-add-support-for-wasm-emscripten.patch b/vlc_patches/aug/0003-contrib-ass-add-support-for-wasm-emscripten.patch index f96d2c8..4e806c8 100644 --- a/vlc_patches/aug/0003-contrib-ass-add-support-for-wasm-emscripten.patch +++ b/vlc_patches/aug/0003-contrib-ass-add-support-for-wasm-emscripten.patch @@ -1,7 +1,7 @@ -From 035b067f845042fc0c87d80565783b21bfa50e6c Mon Sep 17 00:00:00 2001 +From 2f1fe49e369a16e25449fa0a3ca72150ddb3a060 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Sun, 30 May 2021 19:22:31 +0200 -Subject: [PATCH 03/77] contrib: ass: add support for wasm-emscripten +Subject: [PATCH 03/85] contrib: ass: add support for wasm-emscripten --- contrib/src/ass/rules.mak | 5 + @@ -153,5 +153,5 @@ index ae4b218fd2..5b4b15ca34 100644 FONTCONFIG_CONF := $(HOSTCONF) \ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0004-contrib-gcrypt-add-support-for-wasm-emscripten.patch b/vlc_patches/aug/0004-contrib-gcrypt-add-support-for-wasm-emscripten.patch index f66cb6f..4286b94 100644 --- a/vlc_patches/aug/0004-contrib-gcrypt-add-support-for-wasm-emscripten.patch +++ b/vlc_patches/aug/0004-contrib-gcrypt-add-support-for-wasm-emscripten.patch @@ -1,7 +1,7 @@ -From 46e99994434a293d92b11bdf7b5089e9c38b5aa2 Mon Sep 17 00:00:00 2001 +From e318ea2e61865a06281c0e622e3dd38098bddccd Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Sun, 30 May 2021 20:38:46 +0200 -Subject: [PATCH 04/77] contrib: gcrypt: add support for wasm-emscripten +Subject: [PATCH 04/85] contrib: gcrypt: add support for wasm-emscripten --- contrib/src/gcrypt/rules.mak | 6 ++++ @@ -89,5 +89,5 @@ index 0ceb75d7a3..5d4236b77f 100644 cp -f -- "$(SRC)/gpg-error/lock-obj-pub.posix.h" \ "$(UNPACK_DIR)/src/lock-obj-pub.native.h" -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0005-contrib-gmp-add-support-for-wasm-emscripten.patch b/vlc_patches/aug/0005-contrib-gmp-add-support-for-wasm-emscripten.patch index d9c252d..e909986 100644 --- a/vlc_patches/aug/0005-contrib-gmp-add-support-for-wasm-emscripten.patch +++ b/vlc_patches/aug/0005-contrib-gmp-add-support-for-wasm-emscripten.patch @@ -1,7 +1,7 @@ -From 540a5ac3eb4d987805e74a8b3d2d585186c2a0c4 Mon Sep 17 00:00:00 2001 +From bffea6f25f8448f5a1c7cd0601d32db8c07de65b Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Sun, 30 May 2021 21:22:40 +0200 -Subject: [PATCH 05/77] contrib: gmp: add support for wasm-emscripten +Subject: [PATCH 05/85] contrib: gmp: add support for wasm-emscripten --- contrib/src/gmp/rules.mak | 3 +++ @@ -22,5 +22,5 @@ index 11fe8acdfa..d6cd702ce0 100644 ifdef HAVE_WIN32 ifeq ($(ARCH),arm) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0007-aout-add-emscripten-audio-worklet-module.patch b/vlc_patches/aug/0006-aout-add-emscripten-audio-worklet-module.patch similarity index 99% rename from vlc_patches/aug/0007-aout-add-emscripten-audio-worklet-module.patch rename to vlc_patches/aug/0006-aout-add-emscripten-audio-worklet-module.patch index fca81e8..6dd85f0 100644 --- a/vlc_patches/aug/0007-aout-add-emscripten-audio-worklet-module.patch +++ b/vlc_patches/aug/0006-aout-add-emscripten-audio-worklet-module.patch @@ -1,7 +1,7 @@ -From ea0d8db56cedf16328c1f88e9bd2406ef3bdcd29 Mon Sep 17 00:00:00 2001 +From 567be2dfd934fcc3595469a036854df876d40736 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Fri, 30 Apr 2021 01:15:17 +0200 -Subject: [PATCH 07/77] aout: add emscripten audio worklet module +Subject: [PATCH 06/85] aout: add emscripten audio worklet module --- modules/audio_output/Makefile.am | 5 + @@ -434,5 +434,5 @@ index 0000000000..1c890b3f6d + set_callbacks( Open, Close ) +vlc_module_end () -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0008-Normalize-formatting-in-audio_output-emscripten.cpp.patch b/vlc_patches/aug/0007-Normalize-formatting-in-audio_output-emscripten.cpp.patch similarity index 98% rename from vlc_patches/aug/0008-Normalize-formatting-in-audio_output-emscripten.cpp.patch rename to vlc_patches/aug/0007-Normalize-formatting-in-audio_output-emscripten.cpp.patch index 8dc8721..1db5545 100644 --- a/vlc_patches/aug/0008-Normalize-formatting-in-audio_output-emscripten.cpp.patch +++ b/vlc_patches/aug/0007-Normalize-formatting-in-audio_output-emscripten.cpp.patch @@ -1,7 +1,7 @@ -From 31ca0b2e4b1d26cbe867d2effd60bd1fae5325e5 Mon Sep 17 00:00:00 2001 +From f6d3f9199a1d892a00b7845bc684213f2ec207fe Mon Sep 17 00:00:00 2001 From: Olivier FAURE <couteaubleu@gmail.com> Date: Sun, 30 May 2021 12:01:49 +0200 -Subject: [PATCH 08/77] Normalize formatting in audio_output/emscripten.cpp +Subject: [PATCH 07/85] Normalize formatting in audio_output/emscripten.cpp --- modules/audio_output/emscripten.cpp | 74 ++++++++++++++--------------- @@ -257,5 +257,5 @@ index 1c890b3f6d..b704b90699 100644 // Since the WebAudio Context cannot be created in a worker, we create // it in the main_thread and use the SAB to signal it when we want it to start -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0009-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch b/vlc_patches/aug/0008-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch similarity index 92% rename from vlc_patches/aug/0009-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch rename to vlc_patches/aug/0008-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch index 7c9242e..9e95d7e 100644 --- a/vlc_patches/aug/0009-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch +++ b/vlc_patches/aug/0008-Fix-emscripten-API-to-get-set-volume-levels-in-audio.patch @@ -1,7 +1,7 @@ -From 1741a092eae194f532b3e95400d90020be4517ab Mon Sep 17 00:00:00 2001 +From a57f1a2fd94c75224da1e41860e8f578b7f721f6 Mon Sep 17 00:00:00 2001 From: Olivier FAURE <couteaubleu@gmail.com> Date: Sun, 30 May 2021 12:14:26 +0200 -Subject: [PATCH 09/77] Fix emscripten API to get/set volume levels in +Subject: [PATCH 08/85] Fix emscripten API to get/set volume levels in audio_output module --- @@ -50,5 +50,5 @@ index b704b90699..3fefa60065 100644 return 0; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0010-Move-some-audio-worklet-logic-out-of-JS-code.patch b/vlc_patches/aug/0009-Move-some-audio-worklet-logic-out-of-JS-code.patch similarity index 96% rename from vlc_patches/aug/0010-Move-some-audio-worklet-logic-out-of-JS-code.patch rename to vlc_patches/aug/0009-Move-some-audio-worklet-logic-out-of-JS-code.patch index 0b970d1..b8b68f3 100644 --- a/vlc_patches/aug/0010-Move-some-audio-worklet-logic-out-of-JS-code.patch +++ b/vlc_patches/aug/0009-Move-some-audio-worklet-logic-out-of-JS-code.patch @@ -1,7 +1,7 @@ -From 44959e310fbf34b740b25010387fd08914fb5f3d Mon Sep 17 00:00:00 2001 +From 108573ff2252a68b4ccb454d707fe5858d7ab345 Mon Sep 17 00:00:00 2001 From: Olivier FAURE <couteaubleu@gmail.com> Date: Sun, 30 May 2021 14:18:32 +0200 -Subject: [PATCH 10/77] Move some audio worklet logic out of JS code. +Subject: [PATCH 09/85] Move some audio worklet logic out of JS code. This isn't terribly useful on its own, but serves to prepare the next commit. @@ -80,5 +80,5 @@ index 3fefa60065..625dda30c0 100644 } \ } \ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0011-Replace-untyped-js_index_load-store-functions-with-C.patch b/vlc_patches/aug/0010-Replace-untyped-js_index_load-store-functions-with-C.patch similarity index 98% rename from vlc_patches/aug/0011-Replace-untyped-js_index_load-store-functions-with-C.patch rename to vlc_patches/aug/0010-Replace-untyped-js_index_load-store-functions-with-C.patch index c91b608..a754ab4 100644 --- a/vlc_patches/aug/0011-Replace-untyped-js_index_load-store-functions-with-C.patch +++ b/vlc_patches/aug/0010-Replace-untyped-js_index_load-store-functions-with-C.patch @@ -1,7 +1,7 @@ -From 79a00fe61cde93bd8416a88b41a4a5a68737befa Mon Sep 17 00:00:00 2001 +From 6e69107c2420280acf786a18648575a40c75c836 Mon Sep 17 00:00:00 2001 From: Olivier FAURE <couteaubleu@gmail.com> Date: Sun, 30 May 2021 15:15:22 +0200 -Subject: [PATCH 11/77] Replace untyped js_index_load/store functions with C++ +Subject: [PATCH 10/85] Replace untyped js_index_load/store functions with C++ atomics --- @@ -287,5 +287,5 @@ index 625dda30c0..fa0f5bd3e4 100644 val awn_caller = cb_caller["awn_call"]; val awn_cb = awn_caller.call<val>("bind", cb_caller); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0012-Fix-volume-handling-in-emscripten-audio_output-modul.patch b/vlc_patches/aug/0011-Fix-volume-handling-in-emscripten-audio_output-modul.patch similarity index 96% rename from vlc_patches/aug/0012-Fix-volume-handling-in-emscripten-audio_output-modul.patch rename to vlc_patches/aug/0011-Fix-volume-handling-in-emscripten-audio_output-modul.patch index 4cfd159..8bd4eb2 100644 --- a/vlc_patches/aug/0012-Fix-volume-handling-in-emscripten-audio_output-modul.patch +++ b/vlc_patches/aug/0011-Fix-volume-handling-in-emscripten-audio_output-modul.patch @@ -1,7 +1,7 @@ -From 57c7d65d059510b0a39567a0d69351780d8b44c0 Mon Sep 17 00:00:00 2001 +From 0d255cb962ef3ab2f4fcd5da5cd2b03271402d12 Mon Sep 17 00:00:00 2001 From: Olivier FAURE <couteaubleu@gmail.com> Date: Sun, 30 May 2021 17:18:23 +0200 -Subject: [PATCH 12/77] Fix volume handling in emscripten audio_output module +Subject: [PATCH 11/85] Fix volume handling in emscripten audio_output module Fix bug that had volume divided by 4 Store mute state separately @@ -120,5 +120,5 @@ index fa0f5bd3e4..c39ca884b6 100644 { \ for (let c = 0; c < nbChannels; ++c) { \ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0013-aout-fix-js_index_wait.patch b/vlc_patches/aug/0012-aout-fix-js_index_wait.patch similarity index 93% rename from vlc_patches/aug/0013-aout-fix-js_index_wait.patch rename to vlc_patches/aug/0012-aout-fix-js_index_wait.patch index ea66d4f..3674a40 100644 --- a/vlc_patches/aug/0013-aout-fix-js_index_wait.patch +++ b/vlc_patches/aug/0012-aout-fix-js_index_wait.patch @@ -1,7 +1,7 @@ -From 7a138898779f9bf1d4af79361e05b580f068461c Mon Sep 17 00:00:00 2001 +From 814d6d032945d9ac8c131f98d898f05625040ada Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Thu, 1 Jul 2021 11:28:53 +0200 -Subject: [PATCH 13/77] aout: fix js_index_wait +Subject: [PATCH 12/85] aout: fix js_index_wait - fix return type - notifying without changing the value won't update the value @@ -47,5 +47,5 @@ index c39ca884b6..6acea387e3 100644 } \ } \ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0014-opengl-set-egl-display.patch b/vlc_patches/aug/0013-opengl-set-egl-display.patch similarity index 90% rename from vlc_patches/aug/0014-opengl-set-egl-display.patch rename to vlc_patches/aug/0013-opengl-set-egl-display.patch index f45519a..1d9f323 100644 --- a/vlc_patches/aug/0014-opengl-set-egl-display.patch +++ b/vlc_patches/aug/0013-opengl-set-egl-display.patch @@ -1,7 +1,7 @@ -From 1f56116d4a13943522a5e59d09b941adf4535a35 Mon Sep 17 00:00:00 2001 +From b1ba1f9a8b833e633a58e34af58c007908828d18 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Tue, 27 Apr 2021 16:27:19 +0200 -Subject: [PATCH 14/77] opengl: set egl display +Subject: [PATCH 13/85] opengl: set egl display Emscripten does not implement EGL extensions. https://emscripten.org/docs/porting/multimedia_and_graphics/EGL-Support-in-Emscripten.html#egl-extensions @@ -25,5 +25,5 @@ index dfb841feef..730fb381d2 100644 #elif defined(EGL_KHR_display_reference) const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0015-vout-add-emscripten-webgl-module.patch b/vlc_patches/aug/0014-vout-add-emscripten-webgl-module.patch similarity index 97% rename from vlc_patches/aug/0015-vout-add-emscripten-webgl-module.patch rename to vlc_patches/aug/0014-vout-add-emscripten-webgl-module.patch index 9f73141..d84fd3c 100644 --- a/vlc_patches/aug/0015-vout-add-emscripten-webgl-module.patch +++ b/vlc_patches/aug/0014-vout-add-emscripten-webgl-module.patch @@ -1,7 +1,7 @@ -From 4a8434bf69a9f4b6e684bc750b4cbe3aa3c49685 Mon Sep 17 00:00:00 2001 +From 717a152d29c2695321ad850f27a77628d3d1e651 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Tue, 27 Apr 2021 16:45:02 +0200 -Subject: [PATCH 15/77] vout: add emscripten webgl module +Subject: [PATCH 14/85] vout: add emscripten webgl module this module uses the OFFSCREEN_FRAMEBUFFER option which adds a backbuffer to the webgl context, that will be used @@ -217,5 +217,5 @@ index 0000000000..05c17d3179 +vlc_module_end() + -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0016-vout-add-emscripten-window-and-webgl-context.patch b/vlc_patches/aug/0015-vout-add-emscripten-window-and-webgl-context.patch similarity index 88% rename from vlc_patches/aug/0016-vout-add-emscripten-window-and-webgl-context.patch rename to vlc_patches/aug/0015-vout-add-emscripten-window-and-webgl-context.patch index 9b9045a..3a0b419 100644 --- a/vlc_patches/aug/0016-vout-add-emscripten-window-and-webgl-context.patch +++ b/vlc_patches/aug/0015-vout-add-emscripten-window-and-webgl-context.patch @@ -1,7 +1,7 @@ -From b28ea0ff21f0764f285f9094cd6f2359c91d9596 Mon Sep 17 00:00:00 2001 +From 6c0f495b57eb9297870c9f318b85a57af9a2b6c8 Mon Sep 17 00:00:00 2001 From: Etienne Brateau <etienne.brateau@gmail.com> Date: Tue, 27 Apr 2021 16:19:40 +0200 -Subject: [PATCH 16/77] vout: add emscripten window and webgl context +Subject: [PATCH 15/85] vout: add emscripten window and webgl context --- include/vlc_vout_window.h | 2 ++ @@ -28,5 +28,5 @@ index a3dfd1bfca..b5a01b33e4 100644 /** Display server (mandatory) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0017-module-vout-Allow-C-OpenGL-modules.patch b/vlc_patches/aug/0016-module-vout-Allow-C-OpenGL-modules.patch similarity index 85% rename from vlc_patches/aug/0017-module-vout-Allow-C-OpenGL-modules.patch rename to vlc_patches/aug/0016-module-vout-Allow-C-OpenGL-modules.patch index a767aab..aa4cfab 100644 --- a/vlc_patches/aug/0017-module-vout-Allow-C-OpenGL-modules.patch +++ b/vlc_patches/aug/0016-module-vout-Allow-C-OpenGL-modules.patch @@ -1,7 +1,7 @@ -From 839d192745f4d60f7d68e7b2eee30162c08f7e05 Mon Sep 17 00:00:00 2001 +From e1f73b3244f975a9ec9cccc51ff81302c0f77648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Mon, 17 Jan 2022 15:56:42 +0100 -Subject: [PATCH 17/77] module: vout: Allow C++ OpenGL modules +Subject: [PATCH 16/85] module: vout: Allow C++ OpenGL modules --- modules/video_output/opengl/sampler.h | 9 +++++++++ @@ -33,5 +33,5 @@ index c779f2a9ba..2a5f0ef063 100644 + #endif -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0018-TMP-Start-the-vout-from-the-vout-thread.patch b/vlc_patches/aug/0017-TMP-Start-the-vout-from-the-vout-thread.patch similarity index 95% rename from vlc_patches/aug/0018-TMP-Start-the-vout-from-the-vout-thread.patch rename to vlc_patches/aug/0017-TMP-Start-the-vout-from-the-vout-thread.patch index 996969d..4a960dd 100644 --- a/vlc_patches/aug/0018-TMP-Start-the-vout-from-the-vout-thread.patch +++ b/vlc_patches/aug/0017-TMP-Start-the-vout-from-the-vout-thread.patch @@ -1,7 +1,7 @@ -From 5f9b0db3e274cbc2cd83414d3245bed255aa4b81 Mon Sep 17 00:00:00 2001 +From 6a2597ef65d05c61991291c3dfddafc96f1e810d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Fri, 21 Jan 2022 09:59:35 +0100 -Subject: [PATCH 18/77] TMP: Start the vout from the vout thread +Subject: [PATCH 17/85] TMP: Start the vout from the vout thread --- src/video_output/video_output.c | 31 +++++++++++++++++++++++++------ @@ -78,5 +78,5 @@ index 7b03fca641..8b8ce5f323 100644 if (input != NULL && sys->spu) spu_Attach(sys->spu, input); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0019-build.sh-Forcefully-disable-accept4.patch b/vlc_patches/aug/0018-build.sh-Forcefully-disable-accept4.patch similarity index 87% rename from vlc_patches/aug/0019-build.sh-Forcefully-disable-accept4.patch rename to vlc_patches/aug/0018-build.sh-Forcefully-disable-accept4.patch index 30309ba..b5f3f9b 100644 --- a/vlc_patches/aug/0019-build.sh-Forcefully-disable-accept4.patch +++ b/vlc_patches/aug/0018-build.sh-Forcefully-disable-accept4.patch @@ -1,7 +1,7 @@ -From dc3975b019fb46dfa37c6216703b4eb97ff4e608 Mon Sep 17 00:00:00 2001 +From 3f2510e7560b7d107c26be8908a1c07b428bda86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:30:49 +0100 -Subject: [PATCH 19/77] build.sh: Forcefully disable accept4 +Subject: [PATCH 18/85] build.sh: Forcefully disable accept4 In order to declare vlc_cloexec --- @@ -22,5 +22,5 @@ index 69d6b98c47..c1ea999806 100755 fi -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0020-modules-Convert-emscripten-vout-to-C.patch b/vlc_patches/aug/0019-modules-Convert-emscripten-vout-to-C.patch similarity index 98% rename from vlc_patches/aug/0020-modules-Convert-emscripten-vout-to-C.patch rename to vlc_patches/aug/0019-modules-Convert-emscripten-vout-to-C.patch index 9ea808a..404cf94 100644 --- a/vlc_patches/aug/0020-modules-Convert-emscripten-vout-to-C.patch +++ b/vlc_patches/aug/0019-modules-Convert-emscripten-vout-to-C.patch @@ -1,7 +1,7 @@ -From de9a47b9c4bf6fb2d6ac20b7aecba3064943f4aa Mon Sep 17 00:00:00 2001 +From 962428a25e3b490a66e1530a04668f5c4272a897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:35:05 +0100 -Subject: [PATCH 20/77] modules: Convert emscripten vout to C++ +Subject: [PATCH 19/85] modules: Convert emscripten vout to C++ We'll need to be able to use various emscripten features that are only available through C++ @@ -389,5 +389,5 @@ index 0000000000..857d921c27 +vlc_module_end() + -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0021-codec-Add-a-webcodec-decoder-device-type.patch b/vlc_patches/aug/0020-codec-Add-a-webcodec-decoder-device-type.patch similarity index 80% rename from vlc_patches/aug/0021-codec-Add-a-webcodec-decoder-device-type.patch rename to vlc_patches/aug/0020-codec-Add-a-webcodec-decoder-device-type.patch index f37268a..2975a7a 100644 --- a/vlc_patches/aug/0021-codec-Add-a-webcodec-decoder-device-type.patch +++ b/vlc_patches/aug/0020-codec-Add-a-webcodec-decoder-device-type.patch @@ -1,7 +1,7 @@ -From d36a5341abd7cbb4ad39af1dc9434ba1608a6678 Mon Sep 17 00:00:00 2001 +From f8d9e932ecfa7cef4375f3ccc2dbe45e5d4f822c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:47:13 +0100 -Subject: [PATCH 21/77] codec: Add a webcodec decoder device type +Subject: [PATCH 20/85] codec: Add a webcodec decoder device type --- include/vlc_codec.h | 1 + @@ -20,5 +20,5 @@ index ff707e73a3..7460d03ed6 100644 struct vlc_decoder_device_operations -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0022-vlc_picture.h-Add-a-webcodec-video-context-type.patch b/vlc_patches/aug/0021-vlc_picture.h-Add-a-webcodec-video-context-type.patch similarity index 82% rename from vlc_patches/aug/0022-vlc_picture.h-Add-a-webcodec-video-context-type.patch rename to vlc_patches/aug/0021-vlc_picture.h-Add-a-webcodec-video-context-type.patch index 4ed5ada..a1fe0b7 100644 --- a/vlc_patches/aug/0022-vlc_picture.h-Add-a-webcodec-video-context-type.patch +++ b/vlc_patches/aug/0021-vlc_picture.h-Add-a-webcodec-video-context-type.patch @@ -1,7 +1,7 @@ -From 1cc0491674a6287ae12dc6fa6c18a86d6e700f3a Mon Sep 17 00:00:00 2001 +From d78ff6d87fd30c164aa5a816fb9b9bb407dcc221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:50:27 +0100 -Subject: [PATCH 22/77] vlc_picture.h: Add a webcodec video context type +Subject: [PATCH 21/85] vlc_picture.h: Add a webcodec video context type --- include/vlc_picture.h | 1 + @@ -20,5 +20,5 @@ index 5aece95120..fa62e307bd 100644 VLC_API vlc_video_context * vlc_video_context_Create(vlc_decoder_device *, -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0023-fourcc-Add-an-opaque-webcodec-fourcc.patch b/vlc_patches/aug/0022-fourcc-Add-an-opaque-webcodec-fourcc.patch similarity index 89% rename from vlc_patches/aug/0023-fourcc-Add-an-opaque-webcodec-fourcc.patch rename to vlc_patches/aug/0022-fourcc-Add-an-opaque-webcodec-fourcc.patch index 7376b8c..429a337 100644 --- a/vlc_patches/aug/0023-fourcc-Add-an-opaque-webcodec-fourcc.patch +++ b/vlc_patches/aug/0022-fourcc-Add-an-opaque-webcodec-fourcc.patch @@ -1,7 +1,7 @@ -From 2e7a43f54ae86fcf9fd913d5ec4478a022285c4a Mon Sep 17 00:00:00 2001 +From f966ce902163faff5e61f6660be71f7cc1534cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:51:05 +0100 -Subject: [PATCH 23/77] fourcc: Add an opaque webcodec fourcc +Subject: [PATCH 22/85] fourcc: Add an opaque webcodec fourcc --- include/vlc_fourcc.h | 3 +++ @@ -36,5 +36,5 @@ index 101bb0d980..479a1bd13e 100644 }; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0024-emscripten-build.sh-Enable-gles2.patch b/vlc_patches/aug/0023-emscripten-build.sh-Enable-gles2.patch similarity index 86% rename from vlc_patches/aug/0024-emscripten-build.sh-Enable-gles2.patch rename to vlc_patches/aug/0023-emscripten-build.sh-Enable-gles2.patch index 418ef52..3331d08 100644 --- a/vlc_patches/aug/0024-emscripten-build.sh-Enable-gles2.patch +++ b/vlc_patches/aug/0023-emscripten-build.sh-Enable-gles2.patch @@ -1,7 +1,7 @@ -From 16bd17c0e12b943504416dd67a317abbd9142685 Mon Sep 17 00:00:00 2001 +From 95f4a595ca764e1954dca7e509ad51a6dd4d91d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:52:21 +0100 -Subject: [PATCH 24/77] emscripten: build.sh: Enable gles2 +Subject: [PATCH 23/85] emscripten: build.sh: Enable gles2 Already applied upstream --- @@ -21,5 +21,5 @@ index c1ea999806..5119fe6a6e 100755 fi -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0025-emscripten-build-Forcefully-disable-pipe2.patch b/vlc_patches/aug/0024-emscripten-build-Forcefully-disable-pipe2.patch similarity index 85% rename from vlc_patches/aug/0025-emscripten-build-Forcefully-disable-pipe2.patch rename to vlc_patches/aug/0024-emscripten-build-Forcefully-disable-pipe2.patch index c256c2b..e59ecb8 100644 --- a/vlc_patches/aug/0025-emscripten-build-Forcefully-disable-pipe2.patch +++ b/vlc_patches/aug/0024-emscripten-build-Forcefully-disable-pipe2.patch @@ -1,7 +1,7 @@ -From 5ec33317bdd1ef893d7e937c2fcc5435d3929652 Mon Sep 17 00:00:00 2001 +From 4ddeacfa5d545e905abdc0b8f5b08901b56ec2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:52:49 +0100 -Subject: [PATCH 25/77] emscripten: build: Forcefully disable pipe2 +Subject: [PATCH 24/85] emscripten: build: Forcefully disable pipe2 --- extras/package/wasm-emscripten/build.sh | 1 + @@ -20,5 +20,5 @@ index 5119fe6a6e..5a1dbd230d 100755 --with-contrib="$VLC_SRCPATH"/contrib/wasm32-unknown-emscripten fi -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0026-emscripten-build-Disable-nvdec.patch b/vlc_patches/aug/0025-emscripten-build-Disable-nvdec.patch similarity index 85% rename from vlc_patches/aug/0026-emscripten-build-Disable-nvdec.patch rename to vlc_patches/aug/0025-emscripten-build-Disable-nvdec.patch index aaf092f..32a42cc 100644 --- a/vlc_patches/aug/0026-emscripten-build-Disable-nvdec.patch +++ b/vlc_patches/aug/0025-emscripten-build-Disable-nvdec.patch @@ -1,7 +1,7 @@ -From d80f3c5acc6455a4d3f8afd51b80d3f456203b85 Mon Sep 17 00:00:00 2001 +From 00d9f6a2e774a0fa356c282b26a01adec70132eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:53:10 +0100 -Subject: [PATCH 26/77] emscripten: build: Disable nvdec +Subject: [PATCH 25/85] emscripten: build: Disable nvdec --- extras/package/wasm-emscripten/build.sh | 1 + @@ -20,5 +20,5 @@ index 5a1dbd230d..acd74591fc 100755 fi -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0027-codec-Add-a-webcodec-decoder.patch b/vlc_patches/aug/0026-codec-Add-a-webcodec-decoder.patch similarity index 99% rename from vlc_patches/aug/0027-codec-Add-a-webcodec-decoder.patch rename to vlc_patches/aug/0026-codec-Add-a-webcodec-decoder.patch index add60eb..c2ca30c 100644 --- a/vlc_patches/aug/0027-codec-Add-a-webcodec-decoder.patch +++ b/vlc_patches/aug/0026-codec-Add-a-webcodec-decoder.patch @@ -1,7 +1,7 @@ -From fff9ead944d55025adcb89a4424e2b40baf6d7ca Mon Sep 17 00:00:00 2001 +From a4a9e26c34a5197e827826b6817d83a37e5909fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 09:54:14 +0100 -Subject: [PATCH 27/77] codec: Add a webcodec decoder +Subject: [PATCH 26/85] codec: Add a webcodec decoder --- modules/codec/Makefile.am | 6 + @@ -476,5 +476,5 @@ index 0000000000..3a2d3c9099 + +#endif // EMSCRIPTEN_COMMON_H -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0028-vout-Add-an-emscripten-webcodec-glinterop-module.patch b/vlc_patches/aug/0027-vout-Add-an-emscripten-webcodec-glinterop-module.patch similarity index 98% rename from vlc_patches/aug/0028-vout-Add-an-emscripten-webcodec-glinterop-module.patch rename to vlc_patches/aug/0027-vout-Add-an-emscripten-webcodec-glinterop-module.patch index 8a0739a..5f274ea 100644 --- a/vlc_patches/aug/0028-vout-Add-an-emscripten-webcodec-glinterop-module.patch +++ b/vlc_patches/aug/0027-vout-Add-an-emscripten-webcodec-glinterop-module.patch @@ -1,7 +1,7 @@ -From 3b3a3979fb7d87035bd5607aeb3f8a3b66aacde4 Mon Sep 17 00:00:00 2001 +From 300758517f0351e40e3852ee25e220ef3df556c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 10:00:49 +0100 -Subject: [PATCH 28/77] vout: Add an emscripten/webcodec glinterop module +Subject: [PATCH 27/85] vout: Add an emscripten/webcodec glinterop module --- modules/video_output/Makefile.am | 7 + @@ -262,5 +262,5 @@ index 0000000000..123c1fdb25 + set_subcategory(SUBCAT_VIDEO_VOUT) +vlc_module_end () -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0029-vout-emscripten-Adapt-to-webcodec-changes.patch b/vlc_patches/aug/0028-vout-emscripten-Adapt-to-webcodec-changes.patch similarity index 98% rename from vlc_patches/aug/0029-vout-emscripten-Adapt-to-webcodec-changes.patch rename to vlc_patches/aug/0028-vout-emscripten-Adapt-to-webcodec-changes.patch index a6b70ef..ee6f221 100644 --- a/vlc_patches/aug/0029-vout-emscripten-Adapt-to-webcodec-changes.patch +++ b/vlc_patches/aug/0028-vout-emscripten-Adapt-to-webcodec-changes.patch @@ -1,7 +1,7 @@ -From 448ea00d254b1b970000eb60ba06f55c1186b903 Mon Sep 17 00:00:00 2001 +From df8e29a4ddfb52f7d224ff300b09590a38070e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 3 Feb 2022 10:11:05 +0100 -Subject: [PATCH 29/77] vout: emscripten: Adapt to webcodec changes +Subject: [PATCH 28/85] vout: emscripten: Adapt to webcodec changes --- modules/video_output/emscripten.cpp | 123 ++++++++++++++++++++++------ @@ -226,5 +226,5 @@ index 857d921c27..0c863132f6 100644 add_submodule () set_shortname("Emscripten GL") -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0030-opengl-sampler-avoid-crashing-on-unbind-location.patch b/vlc_patches/aug/0029-opengl-sampler-avoid-crashing-on-unbind-location.patch similarity index 95% rename from vlc_patches/aug/0030-opengl-sampler-avoid-crashing-on-unbind-location.patch rename to vlc_patches/aug/0029-opengl-sampler-avoid-crashing-on-unbind-location.patch index e4aff5b..51f6a63 100644 --- a/vlc_patches/aug/0030-opengl-sampler-avoid-crashing-on-unbind-location.patch +++ b/vlc_patches/aug/0029-opengl-sampler-avoid-crashing-on-unbind-location.patch @@ -1,7 +1,7 @@ -From 5874bfc37d1ebd81e8b20382ec7b9a09207ca4ba Mon Sep 17 00:00:00 2001 +From c8dcd00ab824bea9d4f18f35f4a47dd7fc92491f Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Wed, 23 Feb 2022 11:13:41 +0100 -Subject: [PATCH 30/77] opengl: sampler: avoid crashing on unbind location +Subject: [PATCH 29/85] opengl: sampler: avoid crashing on unbind location --- modules/video_output/opengl/sampler.c | 26 +++++++++++++++++++------- @@ -78,5 +78,5 @@ index 846cbc75ab..9df0446284 100644 vt->Uniform2f(priv->uloc.TexSizes[0], glfmt->tex_widths[plane], glfmt->tex_heights[plane]); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0031-audio_output-emscripten-remove-set_category.patch b/vlc_patches/aug/0030-audio_output-emscripten-remove-set_category.patch similarity index 83% rename from vlc_patches/aug/0031-audio_output-emscripten-remove-set_category.patch rename to vlc_patches/aug/0030-audio_output-emscripten-remove-set_category.patch index 77f978d..39c1f14 100644 --- a/vlc_patches/aug/0031-audio_output-emscripten-remove-set_category.patch +++ b/vlc_patches/aug/0030-audio_output-emscripten-remove-set_category.patch @@ -1,7 +1,7 @@ -From c4f0a0fe0e6977f99bcc16eb13d72df2adbbf0e9 Mon Sep 17 00:00:00 2001 +From fe45c27b4f5850e8354214fa48cda24a748d213c Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Wed, 23 Feb 2022 11:15:45 +0100 -Subject: [PATCH 31/77] audio_output: emscripten: remove set_category +Subject: [PATCH 30/85] audio_output: emscripten: remove set_category please fixup. --- @@ -21,5 +21,5 @@ index 6acea387e3..a7e9fb0d4d 100644 set_callbacks( Open, Close ) vlc_module_end () -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0032-vlc_vout_window-add-canvas-handle-type.patch b/vlc_patches/aug/0031-vlc_vout_window-add-canvas-handle-type.patch similarity index 83% rename from vlc_patches/aug/0032-vlc_vout_window-add-canvas-handle-type.patch rename to vlc_patches/aug/0031-vlc_vout_window-add-canvas-handle-type.patch index a72e7df..400e390 100644 --- a/vlc_patches/aug/0032-vlc_vout_window-add-canvas-handle-type.patch +++ b/vlc_patches/aug/0031-vlc_vout_window-add-canvas-handle-type.patch @@ -1,7 +1,7 @@ -From 62f2dea07966e934bec0185ecaa62cffcfa804f5 Mon Sep 17 00:00:00 2001 +From 039467c96f02f73e2e249ecbd028e4f7609bd344 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 22 Feb 2022 16:47:25 +0100 -Subject: [PATCH 32/77] vlc_vout_window: add canvas handle type +Subject: [PATCH 31/85] vlc_vout_window: add canvas handle type --- include/vlc_vout_window.h | 1 + @@ -20,5 +20,5 @@ index b5a01b33e4..0803e65b78 100644 /** Display server (mandatory) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0033-opengl-filter-forward-declaration-for-samplers.patch b/vlc_patches/aug/0032-opengl-filter-forward-declaration-for-samplers.patch similarity index 95% rename from vlc_patches/aug/0033-opengl-filter-forward-declaration-for-samplers.patch rename to vlc_patches/aug/0032-opengl-filter-forward-declaration-for-samplers.patch index b7ff21d..64f00dd 100644 --- a/vlc_patches/aug/0033-opengl-filter-forward-declaration-for-samplers.patch +++ b/vlc_patches/aug/0032-opengl-filter-forward-declaration-for-samplers.patch @@ -1,7 +1,7 @@ -From 4d52418f13ee742ae96f2a1d5fa72f411122eb40 Mon Sep 17 00:00:00 2001 +From dd2f434861eadd0c71df8dc70755b6d192268971 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 22 Feb 2022 17:06:21 +0100 -Subject: [PATCH 33/77] opengl: filter: forward-declaration for samplers +Subject: [PATCH 32/85] opengl: filter: forward-declaration for samplers --- modules/video_output/opengl/filter.c | 1 + @@ -89,5 +89,5 @@ index 9df0446284..80f9d43e10 100644 struct vlc_gl_sampler_priv { struct vlc_gl_sampler sampler; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0034-include-move-vlc_opengl_filter.h-to-core.patch b/vlc_patches/aug/0033-include-move-vlc_opengl_filter.h-to-core.patch similarity index 97% rename from vlc_patches/aug/0034-include-move-vlc_opengl_filter.h-to-core.patch rename to vlc_patches/aug/0033-include-move-vlc_opengl_filter.h-to-core.patch index 37ef7b0..28b358b 100644 --- a/vlc_patches/aug/0034-include-move-vlc_opengl_filter.h-to-core.patch +++ b/vlc_patches/aug/0033-include-move-vlc_opengl_filter.h-to-core.patch @@ -1,7 +1,7 @@ -From 356c5e7c876be70e73d84fa08b422794d674a540 Mon Sep 17 00:00:00 2001 +From 77767609b70d9facc918a5b5b96b9ce21da71aea Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 22 Feb 2022 17:07:53 +0100 -Subject: [PATCH 34/77] include: move vlc_opengl_filter.h to core +Subject: [PATCH 33/85] include: move vlc_opengl_filter.h to core --- include/vlc_opengl_filter.h | 141 ++++++++++++++++++++++++++++++++++++ @@ -156,5 +156,5 @@ index 0000000000..8cffea7708 + +#endif -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0035-opengl-mock-expose-module-on-emscripten-platform.patch b/vlc_patches/aug/0034-opengl-mock-expose-module-on-emscripten-platform.patch similarity index 87% rename from vlc_patches/aug/0035-opengl-mock-expose-module-on-emscripten-platform.patch rename to vlc_patches/aug/0034-opengl-mock-expose-module-on-emscripten-platform.patch index a0ac19d..f658b02 100644 --- a/vlc_patches/aug/0035-opengl-mock-expose-module-on-emscripten-platform.patch +++ b/vlc_patches/aug/0034-opengl-mock-expose-module-on-emscripten-platform.patch @@ -1,7 +1,7 @@ -From e8dffa4b13264baa22bdb5c59b3a6c638753a589 Mon Sep 17 00:00:00 2001 +From a144191df6b7a186dd01a42ea11ccae546bf9f2c Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 22 Feb 2022 17:45:12 +0100 -Subject: [PATCH 35/77] opengl: mock: expose module on emscripten platform +Subject: [PATCH 34/85] opengl: mock: expose module on emscripten platform --- modules/video_output/opengl/Makefile.am | 6 ++++++ @@ -25,5 +25,5 @@ index bc4079fefc..bdb5a1b3eb 100644 libglfilter_mock_plugin_la_LIBADD += libvlc_opengles.la $(GLES2_LIBS) libglfilter_mock_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1 -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0036-vlc_opengl_filter-add-gl-pointer.patch b/vlc_patches/aug/0035-vlc_opengl_filter-add-gl-pointer.patch similarity index 89% rename from vlc_patches/aug/0036-vlc_opengl_filter-add-gl-pointer.patch rename to vlc_patches/aug/0035-vlc_opengl_filter-add-gl-pointer.patch index 3c5fbe8..6d84a17 100644 --- a/vlc_patches/aug/0036-vlc_opengl_filter-add-gl-pointer.patch +++ b/vlc_patches/aug/0035-vlc_opengl_filter-add-gl-pointer.patch @@ -1,7 +1,7 @@ -From 78f9501c96671e0793b4aeca5d712b5ff21709f2 Mon Sep 17 00:00:00 2001 +From 625f01bd52acec1733fe3ddab58aac867626ffa4 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 22 Feb 2022 17:55:01 +0100 -Subject: [PATCH 36/77] vlc_opengl_filter: add gl pointer +Subject: [PATCH 35/85] vlc_opengl_filter: add gl pointer --- include/vlc_opengl_filter.h | 1 + @@ -33,5 +33,5 @@ index b93c1ee2fe..abd00b755b 100644 struct vlc_gl_filter_priv *priv = vlc_gl_filter_PRIV(filter); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0037-opengl-filter-move-to-vlc_opengl_filter.patch b/vlc_patches/aug/0036-opengl-filter-move-to-vlc_opengl_filter.patch similarity index 98% rename from vlc_patches/aug/0037-opengl-filter-move-to-vlc_opengl_filter.patch rename to vlc_patches/aug/0036-opengl-filter-move-to-vlc_opengl_filter.patch index 15fe2ac..6373f09 100644 --- a/vlc_patches/aug/0037-opengl-filter-move-to-vlc_opengl_filter.patch +++ b/vlc_patches/aug/0036-opengl-filter-move-to-vlc_opengl_filter.patch @@ -1,7 +1,7 @@ -From c1b6ccbce73b445fff4c7df1ffb84bd83eb3da48 Mon Sep 17 00:00:00 2001 +From 7e7245bd0864fa779140f1f7c2283b6fccbfa11d Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Wed, 23 Feb 2022 13:40:41 +0100 -Subject: [PATCH 37/77] opengl: filter: move to vlc_opengl_filter +Subject: [PATCH 36/85] opengl: filter: move to vlc_opengl_filter --- include/vlc_opengl_filter.h | 67 ++++++++----- @@ -283,5 +283,5 @@ index d8b672cc35..b8272a5115 100644 -#endif +#include <vlc_opengl_filter.h> -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0038-opengl-mock-load-API-in-mock.patch b/vlc_patches/aug/0037-opengl-mock-load-API-in-mock.patch similarity index 86% rename from vlc_patches/aug/0038-opengl-mock-load-API-in-mock.patch rename to vlc_patches/aug/0037-opengl-mock-load-API-in-mock.patch index dc5b715..e558a5e 100644 --- a/vlc_patches/aug/0038-opengl-mock-load-API-in-mock.patch +++ b/vlc_patches/aug/0037-opengl-mock-load-API-in-mock.patch @@ -1,7 +1,7 @@ -From 098f9060b967025700bce2fe9e009e473f2eb0eb Mon Sep 17 00:00:00 2001 +From 6759cf562fd06d2318927c2f4dac0f786e569284 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Tue, 22 Feb 2022 17:55:36 +0100 -Subject: [PATCH 38/77] opengl: mock: load API in mock +Subject: [PATCH 37/85] opengl: mock: load API in mock --- modules/video_output/opengl/filter_mock.c | 4 ++++ @@ -30,5 +30,5 @@ index d455de4937..3915456d7e 100644 if (plane) ret = InitPlane(filter, glfmt); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0039-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch b/vlc_patches/aug/0038-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch similarity index 90% rename from vlc_patches/aug/0039-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch rename to vlc_patches/aug/0038-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch index 804990e..3b200c9 100644 --- a/vlc_patches/aug/0039-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch +++ b/vlc_patches/aug/0038-vlc_vout_display-VLC_OBJECT-wrap-vout_display_New.patch @@ -1,7 +1,7 @@ -From a2a7bee28811d1056880cb48f63f1d63a420a180 Mon Sep 17 00:00:00 2001 +From de87fdcf99c865b907f5ca6f7664f5422e20fb3f Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Fri, 25 Feb 2022 15:08:04 +0100 -Subject: [PATCH 39/77] vlc_vout_display: VLC_OBJECT-wrap vout_display_New() +Subject: [PATCH 38/85] vlc_vout_display: VLC_OBJECT-wrap vout_display_New() --- include/vlc_vout_display.h | 2 ++ @@ -35,5 +35,5 @@ index 9f07f04e3a..b00f0d1877 100644 vlc_video_context *vctx, const vout_display_cfg_t *cfg, -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0040-hw-Add-emscripten-video-converter.patch b/vlc_patches/aug/0039-hw-Add-emscripten-video-converter.patch similarity index 98% rename from vlc_patches/aug/0040-hw-Add-emscripten-video-converter.patch rename to vlc_patches/aug/0039-hw-Add-emscripten-video-converter.patch index d007017..9bc668a 100644 --- a/vlc_patches/aug/0040-hw-Add-emscripten-video-converter.patch +++ b/vlc_patches/aug/0039-hw-Add-emscripten-video-converter.patch @@ -1,7 +1,7 @@ -From f72d284a8d5aecef9c2d148048a004745d12a07a Mon Sep 17 00:00:00 2001 +From 976b46df95e3849ab2e4c66d49d659df6cf96ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Wed, 16 Mar 2022 11:26:13 +0100 -Subject: [PATCH 40/77] hw: Add emscripten video converter +Subject: [PATCH 39/85] hw: Add emscripten video converter --- modules/Makefile.am | 1 + @@ -177,5 +177,5 @@ index 0000000000..623fc69919 + set_callback_video_converter(vlc_webcodec_OpenChroma, 10) +vlc_module_end() -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0041-emscripten-Add-a-WebCodec-frame-to-software-converte.patch b/vlc_patches/aug/0040-emscripten-Add-a-WebCodec-frame-to-software-converte.patch similarity index 96% rename from vlc_patches/aug/0041-emscripten-Add-a-WebCodec-frame-to-software-converte.patch rename to vlc_patches/aug/0040-emscripten-Add-a-WebCodec-frame-to-software-converte.patch index 16555c1..bf9b54e 100644 --- a/vlc_patches/aug/0041-emscripten-Add-a-WebCodec-frame-to-software-converte.patch +++ b/vlc_patches/aug/0040-emscripten-Add-a-WebCodec-frame-to-software-converte.patch @@ -1,7 +1,7 @@ -From fff1f64c6ce6245915c56c7696cc04362ab054e3 Mon Sep 17 00:00:00 2001 +From 9618f2a9f6634313a82255c0be60b173765b4a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 12 Apr 2022 13:55:51 +0200 -Subject: [PATCH 41/77] emscripten: Add a WebCodec frame to software converter +Subject: [PATCH 40/85] emscripten: Add a WebCodec frame to software converter --- .../opengl/interop_emscripten.cpp | 77 +++++++++++++++++++ @@ -106,5 +106,5 @@ index 123c1fdb25..53b52fabd6 100644 + set_callback_video_converter(OpenConverter, 10) vlc_module_end () -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0042-contrib-disable-ubsan-in-gme.patch b/vlc_patches/aug/0041-contrib-disable-ubsan-in-gme.patch similarity index 87% rename from vlc_patches/aug/0042-contrib-disable-ubsan-in-gme.patch rename to vlc_patches/aug/0041-contrib-disable-ubsan-in-gme.patch index 6920afe..c9a6208 100644 --- a/vlc_patches/aug/0042-contrib-disable-ubsan-in-gme.patch +++ b/vlc_patches/aug/0041-contrib-disable-ubsan-in-gme.patch @@ -1,7 +1,7 @@ -From 624edf3c2ec7deb967e1071620762bca438aa3aa Mon Sep 17 00:00:00 2001 +From 1eb962fac7030319031e6f6c63d11635f3f4a398 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdisabwat@gmail.com> Date: Wed, 13 Apr 2022 10:56:02 +0200 -Subject: [PATCH 42/77] contrib: disable ubsan in gme +Subject: [PATCH 41/85] contrib: disable ubsan in gme ubsan is enabled in the contrib recipe : https://bitbucket.org/mpyne/game-music-emu/src/b3d158a30492181fd7c38ef795c8d4dcfd77eaa9/CMakeLists.txt#lines-67 @@ -24,5 +24,5 @@ index b0acdb8ca4..411b83fb24 100644 +$(CMAKEBUILD) $< --target install touch $@ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0043-emscripten-Add-a-picture_pool-to-the-common-code.patch b/vlc_patches/aug/0042-emscripten-Add-a-picture_pool-to-the-common-code.patch similarity index 97% rename from vlc_patches/aug/0043-emscripten-Add-a-picture_pool-to-the-common-code.patch rename to vlc_patches/aug/0042-emscripten-Add-a-picture_pool-to-the-common-code.patch index 8cf5aaf..6fc6273 100644 --- a/vlc_patches/aug/0043-emscripten-Add-a-picture_pool-to-the-common-code.patch +++ b/vlc_patches/aug/0042-emscripten-Add-a-picture_pool-to-the-common-code.patch @@ -1,7 +1,7 @@ -From 1a01a94d5d2eeb1fcc7e206c2e420f155bd25faa Mon Sep 17 00:00:00 2001 +From 70fb09cbac374d7335429da8067d1a704eb691ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 3 May 2022 11:10:28 +0200 -Subject: [PATCH 43/77] emscripten: Add a picture_pool to the common code +Subject: [PATCH 42/85] emscripten: Add a picture_pool to the common code --- modules/video_output/emscripten/common.cpp | 82 ++++++++++++++++++++++ @@ -134,5 +134,5 @@ index 3a2d3c9099..08967d0703 100644 + #endif // EMSCRIPTEN_COMMON_H -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0044-emscripten-webcodec-Use-picture-pool.patch b/vlc_patches/aug/0043-emscripten-webcodec-Use-picture-pool.patch similarity index 96% rename from vlc_patches/aug/0044-emscripten-webcodec-Use-picture-pool.patch rename to vlc_patches/aug/0043-emscripten-webcodec-Use-picture-pool.patch index bd7a54e..d60de63 100644 --- a/vlc_patches/aug/0044-emscripten-webcodec-Use-picture-pool.patch +++ b/vlc_patches/aug/0043-emscripten-webcodec-Use-picture-pool.patch @@ -1,7 +1,7 @@ -From ec7c16fc7ae005b33f95742e0a33bba3ab6e19c9 Mon Sep 17 00:00:00 2001 +From c0ca39149b221130ddab4155ec852ed0120219e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 3 May 2022 11:12:13 +0200 -Subject: [PATCH 44/77] emscripten: webcodec: Use picture pool +Subject: [PATCH 43/85] emscripten: webcodec: Use picture pool --- modules/codec/Makefile.am | 2 +- @@ -100,5 +100,5 @@ index a75d3f7897..cd902851b0 100644 } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0045-emscripten-converter-Use-picture-pool-untested.patch b/vlc_patches/aug/0044-emscripten-converter-Use-picture-pool-untested.patch similarity index 96% rename from vlc_patches/aug/0045-emscripten-converter-Use-picture-pool-untested.patch rename to vlc_patches/aug/0044-emscripten-converter-Use-picture-pool-untested.patch index 7f591ed..eea0c18 100644 --- a/vlc_patches/aug/0045-emscripten-converter-Use-picture-pool-untested.patch +++ b/vlc_patches/aug/0044-emscripten-converter-Use-picture-pool-untested.patch @@ -1,7 +1,7 @@ -From e3696d52278c6fa8bdf780a2ec927374982b8300 Mon Sep 17 00:00:00 2001 +From 0cd69d0ee5382b26130ec56bd76314a6f200dcca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 3 May 2022 11:12:29 +0200 -Subject: [PATCH 45/77] emscripten: converter: Use picture pool (untested) +Subject: [PATCH 44/85] emscripten: converter: Use picture pool (untested) --- modules/hw/emscripten/Makefile.am | 2 +- @@ -105,5 +105,5 @@ index 623fc69919..edc8d93bc0 100644 vlc_module_begin() -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0046-emscripten-interop-Use-picture-context.patch b/vlc_patches/aug/0045-emscripten-interop-Use-picture-context.patch similarity index 97% rename from vlc_patches/aug/0046-emscripten-interop-Use-picture-context.patch rename to vlc_patches/aug/0045-emscripten-interop-Use-picture-context.patch index 1bc7323..0495dc4 100644 --- a/vlc_patches/aug/0046-emscripten-interop-Use-picture-context.patch +++ b/vlc_patches/aug/0045-emscripten-interop-Use-picture-context.patch @@ -1,7 +1,7 @@ -From a56c006fa9ff4108421ecce21684a63a2d723088 Mon Sep 17 00:00:00 2001 +From 82618054ef63a183cdaeea82e8f1db8f800d541f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 3 May 2022 11:12:45 +0200 -Subject: [PATCH 46/77] emscripten: interop: Use picture context +Subject: [PATCH 45/85] emscripten: interop: Use picture context Instead of a the Module.pictureId global --- @@ -105,5 +105,5 @@ index 53b52fabd6..b9a9a5087d 100644 return frame; } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0047-emscripten-vout-Fix-memory-leak.patch b/vlc_patches/aug/0046-emscripten-vout-Fix-memory-leak.patch similarity index 87% rename from vlc_patches/aug/0047-emscripten-vout-Fix-memory-leak.patch rename to vlc_patches/aug/0046-emscripten-vout-Fix-memory-leak.patch index 3c12904..ab51805 100644 --- a/vlc_patches/aug/0047-emscripten-vout-Fix-memory-leak.patch +++ b/vlc_patches/aug/0046-emscripten-vout-Fix-memory-leak.patch @@ -1,7 +1,7 @@ -From ef16d725f44538a175ae1fff23b268375f98dc72 Mon Sep 17 00:00:00 2001 +From 1190b922f48005328e1822393ca50c2bfb64030f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Fri, 6 May 2022 08:22:17 +0200 -Subject: [PATCH 47/77] emscripten: vout: Fix memory leak +Subject: [PATCH 46/85] emscripten: vout: Fix memory leak --- modules/video_output/emscripten.cpp | 4 +++- @@ -23,5 +23,5 @@ index 0c863132f6..9fd34350b5 100644 } let w = Module.PThread.pthreads[$0].worker; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0048-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch b/vlc_patches/aug/0047-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch similarity index 97% rename from vlc_patches/aug/0048-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch rename to vlc_patches/aug/0047-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch index fbd95ce..23efcfd 100644 --- a/vlc_patches/aug/0048-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch +++ b/vlc_patches/aug/0047-emscripten-interop-Query-the-frame-to-the-decoder-fr.patch @@ -1,7 +1,7 @@ -From 7e0e3b2c1a0acbd4cebae963a465cd22053f9cde Mon Sep 17 00:00:00 2001 +From facd3cfaf1e80d606b155bea2871421fed5af149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Mon, 9 May 2022 10:15:45 +0200 -Subject: [PATCH 48/77] emscripten: interop: Query the frame to the decoder +Subject: [PATCH 47/85] emscripten: interop: Query the frame to the decoder from the interop Instead of maintaining a 2nd queue in parallel with the one from the @@ -153,5 +153,5 @@ index b9a9a5087d..65d4c84f94 100644 filter->ops = &video_frame_to_sw_ops; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0049-emscripten-webcodec-Simplify-initialization-and-adap.patch b/vlc_patches/aug/0048-emscripten-webcodec-Simplify-initialization-and-adap.patch similarity index 98% rename from vlc_patches/aug/0049-emscripten-webcodec-Simplify-initialization-and-adap.patch rename to vlc_patches/aug/0048-emscripten-webcodec-Simplify-initialization-and-adap.patch index cab7bcf..5763614 100644 --- a/vlc_patches/aug/0049-emscripten-webcodec-Simplify-initialization-and-adap.patch +++ b/vlc_patches/aug/0048-emscripten-webcodec-Simplify-initialization-and-adap.patch @@ -1,7 +1,7 @@ -From 996deba93b85bc9a9bf7cdb12a35d4628d08d897 Mon Sep 17 00:00:00 2001 +From 6d9b7cedc057c775e624f82caa3d8ac0a8307226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Mon, 9 May 2022 10:16:29 +0200 -Subject: [PATCH 49/77] emscripten: webcodec: Simplify initialization and adapt +Subject: [PATCH 48/85] emscripten: webcodec: Simplify initialization and adapt to new queue --- @@ -249,5 +249,5 @@ index cd902851b0..92b23d2b94 100644 + emscripten::class_<picture_t>("picture_t"); +} -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0050-webcodec-Remove-unused-binding.patch b/vlc_patches/aug/0049-webcodec-Remove-unused-binding.patch similarity index 82% rename from vlc_patches/aug/0050-webcodec-Remove-unused-binding.patch rename to vlc_patches/aug/0049-webcodec-Remove-unused-binding.patch index 7045437..ae9a95d 100644 --- a/vlc_patches/aug/0050-webcodec-Remove-unused-binding.patch +++ b/vlc_patches/aug/0049-webcodec-Remove-unused-binding.patch @@ -1,7 +1,7 @@ -From 0cc2af768d3d7f01460b092bed2bdb37f72b8a46 Mon Sep 17 00:00:00 2001 +From 35796150d28b6a5f9732883a982acb2999b377fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Mon, 9 May 2022 11:58:08 +0200 -Subject: [PATCH 50/77] webcodec: Remove unused binding +Subject: [PATCH 49/85] webcodec: Remove unused binding --- modules/codec/webcodec.cpp | 4 ---- @@ -20,5 +20,5 @@ index 92b23d2b94..d44e9ee5ae 100644 - emscripten::class_<picture_t>("picture_t"); -} -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0051-interop-remove-debug.patch b/vlc_patches/aug/0050-interop-remove-debug.patch similarity index 92% rename from vlc_patches/aug/0051-interop-remove-debug.patch rename to vlc_patches/aug/0050-interop-remove-debug.patch index 0994e3b..4c9a456 100644 --- a/vlc_patches/aug/0051-interop-remove-debug.patch +++ b/vlc_patches/aug/0050-interop-remove-debug.patch @@ -1,7 +1,7 @@ -From 0d2dfae2f2894a30d673c608813f7c7e84da3dc3 Mon Sep 17 00:00:00 2001 +From ab3a048c5c3a92bb3d31bfef1acc023cc0939ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Mon, 9 May 2022 11:58:15 +0200 -Subject: [PATCH 51/77] interop: remove debug +Subject: [PATCH 50/85] interop: remove debug --- modules/video_output/opengl/interop_emscripten.cpp | 6 ------ @@ -34,5 +34,5 @@ index 65d4c84f94..e9905ac1a3 100644 Module.glConv.lastFrame.frame.close(); Module.glConv.lastFrame.frame = frame; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0052-webcodec-remove-debug.patch b/vlc_patches/aug/0051-webcodec-remove-debug.patch similarity index 86% rename from vlc_patches/aug/0052-webcodec-remove-debug.patch rename to vlc_patches/aug/0051-webcodec-remove-debug.patch index d384ce6..07e33af 100644 --- a/vlc_patches/aug/0052-webcodec-remove-debug.patch +++ b/vlc_patches/aug/0051-webcodec-remove-debug.patch @@ -1,7 +1,7 @@ -From c12fc5c5bc34fa684baf7a21ed16886462eb8756 Mon Sep 17 00:00:00 2001 +From 32d2ea04de8045bd2a4118d84dacccf5eecc3507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Mon, 9 May 2022 11:58:31 +0200 -Subject: [PATCH 52/77] webcodec: remove debug +Subject: [PATCH 51/85] webcodec: remove debug --- modules/codec/webcodec.cpp | 1 - @@ -20,5 +20,5 @@ index d44e9ee5ae..bd2a1a083d 100644 customCmd: 'displayFrame', frame: frame, -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0053-WIP-webcodec-remove-manual-block-queue.patch b/vlc_patches/aug/0052-WIP-webcodec-remove-manual-block-queue.patch similarity index 98% rename from vlc_patches/aug/0053-WIP-webcodec-remove-manual-block-queue.patch rename to vlc_patches/aug/0052-WIP-webcodec-remove-manual-block-queue.patch index 7caf1e4..375390c 100644 --- a/vlc_patches/aug/0053-WIP-webcodec-remove-manual-block-queue.patch +++ b/vlc_patches/aug/0052-WIP-webcodec-remove-manual-block-queue.patch @@ -1,7 +1,7 @@ -From 43c1f6c435426134decbd7dda0b86feccc2e6695 Mon Sep 17 00:00:00 2001 +From c5ca303fbbde742544697f1cd4d6a6d6693a9b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 10 May 2022 08:16:38 +0200 -Subject: [PATCH 53/77] WIP webcodec remove manual block queue +Subject: [PATCH 52/85] WIP webcodec remove manual block queue --- modules/codec/webcodec.cpp | 147 ++++++++++++++++++++++++------------- @@ -242,5 +242,5 @@ index bd2a1a083d..48383575f0 100644 } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0054-webcodec-remove-debug.patch b/vlc_patches/aug/0053-webcodec-remove-debug.patch similarity index 86% rename from vlc_patches/aug/0054-webcodec-remove-debug.patch rename to vlc_patches/aug/0053-webcodec-remove-debug.patch index b855dbb..8fca319 100644 --- a/vlc_patches/aug/0054-webcodec-remove-debug.patch +++ b/vlc_patches/aug/0053-webcodec-remove-debug.patch @@ -1,7 +1,7 @@ -From 1c9fdc8f0e1df8ea34f6f6cae882b2559d802a88 Mon Sep 17 00:00:00 2001 +From c296964b3fda6a159bcc48ed58f90dd29bc1e08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 10 May 2022 10:23:28 +0200 -Subject: [PATCH 54/77] webcodec: remove debug +Subject: [PATCH 53/85] webcodec: remove debug --- modules/codec/webcodec.cpp | 1 - @@ -20,5 +20,5 @@ index 48383575f0..983084103e 100644 decoder_QueueVideo(dec, pic); return PictureContextPrivate(pic->context)->pictureIdx; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0055-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch b/vlc_patches/aug/0054-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch similarity index 96% rename from vlc_patches/aug/0055-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch rename to vlc_patches/aug/0054-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch index 7b16860..c5df684 100644 --- a/vlc_patches/aug/0055-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch +++ b/vlc_patches/aug/0054-webcodec-Only-transfer-a-block-pointer-to-the-decode.patch @@ -1,7 +1,7 @@ -From 95375e731c42928ae886c7c18f852f73916ace45 Mon Sep 17 00:00:00 2001 +From 1db874023cdffed52441e9511ba5ccd367b52c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 10 May 2022 10:25:00 +0200 -Subject: [PATCH 55/77] webcodec: Only transfer a block pointer to the decoder +Subject: [PATCH 54/85] webcodec: Only transfer a block pointer to the decoder worker It's unclear how performant it is to transfer an entire object and its @@ -96,5 +96,5 @@ index 983084103e..51f63a2089 100644 } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0056-webcodec-minor-simplification.patch b/vlc_patches/aug/0055-webcodec-minor-simplification.patch similarity index 88% rename from vlc_patches/aug/0056-webcodec-minor-simplification.patch rename to vlc_patches/aug/0055-webcodec-minor-simplification.patch index 4a57187..f7cc33c 100644 --- a/vlc_patches/aug/0056-webcodec-minor-simplification.patch +++ b/vlc_patches/aug/0055-webcodec-minor-simplification.patch @@ -1,7 +1,7 @@ -From 19e4b631ba7faf7e11bf2c07008346e6d5d3657a Mon Sep 17 00:00:00 2001 +From e2f61c36a422c5329cc5bbe4feacdbd9e2b83202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 10 May 2022 10:31:16 +0200 -Subject: [PATCH 56/77] webcodec: minor simplification +Subject: [PATCH 55/85] webcodec: minor simplification --- modules/codec/webcodec.cpp | 4 +--- @@ -23,5 +23,5 @@ index 51f63a2089..f82b1a7bf0 100644 customCmd: 'transferMessagePort', targetThread: msg['replyTo'], -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0057-webcodec-Acquire-vout-message-port-before-queuing-pi.patch b/vlc_patches/aug/0056-webcodec-Acquire-vout-message-port-before-queuing-pi.patch similarity index 89% rename from vlc_patches/aug/0057-webcodec-Acquire-vout-message-port-before-queuing-pi.patch rename to vlc_patches/aug/0056-webcodec-Acquire-vout-message-port-before-queuing-pi.patch index 3313a9a..b3421e9 100644 --- a/vlc_patches/aug/0057-webcodec-Acquire-vout-message-port-before-queuing-pi.patch +++ b/vlc_patches/aug/0056-webcodec-Acquire-vout-message-port-before-queuing-pi.patch @@ -1,7 +1,7 @@ -From 452cad2efcd15a8f30e9f5ef58bb70c82e23ad00 Mon Sep 17 00:00:00 2001 +From 8c213daa6ea504304546fa63fd84db1f02396c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 10 May 2022 10:31:33 +0200 -Subject: [PATCH 57/77] webcodec: Acquire vout message port before queuing +Subject: [PATCH 56/85] webcodec: Acquire vout message port before queuing pictures --- @@ -26,5 +26,5 @@ index f82b1a7bf0..4c6250294f 100644 /* * If we end up overriding a frame, it means it was dropped -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0058-webcodec-Fix-invalid-error-return.patch b/vlc_patches/aug/0057-webcodec-Fix-invalid-error-return.patch similarity index 84% rename from vlc_patches/aug/0058-webcodec-Fix-invalid-error-return.patch rename to vlc_patches/aug/0057-webcodec-Fix-invalid-error-return.patch index 5983bee..e9ea47b 100644 --- a/vlc_patches/aug/0058-webcodec-Fix-invalid-error-return.patch +++ b/vlc_patches/aug/0057-webcodec-Fix-invalid-error-return.patch @@ -1,7 +1,7 @@ -From 85987521d4a5995038b155277268bbd07ab4c34d Mon Sep 17 00:00:00 2001 +From 33e5faeecbd6935b8280b483819363ead4748457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Wed, 11 May 2022 12:03:39 +0200 -Subject: [PATCH 58/77] webcodec: Fix invalid error return +Subject: [PATCH 57/85] webcodec: Fix invalid error return --- modules/codec/webcodec.cpp | 2 +- @@ -21,5 +21,5 @@ index 4c6250294f..b3546edaea 100644 auto sys = std::make_unique<decoder_sys_t>(); dec->p_sys = sys.get(); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0059-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch b/vlc_patches/aug/0058-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch similarity index 96% rename from vlc_patches/aug/0059-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch rename to vlc_patches/aug/0058-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch index 27dd183..8f110b8 100644 --- a/vlc_patches/aug/0059-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch +++ b/vlc_patches/aug/0058-WIP-webcodec-Reintroduce-a-block-queue-hoping-to-sol.patch @@ -1,7 +1,7 @@ -From 55339e6437de6ccc6813b0551ac737d6f7a43d3d Mon Sep 17 00:00:00 2001 +From bcd461e65d35ab6955edb5560a0f8822f3371488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Wed, 11 May 2022 13:17:03 +0200 -Subject: [PATCH 59/77] WIP: webcodec: Reintroduce a block queue hoping to +Subject: [PATCH 58/85] WIP: webcodec: Reintroduce a block queue hoping to solve the late frames which doesn't work for now @@ -113,5 +113,5 @@ index b3546edaea..1967231999 100644 } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0060-wip-setjmp-lgjmp-requires-atomics.patch b/vlc_patches/aug/0059-wip-setjmp-lgjmp-requires-atomics.patch similarity index 92% rename from vlc_patches/aug/0060-wip-setjmp-lgjmp-requires-atomics.patch rename to vlc_patches/aug/0059-wip-setjmp-lgjmp-requires-atomics.patch index 9cc5f21..212ab48 100644 --- a/vlc_patches/aug/0060-wip-setjmp-lgjmp-requires-atomics.patch +++ b/vlc_patches/aug/0059-wip-setjmp-lgjmp-requires-atomics.patch @@ -1,7 +1,7 @@ -From 68e2e53d6acf832d57322911dd06e48d85485357 Mon Sep 17 00:00:00 2001 +From 5aaee17a38661e67bfad7f0e3f282b938c5d6820 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Tue, 26 Apr 2022 13:45:07 +0200 -Subject: [PATCH 60/77] wip: setjmp/lgjmp requires atomics +Subject: [PATCH 59/85] wip: setjmp/lgjmp requires atomics I suppose this is because we can use it for coroutines. Non atomic operations could create race conditions. --- @@ -56,5 +56,5 @@ index 4f7fc7397a..166d6b528a 100644 ifdef HAVE_CROSS_COMPILE ZLIB_CONFIG_VARS=CHOST=$(HOST) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0061-webcodec-revert-manual-block-queue.patch b/vlc_patches/aug/0060-webcodec-revert-manual-block-queue.patch similarity index 96% rename from vlc_patches/aug/0061-webcodec-revert-manual-block-queue.patch rename to vlc_patches/aug/0060-webcodec-revert-manual-block-queue.patch index 9b416a4..dc840f8 100644 --- a/vlc_patches/aug/0061-webcodec-revert-manual-block-queue.patch +++ b/vlc_patches/aug/0060-webcodec-revert-manual-block-queue.patch @@ -1,7 +1,7 @@ -From 409c444f88c5a3e9f05ecdcd6de2c16098b3ca2e Mon Sep 17 00:00:00 2001 +From 58012b196fcd174d2e17fb65302628182edd2eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 12 May 2022 09:47:32 +0200 -Subject: [PATCH 61/77] webcodec: revert manual block queue +Subject: [PATCH 60/85] webcodec: revert manual block queue --- modules/codec/webcodec.cpp | 43 +++++++------------------------------- @@ -103,5 +103,5 @@ index 1967231999..9c39a5c2b4 100644 } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0062-webcodec-Don-t-optimize-for-latency.patch b/vlc_patches/aug/0061-webcodec-Don-t-optimize-for-latency.patch similarity index 88% rename from vlc_patches/aug/0062-webcodec-Don-t-optimize-for-latency.patch rename to vlc_patches/aug/0061-webcodec-Don-t-optimize-for-latency.patch index 9d70992..ba36239 100644 --- a/vlc_patches/aug/0062-webcodec-Don-t-optimize-for-latency.patch +++ b/vlc_patches/aug/0061-webcodec-Don-t-optimize-for-latency.patch @@ -1,7 +1,7 @@ -From 7de88352bd623463cd6d4c5df50ef951e3b4d76a Mon Sep 17 00:00:00 2001 +From 2477b13545317f8e0b265164b5c1ba30aa9d6140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 12 May 2022 09:48:20 +0200 -Subject: [PATCH 62/77] webcodec: Don't optimize for latency +Subject: [PATCH 61/85] webcodec: Don't optimize for latency This seems to pace the decoding better but is definitely not a stable enough solution, more of a temporary work around @@ -23,5 +23,5 @@ index 9c39a5c2b4..fbdbd3af5f 100644 { if ( dec->fmt_in.i_extra > 0 ) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0063-webcodec-Properly-implement-flushing.patch b/vlc_patches/aug/0062-webcodec-Properly-implement-flushing.patch similarity index 94% rename from vlc_patches/aug/0063-webcodec-Properly-implement-flushing.patch rename to vlc_patches/aug/0062-webcodec-Properly-implement-flushing.patch index cacd824..84183a2 100644 --- a/vlc_patches/aug/0063-webcodec-Properly-implement-flushing.patch +++ b/vlc_patches/aug/0062-webcodec-Properly-implement-flushing.patch @@ -1,7 +1,7 @@ -From dc500714aeea0c8d2d630245244df2a7b8c24177 Mon Sep 17 00:00:00 2001 +From 0a25025a5e7c4505363d413c7a3f95c8993aa52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 12 May 2022 09:50:23 +0200 -Subject: [PATCH 63/77] webcodec: Properly implement flushing +Subject: [PATCH 62/85] webcodec: Properly implement flushing --- modules/codec/webcodec.cpp | 34 ++++++++++++++++++++++++++++------ @@ -77,5 +77,5 @@ index fbdbd3af5f..a7b67d4ef6 100644 static int Open( vlc_object_t* obj ) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0064-emscripten-Handle-late-displayFrame-messages-after-a.patch b/vlc_patches/aug/0063-emscripten-Handle-late-displayFrame-messages-after-a.patch similarity index 93% rename from vlc_patches/aug/0064-emscripten-Handle-late-displayFrame-messages-after-a.patch rename to vlc_patches/aug/0063-emscripten-Handle-late-displayFrame-messages-after-a.patch index 2bc6f2c..8eef6be 100644 --- a/vlc_patches/aug/0064-emscripten-Handle-late-displayFrame-messages-after-a.patch +++ b/vlc_patches/aug/0063-emscripten-Handle-late-displayFrame-messages-after-a.patch @@ -1,7 +1,7 @@ -From 2a5fac1b3e80e4647a535f9162e59d7f130db558 Mon Sep 17 00:00:00 2001 +From bbf3c9bfb75656b23d8f7cbfd1a301333c691792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 12 May 2022 09:58:01 +0200 -Subject: [PATCH 64/77] emscripten: Handle late displayFrame messages after a +Subject: [PATCH 63/85] emscripten: Handle late displayFrame messages after a flush --- @@ -46,5 +46,5 @@ index e9905ac1a3..f745fcfef4 100644 let glCtx = Module.glCtx; glCtx.texImage2D(glCtx.TEXTURE_2D, 0, glCtx.RGBA, frame.codedWidth, frame.codedHeight, 0, -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0065-webcodec-Minor-simplification.patch b/vlc_patches/aug/0064-webcodec-Minor-simplification.patch similarity index 87% rename from vlc_patches/aug/0065-webcodec-Minor-simplification.patch rename to vlc_patches/aug/0064-webcodec-Minor-simplification.patch index fe95a13..0f01680 100644 --- a/vlc_patches/aug/0065-webcodec-Minor-simplification.patch +++ b/vlc_patches/aug/0064-webcodec-Minor-simplification.patch @@ -1,7 +1,7 @@ -From cd80be3a8c37d4c294c957dac7d7515d71a53843 Mon Sep 17 00:00:00 2001 +From 2a20ba188cda25e7ad873def710c83a9f6ebf89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Thu, 12 May 2022 09:59:06 +0200 -Subject: [PATCH 65/77] webcodec: Minor simplification +Subject: [PATCH 64/85] webcodec: Minor simplification --- modules/codec/webcodec.cpp | 6 +++--- @@ -25,5 +25,5 @@ index e619cdde00..07b3690dab 100644 } resolve(pic); -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0066-emscripten-add-js-File-access-plugin.patch b/vlc_patches/aug/0065-emscripten-add-js-File-access-plugin.patch similarity index 98% rename from vlc_patches/aug/0066-emscripten-add-js-File-access-plugin.patch rename to vlc_patches/aug/0065-emscripten-add-js-File-access-plugin.patch index 30e2d18..9187c16 100644 --- a/vlc_patches/aug/0066-emscripten-add-js-File-access-plugin.patch +++ b/vlc_patches/aug/0065-emscripten-add-js-File-access-plugin.patch @@ -1,7 +1,7 @@ -From 49f585a2a5fbbc04d85fbccbf63881d2a659cc54 Mon Sep 17 00:00:00 2001 +From cd71cf6b52bfa7c5af8b071474f4c327e5887bdb Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Thu, 9 Jun 2022 21:05:04 +0200 -Subject: [PATCH 66/77] emscripten: add js File access plugin +Subject: [PATCH 65/85] emscripten: add js File access plugin Emscripten currently does not support picking a file from the DOM with the <input> element, and reading it from a webassembly application. @@ -364,5 +364,5 @@ index 0000000000..920a408f95 + set_callbacks( EmFileOpen, EmFileClose ) +vlc_module_end() -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0067-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch b/vlc_patches/aug/0066-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch similarity index 84% rename from vlc_patches/aug/0067-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch rename to vlc_patches/aug/0066-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch index 49cf770..c8976df 100644 --- a/vlc_patches/aug/0067-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch +++ b/vlc_patches/aug/0066-gl-utils-Add-a-vlc_gl_IsWebGL-helper.patch @@ -1,7 +1,7 @@ -From 92253242486f94556cb52ebaa603e7779545d897 Mon Sep 17 00:00:00 2001 +From 391fae5394c32284fb1a5e4dd1a4fef488536683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 19 Jul 2022 11:24:01 +0200 -Subject: [PATCH 67/77] gl: utils: Add a vlc_gl_IsWebGL helper +Subject: [PATCH 66/85] gl: utils: Add a vlc_gl_IsWebGL helper --- modules/video_output/opengl/gl_util.h | 8 ++++++++ @@ -25,5 +25,5 @@ index 551e9ac85e..f72131a9fd 100644 + #endif -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0068-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch b/vlc_patches/aug/0067-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch similarity index 91% rename from vlc_patches/aug/0068-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch rename to vlc_patches/aug/0067-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch index e2ced6e..321339c 100644 --- a/vlc_patches/aug/0068-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch +++ b/vlc_patches/aug/0067-opengl-interop_sw-Force-use-of-GL_LUMINANCE-for-webg.patch @@ -1,7 +1,7 @@ -From c763ea6946e168d1c6c04f83f789e64ea6035bdc Mon Sep 17 00:00:00 2001 +From df5c5c9d1461740a01818d2da6a89e8900831612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr> Date: Tue, 19 Jul 2022 11:24:17 +0200 -Subject: [PATCH 68/77] opengl: interop_sw: Force use of GL_LUMINANCE for webgl +Subject: [PATCH 67/85] opengl: interop_sw: Force use of GL_LUMINANCE for webgl WebGL doesn't handle our combination of internal format & formats the same way opengl(es) does, which leads to GL_INVALID_OPERATION being @@ -30,5 +30,5 @@ index 6669559b21..d87e20c2aa 100644 video_color_space_t space; const vlc_fourcc_t *list; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0069-wip-cast-to-avoid-compilation-error.patch b/vlc_patches/aug/0068-wip-cast-to-avoid-compilation-error.patch similarity index 80% rename from vlc_patches/aug/0069-wip-cast-to-avoid-compilation-error.patch rename to vlc_patches/aug/0068-wip-cast-to-avoid-compilation-error.patch index ae7c75b..66f1bc1 100644 --- a/vlc_patches/aug/0069-wip-cast-to-avoid-compilation-error.patch +++ b/vlc_patches/aug/0068-wip-cast-to-avoid-compilation-error.patch @@ -1,7 +1,7 @@ -From 9814aba20e525c5dfce0f531a7481aef9dcfde90 Mon Sep 17 00:00:00 2001 +From 228b07d1431cf6e915ebf084fca479cc825cc58e Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Wed, 10 Aug 2022 13:43:34 +0200 -Subject: [PATCH 1/1] wip: cast to avoid compilation error +Subject: [PATCH 68/85] wip: cast to avoid compilation error --- src/emscripten/thread.c | 2 +- @@ -19,5 +19,5 @@ index 8496174278..8fb8c5bb57 100644 + return (unsigned long) pthread_self(); } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0069-wip.patch b/vlc_patches/aug/0069-wip.patch index 24f7276..d76ae14 100644 --- a/vlc_patches/aug/0069-wip.patch +++ b/vlc_patches/aug/0069-wip.patch @@ -1,7 +1,7 @@ -From 08c0fe66b51b2a54b143b079e72674c8f0d5e792 Mon Sep 17 00:00:00 2001 +From ef939e57a933744dc6e1d1c5f2258a9830b55e7a Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Wed, 3 Aug 2022 10:43:19 +0200 -Subject: [PATCH 69/77] wip +Subject: [PATCH 69/85] wip --- src/posix/thread.c | 35 ++++++++++++++++++++++++++++++++++- @@ -63,5 +63,5 @@ index 78045d9746..9c7afdfbb1 100644 pthread_attr_destroy (attr); (void) priority; -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0070-adapt-to-new-emscripten-version.patch b/vlc_patches/aug/0070-adapt-to-new-emscripten-version.patch index 54b71cb..45130b1 100644 --- a/vlc_patches/aug/0070-adapt-to-new-emscripten-version.patch +++ b/vlc_patches/aug/0070-adapt-to-new-emscripten-version.patch @@ -1,7 +1,7 @@ -From 54b9e53c6709ed2f15720f3e66396adeef8359ce Mon Sep 17 00:00:00 2001 +From d253a03cf88e2e2018985b6936ed7618461a4559 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Wed, 3 Aug 2022 13:17:46 +0200 -Subject: [PATCH 70/77] adapt to new emscripten version +Subject: [PATCH 70/85] adapt to new emscripten version --- modules/access/emjsfile.c | 2 +- @@ -35,5 +35,5 @@ index 9fd34350b5..e22342e894 100644 let msg = e['data']; if (msg.customCmd == 'getVoutMessagePort') { -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0071-don-t-call-emscripten_set_main_loop-twice.patch b/vlc_patches/aug/0071-don-t-call-emscripten_set_main_loop-twice.patch index b6126ed..727c80a 100644 --- a/vlc_patches/aug/0071-don-t-call-emscripten_set_main_loop-twice.patch +++ b/vlc_patches/aug/0071-don-t-call-emscripten_set_main_loop-twice.patch @@ -1,7 +1,7 @@ -From 394a123418b39a827467598bf19aef7d9e0a3c3c Mon Sep 17 00:00:00 2001 +From faee1c3ceadb4d274e59b8efd665d0af1ec42271 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Wed, 3 Aug 2022 17:17:27 +0200 -Subject: [PATCH 71/77] don't call emscripten_set_main_loop twice +Subject: [PATCH 71/85] don't call emscripten_set_main_loop twice --- modules/codec/webcodec.cpp | 2 +- @@ -21,5 +21,5 @@ index 07b3690dab..fd93713480 100644 } -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0072-Revert-emscripten-add-js-File-access-plugin.patch b/vlc_patches/aug/0072-Revert-emscripten-add-js-File-access-plugin.patch index 20a093f..6a21947 100644 --- a/vlc_patches/aug/0072-Revert-emscripten-add-js-File-access-plugin.patch +++ b/vlc_patches/aug/0072-Revert-emscripten-add-js-File-access-plugin.patch @@ -1,7 +1,7 @@ -From 000a50334fe09da173a986455c796d97c348108c Mon Sep 17 00:00:00 2001 +From 94d6917b955b5fe30a192be31438fab94b5e76eb Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Mon, 8 Aug 2022 13:55:50 +0200 -Subject: [PATCH 72/77] Revert "emscripten: add js File access plugin" +Subject: [PATCH 72/85] Revert "emscripten: add js File access plugin" This reverts commit 49f585a2a5fbbc04d85fbccbf63881d2a659cc54. --- @@ -332,5 +332,5 @@ index 0fea11afc4..0000000000 - set_callbacks( EmFileOpen, EmFileClose ) -vlc_module_end() -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0073-emscripten-add-js-File-access-plugin.patch b/vlc_patches/aug/0073-emscripten-add-js-File-access-plugin.patch index d8f31f0..05939c2 100644 --- a/vlc_patches/aug/0073-emscripten-add-js-File-access-plugin.patch +++ b/vlc_patches/aug/0073-emscripten-add-js-File-access-plugin.patch @@ -1,7 +1,7 @@ -From 77373ae9ca4cb51cadc14a12e2d5d928c5328727 Mon Sep 17 00:00:00 2001 +From 3fe75cc8dbed6da7c73f17b074b1adb611d26099 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Thu, 9 Jun 2022 21:05:04 +0200 -Subject: [PATCH 73/77] emscripten: add js File access plugin +Subject: [PATCH 73/85] emscripten: add js File access plugin Emscripten currently does not support picking a file from the DOM with the element, and reading it from a webassembly application. @@ -364,5 +364,5 @@ index 0000000000..139b12b68a + set_callbacks( EmFileOpen, EmFileClose ) +vlc_module_end() -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0074-emjsfile-Close-file-access-if-open-failed.patch b/vlc_patches/aug/0074-emjsfile-Close-file-access-if-open-failed.patch index 648eb7e..cf6971d 100644 --- a/vlc_patches/aug/0074-emjsfile-Close-file-access-if-open-failed.patch +++ b/vlc_patches/aug/0074-emjsfile-Close-file-access-if-open-failed.patch @@ -1,7 +1,7 @@ -From 935282fa99a0356589692c3493e143eccb77cd2d Mon Sep 17 00:00:00 2001 +From 47243e464848b15773e224c24d33a693802cfb10 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Mon, 8 Aug 2022 13:46:48 +0200 -Subject: [PATCH 74/77] emjsfile: Close file access if open() failed +Subject: [PATCH 74/85] emjsfile: Close file access if open() failed --- modules/access/emjsfile.c | 25 +++++++++++++------------ @@ -71,5 +71,5 @@ index 139b12b68a..488b6fb449 100644 set_description( N_("Emscripten module to allow reading local files from the DOM's <input>") ) set_shortname( N_("Emscripten Local File Input") ) -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0075-emjsfile-document-js_file_size-struct-field.patch b/vlc_patches/aug/0075-emjsfile-document-js_file_size-struct-field.patch index c231ebe..d8639c6 100644 --- a/vlc_patches/aug/0075-emjsfile-document-js_file_size-struct-field.patch +++ b/vlc_patches/aug/0075-emjsfile-document-js_file_size-struct-field.patch @@ -1,7 +1,7 @@ -From e913df9e055f1fee9d17d9b23ed46d59600c89b2 Mon Sep 17 00:00:00 2001 +From 23c1761b92bee0492dfb20f93ea4078b5d1a3fea Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Mon, 8 Aug 2022 13:49:54 +0200 -Subject: [PATCH 75/77] emjsfile: document js_file_size struct field +Subject: [PATCH 75/85] emjsfile: document js_file_size struct field --- modules/access/emjsfile.c | 3 ++- @@ -28,5 +28,5 @@ index 488b6fb449..245a6a7201 100644 static ssize_t Read (stream_t *p_access, void *buffer, size_t size) { -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0076-emjsfile-adapt-to-emscripten-change.patch b/vlc_patches/aug/0076-emjsfile-adapt-to-emscripten-change.patch index 7e7d0a2..9de2219 100644 --- a/vlc_patches/aug/0076-emjsfile-adapt-to-emscripten-change.patch +++ b/vlc_patches/aug/0076-emjsfile-adapt-to-emscripten-change.patch @@ -1,7 +1,7 @@ -From 153eecd6159eaae8ab98dd98accc6eb7f033064d Mon Sep 17 00:00:00 2001 +From de2ee9bb5ad8580da4896458be1dd41a9416059a Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Mon, 8 Aug 2022 16:55:53 +0200 -Subject: [PATCH 76/77] emjsfile: adapt to emscripten change +Subject: [PATCH 76/85] emjsfile: adapt to emscripten change --- modules/access/emjsfile.c | 2 +- @@ -21,5 +21,5 @@ index 245a6a7201..9123a4f0fc 100644 const msg = e.data; if (msg.type === "requestFile") { -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0077-wip-allow-decoding-NULL-blocks-drain.patch b/vlc_patches/aug/0077-wip-allow-decoding-NULL-blocks-drain.patch index 18abe20..8339aa5 100644 --- a/vlc_patches/aug/0077-wip-allow-decoding-NULL-blocks-drain.patch +++ b/vlc_patches/aug/0077-wip-allow-decoding-NULL-blocks-drain.patch @@ -1,7 +1,7 @@ -From c3e109460e95fba32914a1b525a8b3f85b705ff9 Mon Sep 17 00:00:00 2001 +From 2efb8e8f2a9caf813d09299a345cd694bfb8bb88 Mon Sep 17 00:00:00 2001 From: Mehdi Sabwat <mehdi@videolabs.io> Date: Mon, 8 Aug 2022 16:57:45 +0200 -Subject: [PATCH 77/77] wip: allow decoding NULL blocks (drain ?) +Subject: [PATCH 77/85] wip: allow decoding NULL blocks (drain ?) --- modules/codec/webcodec.cpp | 1 + @@ -20,5 +20,5 @@ index fd93713480..aefe6a6153 100644 EM_ASM({ Module.decoderWorkerPort.postMessage({ -- -2.35.1 +2.43.0 diff --git a/vlc_patches/aug/0078-fix-jitter-in-flac-playback.patch b/vlc_patches/aug/0078-fix-jitter-in-flac-playback.patch index 2a6255a..48fafee 100644 --- a/vlc_patches/aug/0078-fix-jitter-in-flac-playback.patch +++ b/vlc_patches/aug/0078-fix-jitter-in-flac-playback.patch @@ -1,7 +1,7 @@ -From 41b4a0210077f0e9c677b94823a5d7c070fb08ab Mon Sep 17 00:00:00 2001 +From 12e3eeda1504fee4709e424c1505685b64268d2d Mon Sep 17 00:00:00 2001 From: metehan-arslan <99metehanarslan@gmail.com> Date: Fri, 26 Aug 2022 22:50:21 +0300 -Subject: [PATCH] fix jitter in flac playback +Subject: [PATCH 78/85] fix jitter in flac playback --- modules/audio_output/emscripten.cpp | 51 +++++++++++++++++++++-------- @@ -132,5 +132,5 @@ index a7e9fb0d4d..de442e2b73 100644 val awn_cb = awn_caller.call<val>("bind", cb_caller); -- -2.37.2 +2.43.0 diff --git a/vlc_patches/aug/0079-replace-audio-output-module.patch b/vlc_patches/aug/0079-replace-audio-output-module.patch index f6bb567..b9462f2 100644 --- a/vlc_patches/aug/0079-replace-audio-output-module.patch +++ b/vlc_patches/aug/0079-replace-audio-output-module.patch @@ -1,7 +1,7 @@ -From f7dd09332178239f698dacfd1c73ce1502e9f8f8 Mon Sep 17 00:00:00 2001 -From: root <root@compile-vlc-wasm.local> +From 536c4878df8fa407c0278949e097d0f73514e4b4 Mon Sep 17 00:00:00 2001 +From: metehan-arslan <99metehanarslan@gmail.com> Date: Wed, 31 Aug 2022 16:03:27 +0000 -Subject: [PATCH] replace audio output module +Subject: [PATCH 79/85] replace audio output module --- modules/audio_output/Makefile.am | 2 +- @@ -1077,5 +1077,5 @@ index 0000000000..f291470478 + }, +}) -- -2.30.2 +2.43.0 diff --git a/vlc_patches/aug/0080-audio_output-wait-for-initialization.patch b/vlc_patches/aug/0080-audio_output-wait-for-initialization.patch index 97178fd..c85c119 100644 --- a/vlc_patches/aug/0080-audio_output-wait-for-initialization.patch +++ b/vlc_patches/aug/0080-audio_output-wait-for-initialization.patch @@ -1,7 +1,7 @@ -From a0ef05907dc6865582333a9cc5d63d7d51b56dfb Mon Sep 17 00:00:00 2001 +From 7d99b09ebd159ef39db7c805003a560c0ddec9a8 Mon Sep 17 00:00:00 2001 From: Alaric Senat <dev.asenat@posteo.net> Date: Fri, 7 Oct 2022 15:34:18 +0200 -Subject: [PATCH 1/2] audio_output: wait for initialization +Subject: [PATCH 80/85] audio_output: wait for initialization The `Init()` function is called in the browser thread and sets up important variable that needs to be used in the `Start()` callback @@ -78,5 +78,5 @@ index 3317c3eb84..d94a0dd234 100644 atomic_init(&sys->sab->is_paused, 0); atomic_init(&sys->sab->head, 0); -- -2.37.3 +2.43.0 diff --git a/vlc_patches/aug/0081-audio_output-force-downmixing-when-browser-chan-coun.patch b/vlc_patches/aug/0081-audio_output-force-downmixing-when-browser-chan-coun.patch index 02c26ca..677d2cb 100644 --- a/vlc_patches/aug/0081-audio_output-force-downmixing-when-browser-chan-coun.patch +++ b/vlc_patches/aug/0081-audio_output-force-downmixing-when-browser-chan-coun.patch @@ -1,8 +1,8 @@ -From 10d9967d653220f5ccc9a0c7973c3a738e6b9838 Mon Sep 17 00:00:00 2001 +From 88f38be29aaa18e4d6107a5d54acc0f5f814fd1e Mon Sep 17 00:00:00 2001 From: Alaric Senat <dev.asenat@posteo.net> Date: Fri, 7 Oct 2022 15:36:18 +0200 -Subject: [PATCH 2/2] audio_output: force downmixing when browser chan count is - lower +Subject: [PATCH 81/85] audio_output: force downmixing when browser chan count + is lower --- modules/audio_output/emscripten.c | 26 ++++++++++++++++++++++++++ @@ -46,5 +46,5 @@ index d94a0dd234..8819c34f9b 100644 fmt->i_rate = sys->sample_rate; } -- -2.37.3 +2.43.0 -- GitLab From 201266c22ef606ba05feedc3921599b8380377b0 Mon Sep 17 00:00:00 2001 From: Alaric Senat <alaric@videolabs.io> Date: Fri, 8 Mar 2024 15:21:57 +0100 Subject: [PATCH 09/11] patches: fix contrib build --- ...contrib-glslang-rename-master-branch.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 vlc_patches/aug/0082-contrib-glslang-rename-master-branch.patch diff --git a/vlc_patches/aug/0082-contrib-glslang-rename-master-branch.patch b/vlc_patches/aug/0082-contrib-glslang-rename-master-branch.patch new file mode 100644 index 0000000..1ffb5e0 --- /dev/null +++ b/vlc_patches/aug/0082-contrib-glslang-rename-master-branch.patch @@ -0,0 +1,24 @@ +From 5b194ef1ee0caa40c4b569bc9d96aa0fb84a52ba Mon Sep 17 00:00:00 2001 +From: Alaric Senat <alaric@videolabs.io> +Date: Fri, 8 Mar 2024 15:11:47 +0100 +Subject: [PATCH 82/85] contrib: glslang: rename master branch + +--- + contrib/src/glslang/rules.mak | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/src/glslang/rules.mak b/contrib/src/glslang/rules.mak +index fbf3710450..ea295ccb4b 100644 +--- a/contrib/src/glslang/rules.mak ++++ b/contrib/src/glslang/rules.mak +@@ -1,6 +1,6 @@ + # GLSLANG + GLSLANG_HASH := ef1f899b5d64a9628023f1bb129198674cba2b97 +-GLSLANG_BRANCH := master ++GLSLANG_BRANCH := main + GLSLANG_GITURL := https://github.com/KhronosGroup/glslang.git + GLSLANG_BASENAME := $(subst .,_,$(subst \,_,$(subst /,_,$(GLSLANG_HASH)))) + +-- +2.43.0 + -- GitLab From 4e58db19b92183ddbb051c22700d7ea207ff8886 Mon Sep 17 00:00:00 2001 From: Alaric Senat <dev.asenat@posteo.net> Date: Wed, 6 Mar 2024 10:12:36 +0100 Subject: [PATCH 10/11] build: bump sdk version to 3.1.55 This version contains big toolchain updates. The proper patches are added in this commit to build vlc with clang 19. Malloc and free now needs to be exported to be used in the main script as they are no longer exported by default. --- compile.sh | 4 +- ...Force-building-with-a-specific-older.patch | 50 +++++++++++++++++++ ...erer-freetype-fix-function-signature.patch | 31 ++++++++++++ ...port-bytecode-modules-with-emit-llvm.patch | 28 +++++++++++ 4 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 vlc_patches/aug/0083-contrib-modplug-Force-building-with-a-specific-older.patch create mode 100644 vlc_patches/aug/0084-text_renderer-freetype-fix-function-signature.patch create mode 100644 vlc_patches/aug/0085-wasm-build-export-bytecode-modules-with-emit-llvm.patch diff --git a/compile.sh b/compile.sh index b7f3a75..e5239ca 100755 --- a/compile.sh +++ b/compile.sh @@ -19,7 +19,7 @@ checkfail() SLOW_MODE=${SLOW_MODE:=1} WORK_DIR=$PWD -EMSDK_VERSION="3.1.18" +EMSDK_VERSION="3.1.55" # Download the portable SDK and uncompress it if [ ! -d emsdk ]; then diagnostic "emsdk not found. Fetching it" @@ -80,6 +80,8 @@ cd ./vlc/extras/package/wasm-emscripten/ ./build.sh --mode=${SLOW_MODE} cd $WORK_DIR echo "_main" > libvlc_wasm.sym +echo "_malloc" >> libvlc_wasm.sym +echo "_free" >> libvlc_wasm.sym sed -e 's/^/_/' ./vlc/lib/libvlc.sym >> libvlc_wasm.sym diff --git a/vlc_patches/aug/0083-contrib-modplug-Force-building-with-a-specific-older.patch b/vlc_patches/aug/0083-contrib-modplug-Force-building-with-a-specific-older.patch new file mode 100644 index 0000000..830d256 --- /dev/null +++ b/vlc_patches/aug/0083-contrib-modplug-Force-building-with-a-specific-older.patch @@ -0,0 +1,50 @@ +From 523638f45e7c65f2ee447f1094fedb945fd8cec9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> +Date: Thu, 8 Sep 2022 15:28:02 +0300 +Subject: [PATCH 83/85] contrib: modplug: Force building with a specific older + C++ version + +This project uses the 'register' storage class specifier for a lot +of variables, and C++17 disallows that storage class spcifier. + +This fixes building with newer compilers that default to C++17 +if nothing is specified (which is the default since GCC 11 +and Clang 16). + +When building with Clang 16 in C++17 mode, it fails with errors +like these: + +fastmix.cpp:678:2: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + SNDMIX_BEGINSAMPLELOOP8 + ^ +fastmix.cpp:291:2: note: expanded from macro 'SNDMIX_BEGINSAMPLELOOP8' + register MODCHANNEL * const pChn = pChannel;\ + ^ +--- + contrib/src/modplug/rules.mak | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak +index aa10fc41bb..c8371c9270 100644 +--- a/contrib/src/modplug/rules.mak ++++ b/contrib/src/modplug/rules.mak +@@ -8,6 +8,8 @@ ifeq ($(call need_pkg,"libmodplug >= 0.8.9.0"),) + PKGS_FOUND += modplug + endif + ++MODPLUG_CXXFLAGS := $(CXXFLAGS) -std=gnu++98 ++ + $(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz: + $(call download_pkg,$(MODPLUG_URL),modplug) + +@@ -26,6 +28,6 @@ endif + + .modplug: libmodplug + $(RECONF) +- cd $< && $(HOSTVARS) ./configure $(HOSTCONF) ++ cd $< && $(HOSTVARS) CXXFLAGS="$(MODPLUG_CXXFLAGS)" ./configure $(HOSTCONF) + cd $< && $(MAKE) install + touch $@ +-- +2.43.0 + diff --git a/vlc_patches/aug/0084-text_renderer-freetype-fix-function-signature.patch b/vlc_patches/aug/0084-text_renderer-freetype-fix-function-signature.patch new file mode 100644 index 0000000..013990b --- /dev/null +++ b/vlc_patches/aug/0084-text_renderer-freetype-fix-function-signature.patch @@ -0,0 +1,31 @@ +From da86e0106079008afa0967a4730e9f0bf92d31ef Mon Sep 17 00:00:00 2001 +From: Johannes Kauffmann <johanneskauffmann@hotmail.com> +Date: Mon, 12 Dec 2022 13:13:20 +0100 +Subject: [PATCH 84/85] text_renderer: freetype: fix function signature + +All other _GetFamily functions have the last argument as const. It fixes +the following warning: + +../modules/text_renderer/freetype/platform_fonts.c:925:26: warning: incompatible function pointer types ... [-Wincompatible-function-pointer-types] + fs->pf_select_family = StaticMap_GetFamily; + ^ ~~~~~~~~~~~~~~~~~~~ +--- + modules/text_renderer/freetype/platform_fonts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/text_renderer/freetype/platform_fonts.c b/modules/text_renderer/freetype/platform_fonts.c +index 441907b23f..f6a4d37bdd 100644 +--- a/modules/text_renderer/freetype/platform_fonts.c ++++ b/modules/text_renderer/freetype/platform_fonts.c +@@ -794,7 +794,7 @@ SelectAndLoadFace( filter_t *p_filter, const text_style_t *p_style, uni_char_t c + + #ifndef HAVE_GET_FONT_BY_FAMILY_NAME + static int StaticMap_GetFamily( vlc_font_select_t *fs, const char *psz_lcname, +- vlc_family_t **pp_result ) ++ const vlc_family_t **pp_result ) + { + filter_t *p_filter = fs->p_filter; + filter_sys_t *p_sys = p_filter->p_sys; +-- +2.43.0 + diff --git a/vlc_patches/aug/0085-wasm-build-export-bytecode-modules-with-emit-llvm.patch b/vlc_patches/aug/0085-wasm-build-export-bytecode-modules-with-emit-llvm.patch new file mode 100644 index 0000000..f703d74 --- /dev/null +++ b/vlc_patches/aug/0085-wasm-build-export-bytecode-modules-with-emit-llvm.patch @@ -0,0 +1,28 @@ +From 9194e19e11f2d645d56fe9a50660cc7a11818290 Mon Sep 17 00:00:00 2001 +From: Alaric Senat <alaric@videolabs.io> +Date: Fri, 8 Mar 2024 15:08:07 +0100 +Subject: [PATCH 85/85] wasm: build: export bytecode modules with `-emit-llvm` + +The `-emit-llvm` option is needed to export bytecode together with a +`.bc` extension on the output file since emscripten 3.1.50[^1]. + +[^1] https://github.com/emscripten-core/emscripten/commit/94b36c04dd323af066f2c1ab6d13f26eb818eb0b +--- + extras/package/wasm-emscripten/build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extras/package/wasm-emscripten/build.sh b/extras/package/wasm-emscripten/build.sh +index acd74591fc..29e8dac640 100755 +--- a/extras/package/wasm-emscripten/build.sh ++++ b/extras/package/wasm-emscripten/build.sh +@@ -201,6 +201,6 @@ const void *vlc_static_modules[] = { + + diagnostic "vlc static modules: compiling static modules entry points" + # compile vlc-modules.c +-emcc -pthread -c "$BUILD_PATH"/vlc-modules.c -o "$BUILD_PATH"/vlc-modules.bc ++emcc -pthread -emit-llvm -c "$BUILD_PATH"/vlc-modules.c -o "$BUILD_PATH"/vlc-modules.bc + + echo "VLC for wasm32-unknown-emscripten built!" +-- +2.43.0 + -- GitLab From 29f1a73b9b4d88b0f783e12bbed0c860735850dd Mon Sep 17 00:00:00 2001 From: Alaric Senat <alaric@videolabs.io> Date: Wed, 6 Mar 2024 17:41:50 +0100 Subject: [PATCH 11/11] export: move libvlc singleton in media player It's not used in main.c anymore. --- exports_media_player.c | 3 +-- main.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/exports_media_player.c b/exports_media_player.c index a9bc603..0dd4dbf 100644 --- a/exports_media_player.c +++ b/exports_media_player.c @@ -13,8 +13,7 @@ #include <emscripten.h> #include <emscripten/html5.h> -// Singleton, defined in main.c -extern libvlc_instance_t *libvlc; +libvlc_instance_t *libvlc; libvlc_media_player_t* EMSCRIPTEN_KEEPALIVE wasm_media_player_new() { return libvlc_media_player_new(libvlc); diff --git a/main.c b/main.c index d2b5792..061c6aa 100644 --- a/main.c +++ b/main.c @@ -8,7 +8,6 @@ #include <emscripten/html5.h> libvlc_media_player_t *mp = NULL; -libvlc_instance_t *libvlc; libvlc_time_t t = -1; static void iter() -- GitLab