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

Change to Qt 6 #599

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft

Change to Qt 6 #599

wants to merge 33 commits into from

Conversation

nvllsvm
Copy link
Member

@nvllsvm nvllsvm commented Apr 19, 2024 •
edited
Loading

Not ready for release.

Blockers:

sevenrats and others added 30 commits February 11, 2023 15:34
@sevenrats
build on qt6
544a22c
@sevenrats
inject scripts normally
0daccea
@sevenrats
fix script injection
b5ac942
@sevenrats
fix gnome title bar
65601ee
@sevenrats
Merge branch 'jellyfin:master' into qt6
a2ec29c
@sevenrats
Merge branch 'jellyfin:master' into qt6
dd10d4a
@iwalton3
Stay logged in between application sessions.
90d0748
@iwalton3
WIP try fixing rendering
ddc6310
@iwalton3
WIP try fixing rendering checkpoint 2
14331e9
@iwalton3
Merge remote-tracking branch 'origin/master' into qt6
14ec760
@iwalton3
Merge remote-tracking branch 'origin/master' into qt6
938b316
@zjeffer
qt6: fixed build errors & warnings
7ffb243
@zjeffer
fix window not closing because closingWindow() was getting called rec…
3fce903 
…ursively
@iwalton3
Merge pull request #452 from zjeffer/qt6
24c2bd8 
qt6: fixed build errors & warnings
@zjeffer
Qt6: fixed some deprecation warnings
86589f7
@iwalton3
Merge pull request #455 from zjeffer/qt6
2890687 
Qt6: fix some deprecation warnings
@satmandu
Add qt6 packages needed for QT6 build on ubuntu 23.04 to README.md
75635aa
@satmandu
changes to allow qt6 build to complete on ubuntu 23.04
b7b042c
@satmandu
The python package is replaced by python3 in ubuntu.
bd9aed5
@satmandu
meson needs to be in the packages list for building...
0c5fde9
@satmandu
Add more required packages for build.
5997ce8
@satmandu
Use nproc for build parallelism variable
743651b
@iwalton3
Merge pull request #463 from satmandu/patch-1
3190904 
Add qt6 packages needed for QT6 build on ubuntu 23.04 to README.md, fix build of qt6 on Ubuntu 23.04.
@iwalton3
Implement QT 6 UI rendering workaround option 1.
5e45768
@iwalton3
Merge branch 'qt6' of github.com:jellyfin/jellyfin-media-player into qt6
0716fad
@zjeffer
Fix build on Qt 6.5+
04ce81d
@iwalton3
Merge pull request #539 from zjeffer/qt6
8b507eb 
Fix build on Qt 6.5+
@nvllsvm
Fix compatibility with mpv 0.38.0
d81cd4c
@nvllsvm
Merge branch 'master' into qt6
53cbda5
@nvllsvm
Delegate image format selection to mpv by default
cdb9e17
@nvllsvm
Fix demuxer cache size
8080e5b 
The settings values (10, 75, 150, 500) imply megabytes.
Treating them as kilobyte values is mostly insufficent and
results in issues with playback.
@nvllsvm
Copy link
Member Author

nvllsvm commented Apr 19, 2024

I'm debating where a final Qt 5 release should be made before this gets merged. Mainly to bring in the mpv 0.38.0 compatibility fix.

@iwalton3 Thoughts?

@nvllsvm nvllsvm requested a review from iwalton3 April 19, 2024 18:31
@sevenrats
Copy link
Member

This branch is fully unsuitable for release, and releasing it would currently add no value to the ecosystem. Qt6 does not give us anything in a world where 5.15.11 exists. The most reasonable way forward is to ride Qt5 until compat loses support. Within that time we should have built an OSC per #537 or the related Qt Bug will have been fixed. Then we can port to the native API and at that point we can discuss sunsetting the Qt5 build. Migrating now would be way beyond premature imho.

@iwalton3
Copy link
Member

This needs to be held until we either:

  • reach feature parity with the 5.x branch
  • are forced to switch to it because the ecosystem around it breaks

Notably the rendering pipeline is completely busted and we're using a UI cutout workaround to make it even slightly work that kills all overlay menus and trick play in the player.

iwalton3
iwalton3 requested changes Apr 20, 2024
View reviewed changes
Copy link
Member

@iwalton3 iwalton3 left a comment

Choose a reason for hiding this comment

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

See comment.

@nvllsvm nvllsvm marked this pull request as draft April 20, 2024 16:21
@sevenrats
Copy link
Member

some of these other changes are very good @nvllsvm, do you intend to open a new pr with them?

@nvllsvm
Copy link
Member Author

nvllsvm commented Apr 20, 2024

@sevenrats Took a first pass and added a few of those changes to #603

@satmandu
Copy link
Contributor

satmandu commented May 3, 2024

Would you please add these ubuntu packages to the list of required packages for building for QT6 in Readme.md?
qt6-5compat-dev qt6-base-dev qt6-base-private-devqt6-declarative-dev qt6-webchannel-dev qt6-webengine-dev

@kenden
Copy link

kenden commented May 6, 2024

This would help with the message

Uses an end-of-life runtime
The runtime used by this app is no longer receiving security updates

from https://flathub.org/apps/com.github.iwalton3.jellyfin-media-player

@sevenrats
Copy link
Member

@kenden
I suspect this has to do with the flatpak itself. Qt5 is not EoL for another 12 months, so, whatever runtime you have that is outdated is probably unrelated to this issue.

@kenden
Copy link

kenden commented May 6, 2024

Thanks @sevenrats I think this is actually described in this issue: flathub/com.github.iwalton3.jellyfin-media-player#41

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iwalton3 iwalton3 iwalton3 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@nvllsvm @sevenrats @iwalton3 @satmandu @kenden @zjeffer