Merge Tenacity's build system #45

generic-pers0n · 2022-08-08T23:42:57Z

References #43.

Drafted for now because more commits need to be cherry picked. Right now, this isn't really Tenacity's build system, but we do take some commits from Tenacity regarding build system modifications.

I made sure the code compiles on my machine
I made sure there are no unnecessary changes in the code
I made sure the title of the PR reflects the core meaning of the issue you are solving
I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"

generic-pers0n · 2022-08-20T20:24:52Z

🎉

After merging this pull request, we can continue with porting Saucedacity to Qt. This has been a long time in the making.

But let's not get too excited yet. I still need to do testing on Windows.

Edit: Just to clarify, #50 should be merged first before this gets merged.

generic-pers0n · 2022-08-22T02:25:35Z

Latest Status

Saucedacity builds on Pop!_OS 22.04 against system libraries (including CodeLite's wxWidgets, which is wxWidgets 3.2.0). However, Saucedacity reports a version of "0.0.0".
- Using vcpkg does not work.
- Using ccache does not work. This is apparently because some wxWidgets classes are not properly defined.

Overall Status: Broken but it can build somewhere...somewhat.

n0toose · 2022-08-22T05:09:55Z

However, Saucedacity reports a version of "0.0.0".

Keep in mind, we define our version in CMake instead of a hardcoded header.

TheEvilSkeleton · 2022-08-24T02:29:23Z

Awesome work! After this is merged, I'll focus on creating the flatpak.

generic-pers0n · 2022-08-27T04:00:57Z

Ah yes. I broke things after a rebase...

The point of the rebase: to test out cherry-picking a Tenacity commit refactoring the AboutDialog (and also creating BuildInfo.h). If that didn't work, then...benefit of the doubt I guess.

What's up: FFmpegFunctions.h is not found. I'll have to investigate this issue.

generic-pers0n · 2022-08-27T04:07:09Z

Differences Between Tenacity's Original Build System and This Build System

We will carry on our own libraries (e.g. lib-basic-ui) and they will be updated for this new build system.
wxWidgets 3.0 will not be supported. This is more than a build system change, but this should be documented here because nothing will change in this regard after this PR is merged.

I might update this list as I come up with more differences

generic-pers0n · 2022-08-27T21:06:18Z

Ah yes. I broke things after a rebase...

The point of the rebase: to test out cherry-picking a Tenacity commit refactoring the AboutDialog (and also creating BuildInfo.h). If that didn't work, then...benefit of the doubt I guess.

What's up: FFmpegFunctions.h is not found. I'll have to investigate this issue.

Everything is working again. I'll be trying new commits soon.

generic-pers0n · 2022-09-04T04:32:06Z

Did an interactive rebase that removed a few commits. Hopefully this PR looks nicer now.

Unfortunately, things are currently broken again. I'll need to investigate this a little later.

It is unconventional and unnecessary to prefix CMake options. Also this is not Audacity anymore. :) =============================================================================== Cherry-picked from Tenacity commit 49015e77d0cf39430d180b88f29a68e036235e81. The changes of this commit mean that options are no longer prefixed with "saucedacity_". Additionally, this commit goes a step further and removes the entire ${_OPT} variable in our build system. Commands used: find . -name "*.txt" -exec sed -i "s/\${_OPT}//g" {} + find . -name "*.cmake" -exec sed -i "s/\${_OPT}//g" {} + Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

Removes PortMixer code since PortMixer isn't supported by PortAudio =============================================================================== Cherry picked from Tenacity commit 12c0cba3c45505f2470bbc5cf1f4cc02e3f3a02c. Modified in order to apply to Saucedacity. Signed-off-by: Avery King <[email protected]> Co-authored-by: akleja <[email protected]>

The mixer toolbar is redundant when PortMixer isn't supported Cherry picked from Tenacity commit 056de91cf79179f53f56be2f809709137d65e2a5. Signed-off-by: Avery King <[email protected]> Signed-off-by: akleja <[email protected]>

Removes Experimental automated input level adjustment. It uses PortMixer (hardware level adjustments) to try to adjust the input level, which is a flawed concept. It also relies on PortMixer which is no longer supported. =============================================================================== Cherry-picked from Tenacity commit 35d059c965b9a65091c43195f1d36d16587bbb80. Signed-off-by: Avery King <[email protected]> Signed-off-by: akleja <[email protected]>

