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.

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

Merged
merged 2 commits into from
Jul 27, 2022

Conversation

WizardCM
Copy link
Member

@WizardCM WizardCM commented Feb 13, 2022

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?

  • Build OBS

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@WizardCM WizardCM added Code Cleanup Non-breaking change which makes code smaller or more readable Seeking Testers Build artifacts on CI labels Feb 13, 2022
@Conan-Kudo
Copy link
Contributor

Is this okay with the Steinburg header dependency?

@dodgepong
Copy link
Member

obs-vst doesn't use any Steinberg headers. It uses headers from LMMS.

@gxalpha
Copy link
Member

gxalpha commented Mar 18, 2022

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 add_subdirectory(obs-vst) with this PR.

@WizardCM
Copy link
Member Author

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

  • delete .git/modules/plugins/obs-vst
  • run git config --remove-section submodule.plugins/obs-vst

@Chiitoo
Copy link
Contributor

Chiitoo commented Mar 19, 2022

Without removing the deletion of plugins/obs-vst from the patch I'm getting File plugins/obs-vst is not a regular file -- refusing to patch (with and without cloning the obs-vst repository).

Other than that, seems to work for me so far.

@gxalpha
Copy link
Member

gxalpha commented Mar 19, 2022

Sorry for being unclear, what I meant was just "replace each check_obs_vst() call with add_subdirectory(obs-vst)". To me at least it looks like obs-vst is disabled on purpose on FreeBSD/OpenBSD, so the differentiation between the operating systems is probably still needed.

Copy link
Member

@RytoEX RytoEX left a 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.

@RytoEX RytoEX marked this pull request as draft May 22, 2022 06:40
@WizardCM WizardCM force-pushed the obs-vst-merge branch 3 times, most recently from e266e56 to 6ac3a9b Compare May 22, 2022 07:16
plugins/CMakeLists.txt Show resolved Hide resolved
plugins/CMakeLists.txt Outdated Show resolved Hide resolved
@WizardCM WizardCM marked this pull request as ready for review July 23, 2022 02:18
WizardCM and others added 2 commits July 26, 2022 20:10
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>
@RytoEX RytoEX added this to the OBS Studio 28.0 milestone Jul 27, 2022
@RytoEX RytoEX merged commit a7c3d94 into obsproject:master Jul 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Cleanup Non-breaking change which makes code smaller or more readable Seeking Testers Build artifacts on CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants