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

mkvtoolnix: update to 85.0 #45712

Merged
merged 3 commits into from
Jul 2, 2024
Merged

mkvtoolnix: update to 85.0 #45712

merged 3 commits into from
Jul 2, 2024

Conversation

mvf
Copy link
Contributor

@mvf mvf commented Aug 22, 2023 •
edited
Loading

Testing the changes

  • I tested the changes in this PR: YES

Fixes #50897

Duncaen
Duncaen previously requested changes Sep 23, 2023
View reviewed changes
Copy link
Member

@Duncaen Duncaen left a comment

Choose a reason for hiding this comment

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

conflict

@mvf
Copy link
Contributor Author

mvf commented Sep 25, 2023

resolved

@mvf mvf changed the title mkvtoolnix: update to 79.0 mkvtoolnix: update to 80.0 Nov 6, 2023
@mvf mvf requested a review from Duncaen November 6, 2023 17:52
@mvf mvf changed the title mkvtoolnix: update to 80.0 mkvtoolnix: update to 81.0 Dec 11, 2023
@github-actions GitHub Actions
Copy link

Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.

@github-actions github-actions bot added the Stale label Mar 12, 2024
@mvf mvf changed the title mkvtoolnix: update to 81.0 mkvtoolnix: update to 83.0 Mar 15, 2024
@github-actions github-actions bot removed the Stale label Mar 16, 2024
@mvf
Copy link
Contributor Author

mvf commented Mar 16, 2024

@Duncaen Any chance you could review this? mkvtoolnix is built with Rake and now requires Qt6, so I had to add a new qmake6 build helper. Changes from the Qt5 qmake build helper (in top-down order in the file):

  • qt.conf: examples now sit under /usr/lib (previously /usr/share)
  • qt.conf: New key HostLibraryExecutables points to moc & friends that were moved from bin to libexec
  • Additional qmake6 alias to match the one in /usr/lib/qt6/bin (Debian even has a /usr/bin/qmake6)

Thanks!

@mvf mvf changed the title mkvtoolnix: update to 83.0 mkvtoolnix: update to 84.0 Apr 30, 2024
@mvf mvf force-pushed the pr/mkvtoolnix branch from edb2142 to 4b3f825 Compare June 3, 2024 19:01
@mvf mvf changed the title mkvtoolnix: update to 84.0 mkvtoolnix: update to 85.0 Jun 3, 2024
@mvf mvf force-pushed the pr/mkvtoolnix branch from 4b3f825 to 0997406 Compare June 22, 2024 05:10
@mvf mvf mentioned this pull request Jun 22, 2024
Closed
@classabbyamp
Copy link
Member

added a little docs

@mvf mvf force-pushed the pr/mkvtoolnix branch from 0b7eaa8 to e871a51 Compare June 24, 2024 07:25
@mvf
Copy link
Contributor Author

mvf commented Jun 24, 2024

Rebased, verified working with Qt 6.7.2.

@classabbyamp classabbyamp merged commit 34d6710 into void-linux:master Jul 2, 2024
@mvf mvf deleted the pr/mkvtoolnix branch July 2, 2024 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@classabbyamp classabbyamp classabbyamp left review comments

@Duncaen Duncaen Awaiting requested review from Duncaen

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

Successfully merging this pull request may close these issues.

qmake build-helper doesn't support qt6
3 participants
@mvf @classabbyamp @Duncaen