Skip to content

Update Linux Installer Script#1304

Merged
Trouffman merged 10 commits into
masterfrom
ci_linux_install_script
Jun 20, 2025
Merged

Update Linux Installer Script#1304
Trouffman merged 10 commits into
masterfrom
ci_linux_install_script

Conversation

@Trouffman

@Trouffman Trouffman commented Jun 17, 2025

Copy link
Copy Markdown
Collaborator

Initially to address address #1015 but as @paulpv mentionned a couple time, it is not the best practice to have the script auto-install by default.

  • Update Linux Installer Script with doc on how to use
  • Update package creator to use NDI 6.2

Things to discuss & check before commit:

  • No impact detected in the Github Actions
  • No impact detected for building the package (not supposed to)
  • No impact detected in third-party packager (mostly Flatpak here)
  • Confirm we (the project) are OK with this being a "noinstall" by default option
  • Update relevant Wiki pages

@Trouffman
Trouffman marked this pull request as ready for review June 17, 2025 19:46
@Trouffman
Trouffman requested a review from Copilot June 17, 2025 19:56

This comment was marked as outdated.

@Trouffman

Copy link
Copy Markdown
Collaborator Author

This will also look for the libndi files in an additional location to help with the Flakpak release at https://github.com/flathub/com.obsproject.Studio.Plugin.DistroAV

Once released the following code can be removed from the Flatpak process:
https://github.com/flathub/com.obsproject.Studio.Plugin.DistroAV/blob/fc770add1c1a0ded47f34cbc199dd46892c4c99a/com.obsproject.Studio.Plugin.DistroAV.json#L90-L93

@Trouffman Trouffman self-assigned this Jun 17, 2025
@Trouffman Trouffman added ci linux (supported) linux (unsupported) Installation Target installation improvments, issues, scripts, bugs. Dependencies Relate to a dependency (package / version) Build relate to building issues (all platform) labels Jun 17, 2025
@Trouffman

Copy link
Copy Markdown
Collaborator Author

For the record and the changes to add the flatpak path to the detection logic:

From a Discord discussion with tytan652 (flatpak maintainer):

In the context of a Flatpak application, we could make ld to check additional paths so QLibrary("ndi") could work.
In an extension we can't with extra-data [...]. The full path is the only way for the plugin Flatpak

@RayneYoruka

Copy link
Copy Markdown
Member

Have you tested it already? Asking to approve.

@Trouffman
Trouffman requested a review from Copilot June 20, 2025 14:04

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the Linux installer workflow by adding documentation and a default “no-install” behavior, bumps the NDI SDK version to 6.2.0 in packaging scripts, and adds Flatpak library lookup in the plugin loader.

  • Add Flatpak NDI library lookup path in the plugin loader
  • Bump NDI SDK version from 5.6.0 to 6.2.0 and update package names/maintainers
  • Enhance libndi-get.sh with usage docs, quoting improvements, and default no-install behavior

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
src/plugin-main.cpp Added Flatpak-specific lookup path for NDI library
CI/libndi-package.sh Updated NDI version, package names, replaces list, and maintainer
CI/libndi-get.sh Added header docs, improved variable quoting, refactored cleanup, and default no-install option
Comments suppressed due to low confidence (2)

CI/libndi-get.sh:30

  • Typo: 'follwoing' should be spelled 'following'.
# The follwoing should work with tmp folder in the user home directory - but not always... So we do not use it.

CI/libndi-get.sh:85

  • [nitpick] This and the following cleanup block would be clearer if indented to reflect their nesting inside the if [ "$1" == "install" ] branch.
    echo "Clean-up : Removing temporary folder"

Comment thread src/plugin-main.cpp
Comment on lines 422 to 424
locations << "/usr/local/lib";
locations << "/app/plugins/DistroAV/extra/lib";
#endif

Copilot AI Jun 20, 2025

Copy link

Choose a reason for hiding this comment

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

This Flatpak-specific path is currently added unconditionally; it should be guarded under the Linux code path (e.g., within a #if defined(Q_OS_LINUX) block) to avoid being included on non-Linux builds.

Suggested change
locations << "/usr/local/lib";
locations << "/app/plugins/DistroAV/extra/lib";
#endif
locations << "/usr/local/lib";
#if defined(Q_OS_LINUX)
locations << "/app/plugins/DistroAV/extra/lib";
#endif
#endif

Copilot uses AI. Check for mistakes.
@Trouffman

Copy link
Copy Markdown
Collaborator Author

Install Script Tested on Ubuntu 24.04.
Built Package tested and validated as well on Ubuntu 24.04.

@Trouffman
Trouffman merged commit 03ad7dd into master Jun 20, 2025
9 checks passed
@Trouffman
Trouffman deleted the ci_linux_install_script branch June 20, 2025 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Build relate to building issues (all platform) ci Dependencies Relate to a dependency (package / version) Installation Target installation improvments, issues, scripts, bugs. linux (supported) linux (unsupported)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants