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.

Sign up for GitHub

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

Jump to bottom

aravis-tools: Correct appstream metainfo description and file name #932

Merged
merged 3 commits into from
Sep 3, 2024
Merged

aravis-tools: Correct appstream metainfo description and file name #932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21dc000
aravis-tools: Correct appstream metainfo description and file name
cmarmo Sep 3, 2024
47d1d01
Include the API version in the appdata filename
cmarmo Sep 3, 2024
fbc8e7f
Fix component id in metadat info file.
cmarmo Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion viewer/data/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ appdata_conf = configuration_data()
appdata_conf.set ('ARAVIS_API_VERSION', aravis_api_version)

configure_file (input: files('org.aravis.viewer.appdata.xml.in'),
output: 'org.aravis.viewer-@0@.appdata.xml'.format (aravis_api_version),
output: 'org.aravis.viewer.metainfo.xml'.format (aravis_api_version),
Copy link
Contributor

Choose a reason for hiding this comment

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

Different aravis series are supposed to be installable in parallel. This change breaks this possibility.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Understood!
The last commit should have fixed this issue, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nope... I have to modify the id tag too... :) coming soon...

configuration: appdata_conf,
install_dir: aravis_app_data_dir)

Expand Down
4 changes: 2 additions & 2 deletions viewer/data/org.aravis.viewer.appdata.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<name>Aravis Viewer</name>
<summary>Viewer for industial camera video stream</summary>
<description>
Aravis Viewer is a simple viewer displaying video streams from USB3 and ethernet industrial cameras supporting the
<p>Aravis Viewer is a simple viewer displaying video streams from USB3 and ethernet industrial cameras supporting the
GENICAM specification. It allows to control basic acquisition parameters (like framerate, exposure and gain), and to
save raw still images.
save raw still images.</p>
</description>
<screenshots>
<screenshot type="default">
Expand Down
Loading