-
-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
obs-vst: Remove submodule in favour of direct merge #5951
Conversation
4475369
to
1f36f92
Compare
Is this okay with the Steinburg header dependency? |
obs-vst doesn't use any Steinberg headers. It uses headers from LMMS. |
Just as a heads-up when rebasing this against master: The cmake rewrite added a check for whether the submodule files exist which now can get inlined to just |
Per @gxalpha's comment I've made the relevant additional changes. Would love it if a second person could test this. I do fear users may potentially have to
|
Without removing the deletion of Other than that, seems to work for me so far. |
Sorry for being unclear, what I meant was just "replace each |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per discussion off-thread, this will need to be two commits: one which deletes the submodule, and a second one which merges the submodule into the tree.
e266e56
to
6ac3a9b
Compare
Please visit the submodule repo for blame history: https://github.com/obsproject/obs-vst NOTE: You may need to manually delete plugins/obs-vst to pull this diff.
Please visit the submodule repo for blame history: https://github.com/obsproject/obs-vst This also replaces the obs-vst .clang-format with obs-studio's. This commit depends on the previous commit, which removes the submodule separately as Git complains otherwise. Co-authored-by: Alex Anderson <anderson.john.alexander@gmail.com> Co-authored-by: Anton <camotank12345@gmail.com> Co-authored-by: Blue Cat Audio <support@bluecataudio.com> Co-authored-by: Cephas Reis <c3r1c3@nevermindonline.com> Co-authored-by: Colin Edwards <colin@recursivepenguin.com> Co-authored-by: Florian Zwoch <fzwoch@gmail.com> Co-authored-by: Fogmoon <i@fogmoon.com> Co-authored-by: Gol-D-Ace <Gol-D-Ace@users.noreply.github.com> Co-authored-by: Igor Bochkariov <ujifgc@gmail.com> Co-authored-by: Jesse Chappell <jesse@sonosaurus.com> Co-authored-by: Keen <523059842@qq.com> Co-authored-by: Kurt Kartaltepe <kkartaltepe@gmail.com> Co-authored-by: Matt Gajownik <matt@obsproject.com> Co-authored-by: Matt Gajownik <matt@wizardcm.com> Co-authored-by: Richard Stanway <notr1ch@users.noreply.github.com> Co-authored-by: Ryan Foster <RytoEX@gmail.com> Co-authored-by: follower <github@rancidbacon.com> Co-authored-by: gxalpha <beckmann.sebastian@outlook.de> Co-authored-by: jp9000 <obs.jim@gmail.com> Co-authored-by: jpark37 <jpark37@users.noreply.github.com> Co-authored-by: mntone <sd8@live.jp> Co-authored-by: tytan652 <tytan652@tytanium.xyz> Co-authored-by: wangshaohui <97082645@qq.com> Co-authored-by: wangshaohui <wang.shaohui@navercorp.com>
Description
This deletes the submodule of
plugins/obs-vst
in favour of being included in the main repo.IMPORTANT: Developers will have to delete the
obs-vst
folder manually before pulling these commits, otherwise Git will error.This also removes its custom
.clang-format
file in favour of using the main repo's, alongside the README and License file.Motivation and Context
obs-vst is first party, and including it as a submodule introduces a lot of unnecessary headaches.
How Has This Been Tested?
Types of changes
Checklist: