libjxl · eustas · Nov 4, 2025 · Oct 31, 2025 · Nov 3, 2025 · Nov 4, 2025
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -197,6 +197,21 @@ jobs:
               -DJPEGXL_ENABLE_VIEWERS=OFF
               -DSJPEG_ANDROID_NDK_PATH=${ANDROID_NDK_LATEST_HOME}
               -DJPEGXL_BUNDLE_LIBPNG=ON
+          - name: release_ios
+            os: macos-latest
+            mode: release
+            skip_install: true
+            skip_stats: true
+            skip_test: true # can't finish "linking" tests without emulator
+            force_system_brotli: OFF
+            cmake_args: >-
+              -DCMAKE_SYSTEM_NAME=iOS
+              -DCMAKE_OSX_ARCHITECTURES=arm64
+              -DJPEGXL_ENABLE_BENCHMARK=OFF
+              -DJPEGXL_ENABLE_OPENEXR=OFF
+              -DJPEGXL_ENABLE_PLUGINS=OFF
+              -DJPEGXL_ENABLE_VIEWERS=OFF
+              -DJPEGXL_BUNDLE_LIBPNG=ON
 
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache

diff --git a/deps.sh b/deps.sh
@@ -15,7 +15,7 @@ MYDIR=$(dirname "${SELF}")
 # Git revisions we use for the given submodules. Update these whenever you
 # update a git submodule.
 TESTDATA="873045a9c42ed60721756e26e2a6b32e17415205"
-THIRD_PARTY_BROTLI="36533a866ed1ca4b75cf049f4521e4ec5fe24727"
+THIRD_PARTY_BROTLI="028fb5a23661f123017c060daa546b55cf4bde29" # v1.2.0
 THIRD_PARTY_GOOGLETEST="6910c9d9165801d8827d628cb72eb7ea9dd538c5" # v1.16.0
 THIRD_PARTY_HIGHWAY="457c891775a7397bdb0376bb1031e6e027af1c48" # v1.2.0
 THIRD_PARTY_SKCMS="96d9171c94b937a1b5f0293de7309ac16311b722" # 2025_09_16

diff --git a/plugins/gimp/CMakeLists.txt b/plugins/gimp/CMakeLists.txt
@@ -24,5 +24,7 @@ target_link_libraries(file-jxl jxl jxl_threads PkgConfig::Gimp)
 target_include_directories(file-jxl PUBLIC
     ${PROJECT_SOURCE_DIR})  # for plugins/gimp absolute paths.
 
+set_target_properties(file-jxl PROPERTIES MACOSX_BUNDLE OFF)
+
 pkg_get_variable(GIMP_LIB_DIR gimp-2.0 gimplibdir)
 install(TARGETS file-jxl RUNTIME DESTINATION "${GIMP_LIB_DIR}/plug-ins/file-jxl/")
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -62,6 +62,7 @@ if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR
 else()
   # Compile brotli from sources.
   set(BROTLI_DISABLE_TESTS ON CACHE STRING "Disable Brotli tests")
+  set(BROTLI_BUILD_TOOLS OFF CACHE STRING "")
   # Override default "no-install" policy.
   if((NOT SANITIZER STREQUAL "asan") AND (NOT SANITIZER STREQUAL "msan"))
     set(BROTLI_BUNDLED_MODE OFF CACHE INTERNAL "")

diff --git a/third_party/brotli b/third_party/brotli
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -342,7 +342,10 @@ foreach(BINARY IN LISTS TOOL_BINARIES)
     endif()
     set_target_properties(${BINARY} PROPERTIES LINK_FLAGS "${JXL_WASM_TOOLS_LINK_FLAGS}")
   endif()
-
+
+  # Tools are CLI.
+  set_target_properties(${BINARY} PROPERTIES MACOSX_BUNDLE OFF)
+
   # Attach manifest that tells Windows to use UTF-8 for eg. fopen
   if(WIN32)
     # Accommodate cl, clang-cl and clang with GNU-like command