make jpegxr more optional

.github/workflows/release_nightly.yml

@@ -76,23 +76,25 @@ jobs:
             os: macos-latest
             target: x86_64-apple-darwin
             MACOSX_DEPLOYMENT_TARGET: 10.7
-            DESKTOP_FEATURES: sandbox
+            DESKTOP_FEATURES: sandbox,jpegxr
 
           - build_name: macos-aarch64
             os: macos-latest
             target: aarch64-apple-darwin
             MACOSX_DEPLOYMENT_TARGET: 11.0
-            DESKTOP_FEATURES: sandbox
+            DESKTOP_FEATURES: sandbox,jpegxr
 
           - build_name: windows-x86_32
             os: windows-latest
             target: i686-pc-windows-msvc
             RUSTFLAGS: -Ctarget-feature=+crt-static
+            DESKTOP_FEATURES: jpegxr
 
           - build_name: windows-x86_64
             os: windows-latest
             target: x86_64-pc-windows-msvc
             RUSTFLAGS: -Ctarget-feature=+crt-static
+            DESKTOP_FEATURES: jpegxr
 
     env:
       PACKAGE_FILE: ${{ needs.create-nightly-release.outputs.package_prefix }}-${{ matrix.build_name }}.${{ startsWith(matrix.build_name, 'win') && 'zip' || 'tar.gz' }}

.github/workflows/test_rust.yml

@@ -82,7 +82,7 @@ jobs:
           RUSTDOCFLAGS: -D warnings
 
       - name: Run tests with image tests
-        run: cargo test --all --locked --features imgtests,lzma
+        run: cargo test --all --locked --features imgtests,lzma,jpegxr
         env:
           XDG_RUNTIME_DIR: '' # dummy value, just to silence warnings about it missing
 

desktop/Cargo.toml

@@ -53,7 +53,8 @@ embed-resource = "2"
 vergen = { version = "8.2.5", features = ["build", "git", "gitcl", "cargo"] }
 
 [features]
-default = ["software_video", "ruffle_core/jpegxr"]
+default = ["software_video"]
+jpegxr = ["ruffle_core/jpegxr"]
 
 # core features
 avm_debug = ["ruffle_core/avm_debug"]

tests/Cargo.toml

@@ -23,7 +23,8 @@ url = "2.4.1"
 # Enable running image comparison tests. This is off by default,
 # since the images we compare against are generated on CI, and may
 # not match your local machine's Vulkan version / image output.
-imgtests = ["ruffle_video_software", "ruffle_core/jpegxr"]
+imgtests = ["ruffle_video_software"]
+jpegxr = ["ruffle_core/jpegxr"]
 lzma = ["ruffle_core/lzma"]
 
 [dev-dependencies]

tests/README.md

@@ -51,6 +51,7 @@ trigger = "last_frame" # When to trigger this capture. Options are last_frame (d
 # Which build features are required for this test to run.
 [required_features]
 lzma = false # If LZMA support is enabled in this build
+jpegxr = false # If JPEG XR support is enabled in this build
 ```
 
 ## Frame-based tests

tests/tests/swfs/avm2/stage3d_texture_bytearray/test.toml

@@ -4,4 +4,7 @@ num_frames = 1
 tolerance = 2
 
 [player_options]
-with_renderer = { optional = true, sample_count = 1 }
+with_renderer = { optional = true, sample_count = 1 }
+
+[required_features]
+jpegxr = true

tests/tests/util/options.rs

@@ -117,11 +117,12 @@ impl Approximations {
 #[serde(default, deny_unknown_fields)]
 pub struct RequiredFeatures {
     lzma: bool,
+    jpegxr: bool,
 }
 
 impl RequiredFeatures {
     pub fn can_run(&self) -> bool {
-        !self.lzma || cfg!(feature = "lzma")
+        (!self.lzma || cfg!(feature = "lzma")) && (!self.jpegxr || cfg!(feature = "jpegxr"))
     }
 }