This is a pointless source of non-reproducibility and also causes compiler caches to miss 100% of the time after midnight. Signed-off-by: Be <[email protected]>

This does not build without the vendored fork of PortAudio. Signed-off-by: Be <[email protected]>

Also, necessarily coupled with this: * add CMakeLists.txt for vendored libnyquist * fix SoundTouch header include paths * move nyq_reformat_aud_do_response function * handle portSMF headers installed to portsmf or portSMF =========================================================== Cherry picked from Tenacity commit b1549dd. This commit has been modified to apply to Saucedacity in the following ways: * Soxr::soxr and EXPAT::EXPAT not needed for target "Saucedacity" but they are needed for lib-math and lib-xml, respectively. * Our libraries have been updated appropriately. * libnyquist's new CMakeLists.txt was slightly modified to remove a dependency for wxWidgets. libnyquist appears to be written in C and therefore does not depend on wxWidgets (it can't, really). Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

Cherry picked from Tenacity commit ea48aa3. Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

Cherry picked from Tenacity commit 74ccbb8. All submodules have been removed in Saucedacity. Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

@qeaa

This fixes a link error with MSVC and sccache: wxbase31u.lib(wxbase315u_vc_custom.dll) : error LNK2005: "public: __cdecl wxEventFilter::wxEventFilter(void)" (??0wxEventFilter@@qeaa@XZ) already defined in ToolManager.cpp.obj wxbase31u.lib(wxbase315u_vc_custom.dll) : error LNK2005: "public: virtual __cdecl wxEventFilter::~wxEventFilter(void)" (??1wxEventFilter@@UEAA@XZ) already defined in ToolManager.cpp.obj Signed-off-by: Be <[email protected]>

This should fix an issue with libwinpthread not being found on Windows. Reference-to: https://github.com/tenacityteam/tenacity/issues/727 Signed-off-by: Avery King <[email protected]>

Cherry-picked from Tenacity commit af90fee. Changes have been made to refer to Saucedacity and its repos. Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

Remove linking option containing erroneous reference to `z.lib`. Add `set` commands to provide documented `id3tag::id3tag` vars. Signed-off-by: Emily Mabrey <[email protected]> Signed-off-by: Be <[email protected]> Co-authored-by: Emily Mabrey <[email protected]> Co-authored-by: Be <[email protected]>

Signed-off-by: Be <[email protected]>

Signed-off-by: Avery King <[email protected]>

* Don't use wx-config to set the version. * Use getStretchedTime instead of getInverseStretchedTime in EffectSBSMS. Signed-off-by: Avery King <[email protected]>

Signed-off-by: Avery King <[email protected]>

generic-pers0n · 2022-09-25T04:45:15Z

I'm going to redo this PR with a somewhat different scope.

generic-pers0n added the enhancement New feature or request label Aug 8, 2022

generic-pers0n self-assigned this Aug 8, 2022

generic-pers0n mentioned this pull request Aug 11, 2022

Make Our Own Library Separation Effort #46

Open

generic-pers0n marked this pull request as ready for review August 11, 2022 15:32

generic-pers0n mentioned this pull request Aug 17, 2022

Distribution and packaging of Saucedacity on other platforms #21

Open

generic-pers0n force-pushed the tenacity-build-system branch from e2db3d9 to f74ff35 Compare August 21, 2022 15:25

generic-pers0n marked this pull request as draft August 21, 2022 15:26

generic-pers0n force-pushed the tenacity-build-system branch from 03a5464 to 3659e3b Compare August 27, 2022 03:36

generic-pers0n force-pushed the tenacity-build-system branch from f0c12c0 to b28065f Compare August 30, 2022 04:40

generic-pers0n added this to the Saucedacity/Tenacity 1.3 Release milestone Sep 2, 2022

generic-pers0n force-pushed the tenacity-build-system branch from b28065f to 7f99a51 Compare September 2, 2022 17:01

generic-pers0n mentioned this pull request Sep 3, 2022

Improved clips #55

Merged

4 tasks

generic-pers0n force-pushed the tenacity-build-system branch from 7f99a51 to 8e7c2a4 Compare September 4, 2022 04:31

