From 8c34d56b9015ff9a4a14ad586f2639ca0d3d2b47 Mon Sep 17 00:00:00 2001
From: ownedbywuigi <ownedbywuigi@gmail.com>
Date: Sun, 5 Apr 2026 18:06:53 +0100
Subject: [PATCH] Pt 2

---
 media/ffvpx/libavutil/avutil.symbols |  2 --
 media/ffvpx/libavutil/moz.build      |  6 +++++-
 modules/zlib/src/moz.build           | 12 +++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/media/ffvpx/libavutil/avutil.symbols b/media/ffvpx/libavutil/avutil.symbols
index 353ea5b558..5389778e66 100644
--- a/media/ffvpx/libavutil/avutil.symbols
+++ b/media/ffvpx/libavutil/avutil.symbols
@@ -468,8 +468,6 @@ av_xtea_init
 av_xtea_le_crypt
 av_xtea_le_init
 avpriv_alloc_fixed_dsp
-avpriv_atomic_int_add_and_fetch
-avpriv_atomic_ptr_cas
 avpriv_cga_font
 avpriv_dict_set_timestamp
 avpriv_float_dsp_alloc
diff --git a/media/ffvpx/libavutil/moz.build b/media/ffvpx/libavutil/moz.build
index 7d99076130..998c52692e 100644
--- a/media/ffvpx/libavutil/moz.build
+++ b/media/ffvpx/libavutil/moz.build
@@ -42,7 +42,6 @@ SOURCES += [
     'hash.c',
     'hmac.c',
     'hwcontext.c',
-    # 'hwcontext_cuda.c',  # DISABLED: macOS does not support CUDA/NVCUVID
     'imgutils.c',
     'integer.c',
     'intmath.c',
@@ -82,6 +81,11 @@ SOURCES += [
     'xtea.c',
 ]
 
+if CONFIG['OS_ARCH'] != 'Darwin':
+    SOURCES += [
+        'hwcontext_cuda.c',
+    ]
+
 SYMBOLS_FILE = 'avutil.symbols'
 NO_VISIBILITY_FLAGS = True
 
diff --git a/modules/zlib/src/moz.build b/modules/zlib/src/moz.build
index 9618d836b6..0ce92da9fb 100644
--- a/modules/zlib/src/moz.build
+++ b/modules/zlib/src/moz.build
@@ -15,7 +15,6 @@ if CONFIG['CPU_ARCH'] == 'arm':
     SOURCES += [
         'adler32_simd.c',
         'inffast_chunk.c',
-        'inflate_simd.c',
     ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
@@ -40,7 +39,6 @@ if CONFIG['INTEL_ARCHITECTURE']:
             'crc_folding.c',
             'fill_window_sse.c',
             'inffast_chunk.c',
-            'inflate_simd.c',
         ]
 else:
     SOURCES += [
@@ -64,10 +62,18 @@ SOURCES += [
     'gzwrite.c',
     'infback.c',
     'inffast.c',
-    'inflate.c',
     'inftrees.c',
     'trees.c',
     'uncompr.c',
     'zutil.c',
 ]
 
+if CONFIG['CPU_ARCH'] == 'arm' or (CONFIG['INTEL_ARCHITECTURE'] and CONFIG['OS_ARCH'] != 'Darwin'):
+    SOURCES += [
+        'inflate_simd.c',
+    ]
+else:
+    SOURCES += [
+        'inflate.c',
+    ]
+