fix build with sixel feature on windows #638
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi. I created the PR for I've made some changes to my PR branch, so that the auto-traits on the error type are no longer affected. The changeset required to get things to compile is now relatively simple. Based on current master it should look something like this: diff --git a/spotify_player/Cargo.toml b/spotify_player/Cargo.toml
index 5b0c33e..e4b9e7f 100644
--- a/spotify_player/Cargo.toml
+++ b/spotify_player/Cargo.toml
@@ -41,7 +41,7 @@ tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
backtrace = "0.3.74"
souvlaki = { version = "0.7.3", optional = true }
-viuer = { version = "0.9.1", optional = true }
+viuer = { version = "0.9.1", optional = true, git = "https://github.com/ollbx/viuer/", branch = "icy_sixel" }
image = { version = "0.25.5", optional = true }
notify-rust = { version = "4.11.3", optional = true, default-features = false, features = [
"d",
@@ -87,7 +87,7 @@ gstreamer-backend = ["streaming", "librespot-playback/gstreamer-backend"]
streaming = ["librespot-playback", "librespot-connect"]
media-control = ["souvlaki", "winit", "windows"]
image = ["viuer", "dep:image"]
-sixel = ["image", "viuer/sixel"]
+sixel = ["image", "viuer/icy_sixel"]
notify = ["notify-rust"]
daemon = ["daemonize", "streaming"]
fzf = ["fuzzy-matcher"]That being said, given that diff --git a/spotify_player/Cargo.toml b/spotify_player/Cargo.toml
index 5b0c33e..c93e5dd 100644
--- a/spotify_player/Cargo.toml
+++ b/spotify_player/Cargo.toml
@@ -41,7 +41,7 @@ tracing = "0.1.41"
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
backtrace = "0.3.74"
souvlaki = { version = "0.7.3", optional = true }
-viuer = { version = "0.9.1", optional = true }
+viuer = { version = "0.9.1", optional = true, git = "https://github.com/ollbx/viuer/", branch = "icy_sixel" }
image = { version = "0.25.5", optional = true }
notify-rust = { version = "4.11.3", optional = true, default-features = false, features = [
"d",
@@ -88,6 +88,7 @@ streaming = ["librespot-playback", "librespot-connect"]
media-control = ["souvlaki", "winit", "windows"]
image = ["viuer", "dep:image"]
sixel = ["image", "viuer/sixel"]
+icy_sixel = ["image", "viuer/icy_sixel"]
notify = ["notify-rust"]
daemon = ["daemonize", "streaming"]
fzf = ["fuzzy-matcher"]
diff --git a/spotify_player/src/main.rs b/spotify_player/src/main.rs
index 3f65c5e..84b44ba 100644
--- a/spotify_player/src/main.rs
+++ b/spotify_player/src/main.rs
@@ -80,7 +80,7 @@ async fn start_app(state: &state::SharedState) -> Result<()> {
// initialize `viuer` supports for kitty, iterm2, and sixel
viuer::get_kitty_support();
viuer::is_iterm_supported();
- #[cfg(feature = "sixel")]
+ #[cfg(any(feature = "sixel", feature = "icy_sixel"))]
viuer::is_sixel_supported();
}
} |
|
Another alternative could be to specify different dependencies for Windows and the rest, so that |
|
@ollbx Thanks! I've applied your changes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There's an open pull request for
viueradding support for the nativeicy_sixelimplementation: atanunq/viuer#63. However, I currently can't get that branch to work without pulling in the brokensixel-sysdependency.For now, I've forked that PR's branch and removed the old sixel dependencies, which allows the Windows build to succeed again. I'll leave this here as a draft until that PR is merged.
This should also fix #628