This repository has been archived by the owner on Dec 1, 2022. It is now read-only.
Merge Tenacity's build system #45
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🎉
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
force-pushed
the
tenacity-build-system
branch
from
e2db3d9
to
f74ff35
Compare
Latest Status
Overall Status: Broken but it can build somewhere...somewhat. |
Keep in mind, we define our version in CMake instead of a hardcoded header. |
|
Awesome work! After this is merged, I'll focus on creating the flatpak. |
generic-pers0n
force-pushed
the
tenacity-build-system
branch
from
03a5464
to
3659e3b
Compare
|
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. |
Differences Between Tenacity's Original Build System and This Build System
I might update this list as I come up with more differences |
Everything is working again. I'll be trying new commits soon. |
generic-pers0n
force-pushed
the
tenacity-build-system
branch
from
f0c12c0
to
b28065f
Compare
generic-pers0n
force-pushed
the
tenacity-build-system
branch
from
b28065f
to
7f99a51
Compare
generic-pers0n
force-pushed
the
tenacity-build-system
branch
from
7f99a51
to
8e7c2a4
Compare
|
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. |
generic-pers0n
force-pushed
the
tenacity-build-system
branch
2 times, most recently
from
ce04593
to
b34fb25
Compare
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]>
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: 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]>
Signed-off-by: Avery King <[email protected]>
generic-pers0n
force-pushed
the
tenacity-build-system
branch
from
b34fb25
to
8795433
Compare
|
I'm going to redo this PR with a somewhat different scope. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.