generic-pers0n force-pushed the tenacity-build-system branch 2 times, most recently from ce04593 to b34fb25 Compare September 5, 2022 03:03

Be-ing and others added 7 commits September 11, 2022 12:43

Remove MixerToolbar

c5fb827

The mixer toolbar is redundant when PortMixer isn't supported Cherry picked from Tenacity commit 056de91cf79179f53f56be2f809709137d65e2a5. Signed-off-by: Avery King <[email protected]> Signed-off-by: akleja <[email protected]>

CMake: remove timestamp from binaries

e543997

This is a pointless source of non-reproducibility and also causes compiler caches to miss 100% of the time after midnight. Signed-off-by: Be <[email protected]>

Disable EXPERIMENTAL_MIDI_OUT

96ba2ad

This does not build without the vendored fork of PortAudio. Signed-off-by: Be <[email protected]>

Be-ing and others added 12 commits September 11, 2022 12:44

Remove cmake-proxies hacks for building vendored libraries

91cd148

Cherry picked from Tenacity commit ea48aa3. Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

Devendor all dependencies except libnyquist

0ba52a1

Cherry picked from Tenacity commit 74ccbb8. All submodules have been removed in Saucedacity. Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

Update vcpkg submodule

90f3149

This should fix an issue with libwinpthread not being found on Windows. Reference-to: https://github.com/tenacityteam/tenacity/issues/727 Signed-off-by: Avery King <[email protected]>

Rewrite BUILDING.md for revamped dependency management with vcpkg

5b0e802

Cherry-picked from Tenacity commit af90fee. Changes have been made to refer to Saucedacity and its repos. Signed-off-by: Avery King <[email protected]> Co-authored-by: Be <[email protected]>

CMake: use sccache for compiler caching if ccache not available

26ffe0a

Signed-off-by: Be <[email protected]>

CMake: use /Z7 instead of /Zi with MSVC to get sccache to work

c6a5a96

Signed-off-by: Be <[email protected]>

Remove FindwxWidgets.cmake

3c9e462

Signed-off-by: Avery King <[email protected]>

Build fixes

5b58bbc

* Don't use wx-config to set the version. * Use getStretchedTime instead of getInverseStretchedTime in EffectSBSMS. Signed-off-by: Avery King <[email protected]>

Remove leftover submodules

d3f51c5

Signed-off-by: Avery King <[email protected]>

Add ninja to Windows packages

8795433

Signed-off-by: Avery King <[email protected]>

generic-pers0n force-pushed the tenacity-build-system branch from b34fb25 to 8795433 Compare September 11, 2022 19:49

generic-pers0n closed this Sep 25, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Tenacity's build system #45

Merge Tenacity's build system #45

generic-pers0n commented Aug 8, 2022 •

edited

Loading

generic-pers0n commented Aug 20, 2022 •

edited

Loading

generic-pers0n commented Aug 22, 2022 •

edited

Loading

n0toose commented Aug 22, 2022

TheEvilSkeleton commented Aug 24, 2022

generic-pers0n commented Aug 27, 2022 •

edited

Loading

generic-pers0n commented Aug 27, 2022

generic-pers0n commented Aug 27, 2022

generic-pers0n commented Sep 4, 2022

generic-pers0n commented Sep 25, 2022

Merge Tenacity's build system #45

Merge Tenacity's build system #45

Conversation

generic-pers0n commented Aug 8, 2022 • edited Loading

generic-pers0n commented Aug 20, 2022 • edited Loading

generic-pers0n commented Aug 22, 2022 • edited Loading

Latest Status

n0toose commented Aug 22, 2022

TheEvilSkeleton commented Aug 24, 2022

generic-pers0n commented Aug 27, 2022 • edited Loading

generic-pers0n commented Aug 27, 2022

Differences Between Tenacity's Original Build System and This Build System

generic-pers0n commented Aug 27, 2022

generic-pers0n commented Sep 4, 2022

generic-pers0n commented Sep 25, 2022

generic-pers0n commented Aug 8, 2022 •

edited

Loading

generic-pers0n commented Aug 20, 2022 •

edited

Loading

generic-pers0n commented Aug 22, 2022 •

edited

Loading

generic-pers0n commented Aug 27, 2022 •

edited

Loading