Use the latest emsdk version to compile openjpeg decoder #19585

calixteman · 2025-02-28T20:45:22Z

No description provided.

external/openjpeg/openjpeg.js

calixteman · 2025-02-28T20:49:54Z

The latest version of emscripten removed an option in order to not use import.meta (see emscripten-core/emscripten#23171 for reference and out of curiosity see who was the reviewer :)).
That causes to have import.meta in openjpeg.js which leads to have an unexpected wasm file when building for mozcentral or generic. It should be possible to avoid that thanks to webpack.
@Snuffleupagus if you have time to look at that, it'd be nice or if it's easy enough few pointers would help me to figure out how to do it.

Snuffleupagus · 2025-02-28T21:31:23Z

There's no guarantee that it doesn't break any number of other things, so I'd recommend diffing all built files and comparing this patch against master carefully, however the following might help:

diff --git a/gulpfile.mjs b/gulpfile.mjs
index e79b79a96..77af20bdc 100644
--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@@ -387,6 +387,7 @@ function createWebpackConfig(
       parser: {
         javascript: {
           importMeta: false,
+          url: false,
         },
       },
       rules: [

See also https://webpack.js.org/configuration/module/#moduleparserjavascripturl

calixteman · 2025-02-28T21:51:31Z

I think I found something:

diff --git a/gulpfile.mjs b/gulpfile.mjs
index e79b79a96..6713cdb6b 100644
--- a/gulpfile.mjs
+++ b/gulpfile.mjs
@@ -400,6 +400,13 @@ function createWebpackConfig(
             targets: BABEL_TARGETS,
           },
         },
+        {
+          test: /\.wasm$/,
+          type: "asset/resource",
+          generator: {
+            emit: false,
+          },
+        },
       ],
     },
     // Avoid shadowing actual Node.js variables with polyfills, by disabling

Snuffleupagus · 2025-03-03T21:49:42Z

Have you compared the built pdf.worker.mjs files with/without this patch, as I suggested doing in #19585 (comment)?

Because when I do that locally it no longer emits the wasm-file, however the JavaScript code still contains a bunch of generated boilerplate code that references the wasm-file which seems strange.
Did you try the suggestion in #19585 (comment), since in my quick testing it seems to address the problem completely?

calixteman · 2025-03-04T16:07:44Z

/botio test

moz-tools-bot · 2025-03-04T16:07:47Z

From: Bot.io (Linux m4)

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/147f820c980e286/output.txt

moz-tools-bot · 2025-03-04T16:07:47Z

From: Bot.io (Windows)

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.193.163.58:8877/7dd1719a5ead849/output.txt

gulpfile.mjs

moz-tools-bot · 2025-03-04T16:36:53Z

From: Bot.io (Linux m4)

Failed

Full output at http://54.241.84.105:8877/147f820c980e286/output.txt

Total script time: 29.09 mins

Unit tests: Passed
Integration Tests: Passed
Regression tests: FAILED

  different ref/snapshot: 2458

Image differences available at: http://54.241.84.105:8877/147f820c980e286/reftest-analyzer.html#web=eq.log

moz-tools-bot · 2025-03-04T17:08:02Z

From: Bot.io (Windows)

Failed

Full output at http://54.193.163.58:8877/7dd1719a5ead849/output.txt

Total script time: 60.00 mins

calixteman · 2025-03-04T17:41:35Z

/botio test

moz-tools-bot · 2025-03-04T17:41:37Z

From: Bot.io (Windows)

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.193.163.58:8877/b54b2ed7bf3c0a4/output.txt

moz-tools-bot · 2025-03-04T17:41:38Z

From: Bot.io (Linux m4)

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/f43f9e8b3d5b533/output.txt

moz-tools-bot · 2025-03-04T18:11:37Z

From: Bot.io (Linux m4)

Failed

Full output at http://54.241.84.105:8877/f43f9e8b3d5b533/output.txt

Total script time: 29.98 mins

Unit tests: Passed
Integration Tests: FAILED
Regression tests: FAILED

  different ref/snapshot: 2458

Image differences available at: http://54.241.84.105:8877/f43f9e8b3d5b533/reftest-analyzer.html#web=eq.log

moz-tools-bot · 2025-03-04T18:41:53Z

From: Bot.io (Windows)

Failed

Full output at http://54.193.163.58:8877/b54b2ed7bf3c0a4/output.txt

Total script time: 60.00 mins

Snuffleupagus · 2025-03-04T19:10:41Z

It seems that the Windows bot is broken, since no tests ran there.
The "failures" on the Linux bot is probably just from the Firefox 138 update, but it's not really feasible to check those given the sheer number of them.

calixteman · 2025-03-04T19:25:06Z

/botio test

moz-tools-bot · 2025-03-04T19:25:09Z

From: Bot.io (Linux m4)

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.241.84.105:8877/be72e38f110bcc5/output.txt

moz-tools-bot · 2025-03-04T19:25:09Z

From: Bot.io (Windows)

Received

Command cmd_test from @calixteman received. Current queue size: 0

Live output at: http://54.193.163.58:8877/b05fadb7c2d34c8/output.txt

moz-tools-bot · 2025-03-04T19:54:38Z

From: Bot.io (Linux m4)

Failed

Full output at http://54.241.84.105:8877/be72e38f110bcc5/output.txt

Total script time: 29.47 mins

Unit tests: Passed
Integration Tests: FAILED
Regression tests: FAILED

  different ref/snapshot: 2458

Image differences available at: http://54.241.84.105:8877/be72e38f110bcc5/reftest-analyzer.html#web=eq.log

moz-tools-bot · 2025-03-04T20:23:45Z

From: Bot.io (Windows)

Failed

Full output at http://54.193.163.58:8877/b05fadb7c2d34c8/output.txt

Total script time: 58.58 mins

Unit tests: Passed
Integration Tests: FAILED
Regression tests: FAILED

  different ref/snapshot: 2458

Image differences available at: http://54.193.163.58:8877/b05fadb7c2d34c8/reftest-analyzer.html#web=eq.log

Snuffleupagus

r=me, assuming that you carefully check that there's no actual failures in the reference tests; thank you.

calixteman · 2025-03-04T20:26:56Z

I think we should makerefs and then re-run the tests, wdyt ?

Snuffleupagus · 2025-03-04T20:39:02Z

I think we should makerefs and then re-run the tests, wdyt ?

Sure, that's probably easier than going through 2458 ref-test results :-)

Snuffleupagus · 2025-03-04T21:18:54Z

/botio browsertest

moz-tools-bot · 2025-03-04T21:18:57Z

From: Bot.io (Linux m4)

Received

Command cmd_browsertest from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.241.84.105:8877/ec8b42eeca78361/output.txt

moz-tools-bot · 2025-03-04T21:18:57Z

From: Bot.io (Windows)

Received

Command cmd_browsertest from @Snuffleupagus received. Current queue size: 0

Live output at: http://54.193.163.58:8877/fa9b4b6031ba09e/output.txt

moz-tools-bot · 2025-03-04T21:35:18Z

From: Bot.io (Linux m4)

Success

Full output at http://54.241.84.105:8877/ec8b42eeca78361/output.txt

Total script time: 16.34 mins

Regression tests: Passed

moz-tools-bot · 2025-03-04T21:48:22Z

From: Bot.io (Windows)

Success

Full output at http://54.193.163.58:8877/fa9b4b6031ba09e/output.txt

Total script time: 29.40 mins

Regression tests: Passed

github-advanced-security bot found potential problems Feb 28, 2025

View reviewed changes

This comment was marked as outdated.

Sign in to view

timvandermeij added the image-jpeg label Mar 2, 2025

Snuffleupagus added image-jpx image-conversion and removed image-jpeg labels Mar 2, 2025

calixteman force-pushed the update_openjpeg2 branch from 9a910f2 to cd43e3b Compare March 3, 2025 21:24

calixteman requested a review from Snuffleupagus March 3, 2025 21:26

calixteman marked this pull request as ready for review March 3, 2025 21:27

calixteman force-pushed the update_openjpeg2 branch from cd43e3b to c1ef19a Compare March 4, 2025 16:06

Snuffleupagus requested changes Mar 4, 2025

View reviewed changes

gulpfile.mjs Outdated Show resolved Hide resolved

Use the latest emsdk version to compile openjpeg decoder

559ff28

calixteman force-pushed the update_openjpeg2 branch from c1ef19a to 559ff28 Compare March 4, 2025 17:41

Snuffleupagus approved these changes Mar 4, 2025

View reviewed changes

calixteman merged commit 4693b7a into mozilla:master Mar 5, 2025
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use the latest emsdk version to compile openjpeg decoder #19585

Use the latest emsdk version to compile openjpeg decoder #19585

calixteman commented Feb 28, 2025

calixteman commented Feb 28, 2025

This comment was marked as outdated.

Snuffleupagus commented Feb 28, 2025 •

edited

Loading

calixteman commented Feb 28, 2025

Snuffleupagus commented Mar 3, 2025

calixteman commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

calixteman commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

Snuffleupagus commented Mar 4, 2025 •

edited

Loading

calixteman commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

Snuffleupagus left a comment

calixteman commented Mar 4, 2025

Snuffleupagus commented Mar 4, 2025 •

edited

Loading

Snuffleupagus commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

Use the latest emsdk version to compile openjpeg decoder #19585

Use the latest emsdk version to compile openjpeg decoder #19585

Conversation

calixteman commented Feb 28, 2025

calixteman commented Feb 28, 2025

This comment was marked as outdated.

Snuffleupagus commented Feb 28, 2025 • edited Loading

calixteman commented Feb 28, 2025

Snuffleupagus commented Mar 3, 2025

calixteman commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Failed

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Failed

calixteman commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Failed

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Failed

Snuffleupagus commented Mar 4, 2025 • edited Loading

calixteman commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Failed

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Failed

Snuffleupagus left a comment

Choose a reason for hiding this comment

calixteman commented Mar 4, 2025

Snuffleupagus commented Mar 4, 2025 • edited Loading

Snuffleupagus commented Mar 4, 2025

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Received

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Linux m4)

Success

moz-tools-bot commented Mar 4, 2025

From: Bot.io (Windows)

Success

Snuffleupagus commented Feb 28, 2025 •

edited

Loading

Snuffleupagus commented Mar 4, 2025 •

edited

Loading

Snuffleupagus commented Mar 4, 2025 •

edited

Loading