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

ardour: use librdf_raptor2 #369048

Merged
merged 1 commit into from
Jan 1, 2025
Merged

Conversation

korrat
Copy link
Contributor

@korrat korrat commented Dec 29, 2024

Recently, the raptor library stopped building in nixpkgs (#368134). This is likely due to an incompatible function declaration brought to light by the recent switch to GCC14.

This means that ardour fails to build as well. However, based on nightly CI builds, ardour is no longer using raptor 1.4.21, but raptor 2.0.14. Therefore, this PR updates ardour to use raptor 2.0.16 in nixpkgs, fixing the build.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 29, 2024
@wentasah
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369048


x86_64-linux

✅ 1 package built:
  • ardour

Copy link
Contributor

@wentasah wentasah 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. Thanks!

Copy link
Contributor

@SigmaSquadron SigmaSquadron 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 overall, but please rename the commit so that it follows the Commit Conventions.

Something like this should work: ardour: switch to librdf_raptor2

@emilazy
Copy link
Member

emilazy commented Dec 29, 2024

It seems like Ardour and Sonic Visualiser are the only remaining references to the old version. Looking at the upstream build scripts for the latter, the latest version works with Raptor 2.

I take it Ardour 7 will continue to fail to compile? Can it be made to work with Raptor 2 as well, perhaps by backporting upstream commits from the Ardour 8 branch? Otherwise, perhaps 25.05 is the release to remove Ardour 7 and Raptor 1 in; cc @magnetophon due to the discussion in #336093.

@korrat
Copy link
Contributor Author

korrat commented Dec 29, 2024

@SigmaSquadron, sorry, fixed.

@emilazy, based on Fedora packages, ardour7 should also be able to compile with raptor2. Maybe a maintainer can say whether to update both packages in this PR or to open a separate one.

@emilazy
Copy link
Member

emilazy commented Dec 29, 2024

Same PR (but a separate commit, ardour_7: …) is perfectly fine.

Since both lrdf and librdf_rasqal propagate librdf_raptor2, this patch
removes the direct dependency.
@korrat korrat force-pushed the ardour-update-raptor2 branch from e203dd4 to 95cafc4 Compare December 29, 2024 14:30
@korrat
Copy link
Contributor Author

korrat commented Dec 29, 2024

I tried building ardour_7 with the same fix, but it seems something else is broken in the build as well.

@magnetophon
Copy link
Member

Sorry to be absent from the discussion.
I can't test due to Mic92/nixpkgs-review#445

@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 369048


x86_64-linux

✅ 1 package built:
  • ardour

aarch64-linux

✅ 1 package built:
  • ardour

Copy link
Contributor

@khaneliman khaneliman left a comment

Choose a reason for hiding this comment

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

I tried building ardour_7 with the same fix, but it seems something else is broken in the build as well.

Apologies, I missed this comment and thought we were waiting on appending that to this PR. Going to merge so we can get this fixed, at least.

@khaneliman khaneliman changed the title Use raptor2 for Ardour ardour: use librdf_raptor2 Jan 1, 2025
@khaneliman khaneliman merged commit b1162df into NixOS:master Jan 1, 2025
37 of 39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants