From 743d1f66d2a9e1e71ef6ff16b7b4ec17f41bdbf6 Mon Sep 17 00:00:00 2001
From: Job Bautista <jobbautista9@protonmail.com>
Date: Sun, 25 Dec 2022 11:33:10 +0800
Subject: [PATCH] Issue #2061 Follow-up: Fix moz.build to compile on all
 platforms.

Remove stuff from /extra/ and the JPEG transcoding file from compilation, as
 we don't need them.
A disable define for box decoding is also added, but currently commented out as
 there's no need to disable the function right now.

Co-authored-by: Moonchild <moonchild@palemoon.org>
---
 media/libjxl/moz.build | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media/libjxl/moz.build b/media/libjxl/moz.build
index dca27a004c..8ac386a548 100644
--- a/media/libjxl/moz.build
+++ b/media/libjxl/moz.build
@@ -11,9 +11,6 @@ LOCAL_INCLUDES += [
 ]
 
 SOURCES += [
-    "/media/libjxl/src/lib/extras/dec/jxl.cc",
-    "/media/libjxl/src/lib/extras/exif.cc",
-    "/media/libjxl/src/lib/extras/render_hdr.cc",
     "/media/libjxl/src/lib/jxl/ac_strategy.cc",
     "/media/libjxl/src/lib/jxl/alpha.cc",
     "/media/libjxl/src/lib/jxl/ans_common.cc",
@@ -48,7 +45,6 @@ SOURCES += [
     "/media/libjxl/src/lib/jxl/dec_patch_dictionary.cc",
     "/media/libjxl/src/lib/jxl/dec_xyb.cc",
     "/media/libjxl/src/lib/jxl/decode.cc",
-    "/media/libjxl/src/lib/jxl/decode_to_jpeg.cc",
     "/media/libjxl/src/lib/jxl/enc_bit_writer.cc",
     "/media/libjxl/src/lib/jxl/entropy_coder.cc",
     "/media/libjxl/src/lib/jxl/epf.cc",
@@ -126,6 +122,9 @@ EXPORTS.jxl += [
     "/media/libjxl/src/lib/include/jxl/types.h",
 ]
 
+# DEFINES["JPEGXL_ENABLE_BOXES"] = "0"
+DEFINES["JPEGXL_ENABLE_TRANSCODE_JPEG"] = "0"
+
 FINAL_LIBRARY = "gkmedias"
 
 # We allow warnings for third-party code that can be updated from upstream.