Skip to content

Feature/Qt6 - Rebase to main#726

Merged
cedrik-fuoco-adsk merged 6 commits intoAcademySoftwareFoundation:feature/qt6from
cedrik-fuoco-adsk:qt6-rebase-mar21
Mar 21, 2025
Merged

Feature/Qt6 - Rebase to main#726
cedrik-fuoco-adsk merged 6 commits intoAcademySoftwareFoundation:feature/qt6from
cedrik-fuoco-adsk:qt6-rebase-mar21

Conversation

@cedrik-fuoco-adsk
Copy link
Copy Markdown
Contributor

@cedrik-fuoco-adsk cedrik-fuoco-adsk commented Mar 21, 2025

Feature/Qt6 - Rebase to main

Linked issues

n/a

Summarize your change.

I cherry-picked the missing commits from main.

  1. Fix the failing readthedocs build

  2. Fix network issue with rvnuke plugin (No changes because the fix was already in the feature/qt6 branch)

  3. 712: Adapt build to latest MSYS2 release

  4. Fix MMR support in OTIO reader

Describe the reason for the change.

Get the latest changes from the main branch.

cedrik-fuoco-adsk and others added 5 commits March 21, 2025 09:30
…ndation#719)

### Feature/qt6 - Fix issue with Windows CI (release)

### Linked issues
n/a

### Summarize your change.
I added the architecture and vfx platform to the key for the
dependencies cache on Windows. It is already present for MacOS.

### Describe the reason for the change.
Sometimes, the release Windows build was failing because it was using
the cache from a VFX2023 build.

### Describe what you have tested and on which operating system.
CI

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
### Fix multiple media representation support (MMR) in OTIO reader

### Linked issues
NA

### Describe the reason for the change.

There were a couple issues associated with multiple media representation
support in OTIO reader:
- Local file path could not be used because the server URL was always
preprended.
- When creating a video track, its duration was 1 frame too long
- New OTIO based media representation names were inconsistent with the
previously named MMR in RV such as 'mp4', 'path_to_movie', and
'path_to_frames'

### Summarize your change.

- Now only prepending the server URL when the target url starts with
/file_serve/version
- Fixed the duration in  _set_sequence_edl()
- Renamed known media representation names to standard media rep names
used by RV such as Streaming, Movie, and Frames.

### Describe what you have tested and on which operating system.
Successfully tested on macOS. The fix is not OS specific

### Add a list of changes, and note any that might need special
attention during the review.

### If possible, provide screenshots.

Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
### 712: Adapt build to latest MSYS2 release

### Linked issues
Fixes AcademySoftwareFoundation#712

### Describe the reason for the change.

Thanks to Open RV community member
[herronelou](https://github.com/herronelou) who reported this issue
(AcademySoftwareFoundation#712).
herronelou found out that the latest MSYS2 install:

<<
In recent versions of MSYS2, $OSTYPE is now reporting cygwin, not msys,
causing an issue at
https://github.com/AcademySoftwareFoundation/OpenRV/blob/main/rvcmds.sh#L35

See their announcement: https://www.msys2.org/news/
>>

Thank you [herronelou](https://github.com/herronelou)!

### Summarize your change.

In this commit, the rvcmds.sh script was adapted to support both the
older MSYS2 (reporting $OSTYPE as msys), and the newer MSYS2 (reporting
$OSTYPE as cygwin).

### Describe what you have tested and on which operating system.
Successfully tested on Windows using both an older MSYS2 install and the
latest MSYS2 install (msys2-x86_64-20250221.exe) containing the MSYS2
change.

### Add a list of changes, and note any that might need special
attention during the review.

### If possible, provide screenshots.

Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
### Fix network issue with rvnuke plugin

### Linked issues
n/a

### Summarize your change.
This PR update the rvNetwork,py to Python 3 (copied from
src/plugins/python/network/network/rvNetwork.py).

### Describe the reason for the change.
Nuke and RV integration was broken. An image or video could not be
played in RV.

### Describe what you have tested and on which operating system.
Rocky Linux 8

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
### Fix the failing readthedocs build

### Linked issues
n/a

### Summarize your change.
I added the `configuration` key to the `.readthedocs.yaml` because it is
required.

### Describe the reason for the change.
Since December 2024, the `configuration` key is required.
See
https://about.readthedocs.com/blog/2024/12/deprecate-config-files-without-sphinx-or-mkdocs-config/

### Describe what you have tested and on which operating system.
I tested the build on my fork. You can see the documentation here:
https://cedrik-openrv-fork.readthedocs.io/en/fix-readthedocs

### Add a list of changes, and note any that might need special
attention during the review.

### If possible, provide screenshots.
![Screenshot from 2025-03-19
09-54-03](https://github.com/user-attachments/assets/3097550f-d193-4402-8217-4093bf246d4e)

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
@cedrik-fuoco-adsk cedrik-fuoco-adsk marked this pull request as ready for review March 21, 2025 13:35
@cedrik-fuoco-adsk cedrik-fuoco-adsk merged commit 58dba91 into AcademySoftwareFoundation:feature/qt6 Mar 21, 2025
11 of 20 checks passed
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Apr 25, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Apr 28, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Apr 28, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Apr 28, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
cedrik-fuoco-adsk added a commit to cedrik-fuoco-adsk/OpenRV that referenced this pull request Apr 28, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
richardssam pushed a commit to richardssam/OpenRV that referenced this pull request Jun 17, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
richardssam pushed a commit to richardssam/OpenRV that referenced this pull request Jun 17, 2025
### Feature/Qt6 - Rebase to main

### Linked issues
n/a

### Summarize your change.
I cherry-picked the missing commits from main.

1. [Fix the failing readthedocs
build](AcademySoftwareFoundation@5c54a9c)

2. [Fix network issue with rvnuke
plugin](AcademySoftwareFoundation@eeae944)
(No changes because the fix was already in the feature/qt6 branch)

3. [712: Adapt build to latest MSYS2
release](AcademySoftwareFoundation@ead6e53)

4. [Fix MMR support in OTIO
reader](AcademySoftwareFoundation@1da73a9)

### Describe the reason for the change.
Get the latest changes from the main branch.

---------

Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Bernard Laberge <bernard.laberge@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Bernard Laberge <117092886+bernie-laberge@users.noreply.github.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Sam.Richards@taurich.org <Sam.Richards@taurich.org>
@cedrik-fuoco-adsk cedrik-fuoco-adsk deleted the qt6-rebase-mar21 branch July 28, 2025 13:36
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.

3 participants