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

[portaudio] Update overlay to version v19.7.0+2023-04-04 #63

Merged
merged 9 commits into from
Apr 6, 2023

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Apr 2, 2023

enable_jack_on_windows.patch to eneble JACK on windows
pa_initalize_recursive_guard.patch to fix crash with FlexAsio
@JoergAtGithub
Copy link
Member

Why adding overlays for pkgconfig and Meson here?

@daschuer daschuer force-pushed the portaudio_v19_7_0 branch 3 times, most recently from 5afd402 to 9dffdd4 Compare April 2, 2023 21:17
@daschuer daschuer force-pushed the portaudio_v19_7_0 branch 2 times, most recently from 6538fa0 to 07baec2 Compare April 2, 2023 23:32
@daschuer
Copy link
Member Author

daschuer commented Apr 3, 2023

It turns out that our vcpkg 2.3 suffers some rotting. Some required downloads are no longer available. The updated packages are not compatible to the old scripts and the new scripts are not working with the other remaining packages. I have tried to make this branch build, but every fix introduces new problems. Updating to upstream main on the other hand, does IMHO not suite to a stable branch.

So I have decided to only update PortAudio 19.7.0 + our patches and added the minimum required changes for that. This pulls in a minor Jack update 1.9.21 (from 1.9.14) and a pthreads build scripts update. The pkgconfig and Meson update is required to make the build work that goes not to the result output.

Than I have added the new files to the existing mixxx-deps zip archive.

@daschuer
Copy link
Member Author

daschuer commented Apr 4, 2023

A Mixxx Windows build for testing can be found here:
https://github.com/daschuer/mixxx/suites/12001955673/artifacts/630263817

@daschuer
Copy link
Member Author

daschuer commented Apr 4, 2023

The linked windows build used still the old Portaudio version. The last commit should fix it.

@daschuer
Copy link
Member Author

daschuer commented Apr 5, 2023

Now it is working:
https://github.com/daschuer/mixxx/suites/12032425437/artifacts/632709730

Even with non ASCII characters:
grafik

Copy link
Member

@JoergAtGithub JoergAtGithub left a comment

Choose a reason for hiding this comment

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

I downloaded the last Mixxx-Installer from this PR and ASIO is not available in the Sound preferences.

@daschuer
Copy link
Member Author

daschuer commented Apr 6, 2023

@JoergAtGithub I am glad you found that. There was a merge conflict with changed parameter names and the patches.

Luckily all our Mixxx patches are now merged and I have prepared a build from the current upstream HEAD.
This should lower the risk of similar issues with rotted patches.
Please test this one:
https://github.com/daschuer/mixxx/suites/12066844096/artifacts/635057674

@daschuer daschuer changed the title [portaudio] Update overlay to version v19.7.0 + patches [portaudio] Update overlay to version v19.7.0+2021-02-09 Apr 6, 2023
@daschuer daschuer changed the title [portaudio] Update overlay to version v19.7.0+2021-02-09 [portaudio] Update overlay to version v19.7.0+2023-04-04 Apr 6, 2023
@daschuer
Copy link
Member Author

daschuer commented Apr 6, 2023

It works :-)
grafik

@JoergAtGithub
Copy link
Member

JoergAtGithub commented Apr 6, 2023

I tested this (the Mixxx provided build https://github.com/daschuer/mixxx/suites/12066844096/artifacts/635057674) on Win7 and Win11. It behaves for me as the old version - note that I'm not affected by these bugs.

@JoergAtGithub
Copy link
Member

Updating the cache should be Ok for a bugfix release. But it should be noted, that this build.yml no longer generates the complete buildenv from scratch - it all relies on the VCPKG cache.

@JoergAtGithub JoergAtGithub merged commit df49129 into mixxxdj:2.3 Apr 6, 2023
@JoergAtGithub
Copy link
Member

Thank you!

@daschuer
Copy link
Member Author

daschuer commented Apr 6, 2023

But it should be noted, that this build.yml no longer generates the complete buildenv from scratch

Yes. The issue is that even without this patch the build.yml is not able to generate the complete buildenv.

@daschuer
Copy link
Member Author

daschuer commented Apr 6, 2023

Thank you for testing.

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.

2 participants