Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile against upstream librespot. #672

Merged
merged 4 commits into from
Sep 17, 2024
Merged

Conversation

kimtore
Copy link
Collaborator

@kimtore kimtore commented Sep 16, 2024

This patch uses upstream dev branch in favor of Jason's fork.

The dev branch merged cleanly into that fork, and there was no diff between the two trees.

The commit trees for the fork and upstream diverge. Many commits won't merge because of conflicts. Some code seems similar on both sides. I have no idea about the potential breakage for downstream users, but the alternative is to leave it unmaintained. Hopefully everything works fine :-)

Fixes #670
Fixes #669

This patch uses upstream dev branch in favor of Jason's fork.

The dev branch merged cleanly into that fork, and there
was no diff between the two trees.

Fixes dtcooper#670
Fixes dtcooper#669
@dtcooper
Copy link
Owner

Looks good! Go ahead an yourself to the LICENSE file, and we'll merge!

Copy link
Owner

@dtcooper dtcooper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, could you address the feedback? :)

build.sh Outdated Show resolved Hide resolved
build.sh Outdated Show resolved Hide resolved
@kimtore
Copy link
Collaborator Author

kimtore commented Sep 17, 2024

I overlooked the fact that I had a previously checked out copy of librespot 0.4.2 in raspotify's directory. Therefore leading me to believe that I compiled against 0.5.0 when in fact I was not.

Anyways, the updated PR builds against upstream dev branch and should address the issues you pointed out.

@dtcooper dtcooper merged commit 8c5c576 into dtcooper:master Sep 17, 2024
@dtcooper
Copy link
Owner

LGTM. Merged and cutting a release. Hopefully it works! :)

@dtcooper
Copy link
Owner

Cutting as v0.44.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The music doesn't play, it just scrolls librespot error: Unable to load encrypted file: ChannelError
2 participants