Discussion:
[Audacity-devel] I see Darrell wants to make many changes in libnyquist and other lib-src
Paul Licameli
2017-03-18 19:42:56 UTC
Permalink
This pertains to merge request 161
https://github.com/audacity/audacity/pull/161

for cross-compilation.

Generally we don't want our lib-src to diverge much from their origins,
right?

But at least in the case of Nyquist Roger may take proposed changes
upstream.

What should be done with this merge request?

PRL
James Crook
2017-03-18 20:02:55 UTC
Permalink
Post by Paul Licameli
This pertains to merge request 161
https://github.com/audacity/audacity/pull/161
for cross-compilation.
Generally we don't want our lib-src to diverge much from their origins,
right?
But at least in the case of Nyquist Roger may take proposed changes
upstream.
What should be done with this merge request?
I think that needs to be decided by the release manager.

--James.
Darrell Walisser
2017-03-18 20:11:29 UTC
Permalink
The changes pertaining to Nyquist:

https://github.com/audacity/audacity/pull/161/commits/7f95a755ee5d94eafdc5a6d5d9f2515ddc61fbe7
https://github.com/audacity/audacity/pull/161/commits/6e5e175298b0aab548672faeb65991b015c002f7
https://github.com/audacity/audacity/pull/161/commits/bb2ebc41a19fa1830d13e35b38c9d694e30fb5fb
https://github.com/audacity/audacity/pull/161/commits/043c5be5f381cc782b0ccd668f298218349a754a
https://github.com/audacity/audacity/pull/161/commits/1cd08c5038137e5d801ac33cd05c9f4cc37c2e39
This pertains to merge request 161 https://github.com/
audacity/audacity/pull/161
for cross-compilation.
Generally we don't want our lib-src to diverge much from their origins,
right?
But at least in the case of Nyquist Roger may take proposed changes
upstream.
What should be done with this merge request?
PRL
------------------------------------------------------------
------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
audacity-devel mailing list
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Paul Licameli
2017-03-18 21:00:47 UTC
Permalink
I suggest a separate branch for those, and let Roger decide what to do.

PRL


On Sat, Mar 18, 2017 at 4:11 PM, Darrell Walisser <
Post by Darrell Walisser
https://github.com/audacity/audacity/pull/161/commits/
7f95a755ee5d94eafdc5a6d5d9f2515ddc61fbe7
https://github.com/audacity/audacity/pull/161/commits/
6e5e175298b0aab548672faeb65991b015c002f7
https://github.com/audacity/audacity/pull/161/commits/
bb2ebc41a19fa1830d13e35b38c9d694e30fb5fb
https://github.com/audacity/audacity/pull/161/commits/
043c5be5f381cc782b0ccd668f298218349a754a
https://github.com/audacity/audacity/pull/161/commits/
1cd08c5038137e5d801ac33cd05c9f4cc37c2e39
This pertains to merge request 161 https://github.com/audacit
y/audacity/pull/161
for cross-compilation.
Generally we don't want our lib-src to diverge much from their origins,
right?
But at least in the case of Nyquist Roger may take proposed changes
upstream.
What should be done with this merge request?
PRL
------------------------------------------------------------
------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
audacity-devel mailing list
https://lists.sourceforge.net/lists/listinfo/audacity-devel
------------------------------------------------------------
------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
audacity-devel mailing list
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Darrell Walisser
2017-03-19 21:21:39 UTC
Permalink
New PR for Nyquist only.

​https://github.com/audacity/audacity/pull/187
<https://github.com/audacity/audacity/pull/161>
Post by Paul Licameli
I suggest a separate branch for those, and let Roger decide what to do.
On Sat, Mar 18, 2017 at 4:11 PM, Darrell Walisser <
Post by Darrell Walisser
https://github.com/audacity/audacity/pull/161/commits/7f95a7
55ee5d94eafdc5a6d5d9f2515ddc61fbe7
https://github.com/audacity/audacity/pull/161/commits/6e5e17
5298b0aab548672faeb65991b015c002f7
https://github.com/audacity/audacity/pull/161/commits/bb2ebc
41a19fa1830d13e35b38c9d694e30fb5fb
https://github.com/audacity/audacity/pull/161/commits/043c5b
e5f381cc782b0ccd668f298218349a754a
https://github.com/audacity/audacity/pull/161/commits/1cd08c
5038137e5d801ac33cd05c9f4cc37c2e39
Post by Paul Licameli
This pertains to merge request 161
​​
https://github.com/audacity/audacity/pull/161
for cross-compilation.
Generally we don't want our lib-src to diverge much from their origins,
right?
But at least in the case of Nyquist Roger may take proposed changes
upstream.
What should be done with this merge request?
PRL
Darrell Walisser
2017-03-20 19:13:12 UTC
Permalink
I've checked the Nyquist upstream (https://sourceforge.net/projects/nyquist)
and it does not include the libnyquist wrapper where most of the changes
are.

Except for
https://github.com/audacity/audacity/pull/187/commits/da1aef01dcdce15cfb1642e59e9c3c1712aaf054,
there are no changes to Nyquist. And this patch is simply renaming files
and making a new file specific to mingw builds.

If I also include a patch file for this commit, following what's been done
with the other patch files in lib-src/ will that be sufficient to get this
merged?

Thanks,
Darrell

On Sun, Mar 19, 2017 at 5:21 PM, Darrell Walisser <
Post by Darrell Walisser
New PR for Nyquist only.
​https://github.com/audacity/audacity/pull/187
<https://github.com/audacity/audacity/pull/161>
Post by Paul Licameli
I suggest a separate branch for those, and let Roger decide what to do.
On Sat, Mar 18, 2017 at 4:11 PM, Darrell Walisser <
Post by Darrell Walisser
https://github.com/audacity/audacity/pull/161/commits/7f95a7
55ee5d94eafdc5a6d5d9f2515ddc61fbe7
https://github.com/audacity/audacity/pull/161/commits/6e5e17
5298b0aab548672faeb65991b015c002f7
https://github.com/audacity/audacity/pull/161/commits/bb2ebc
41a19fa1830d13e35b38c9d694e30fb5fb
https://github.com/audacity/audacity/pull/161/commits/043c5b
e5f381cc782b0ccd668f298218349a754a
https://github.com/audacity/audacity/pull/161/commits/1cd08c
5038137e5d801ac33cd05c9f4cc37c2e39
Post by Paul Licameli
This pertains to merge request 161
​​
https://github.com/audacity/audacity/pull/161
for cross-compilation.
Generally we don't want our lib-src to diverge much from their origins,
right?
But at least in the case of Nyquist Roger may take proposed changes
upstream.
What should be done with this merge request?
PRL
Darrell Walisser
2017-03-18 21:04:39 UTC
Permalink
I am spit-balling here, since I probably can't appreciate all the issues of
lib-src, but have we considered managing the libs as separate repositories?
We are already doing this for wxWidgets...and it seems like a good idea.
Mainly because it is not likely all patches will be accepted, and either
way you don't want that process to stall Audacity development.

What if for every external library ("thelib") that must be tracked
upstream, we do the following (as in wxWidgets fork)

- Setup audacity/thelib as a fork. If there is no github available to fork,
base from the appropriate release tarball, etc.
- Apply our patches into a new branch "audacity"
- Submit and track PR(s) via github. Otherwise post patches to mailing
lists, etc. Maybe track manually via wiki or bugzilla.
- In lib-src, nuke our copy of thelib and use git submodule feature to link
to the fork
- If it helps, add a shell script ("lib-src/bootstrap.sh") to refresh the
submodules and/or do any other management of the submodules
- Use tags or branches in the submodules to track which version shipped
with which releases of Audacity
Paul Licameli
2017-03-18 21:10:58 UTC
Permalink
These seem like good ideas, it would only generalize what we did with my
patches for wxWidgets.

I have heard of the submodules feature of git, but have no experience using
it. Basically, one git repository can point at another, and include its
files when populating its working tree. Is that right?

PRL


On Sat, Mar 18, 2017 at 5:04 PM, Darrell Walisser <
Post by Darrell Walisser
I am spit-balling here, since I probably can't appreciate all the issues
of lib-src, but have we considered managing the libs as separate
repositories? We are already doing this for wxWidgets...and it seems like a
good idea. Mainly because it is not likely all patches will be accepted,
and either way you don't want that process to stall Audacity development.
What if for every external library ("thelib") that must be tracked
upstream, we do the following (as in wxWidgets fork)
- Setup audacity/thelib as a fork. If there is no github available to
fork, base from the appropriate release tarball, etc.
- Apply our patches into a new branch "audacity"
- Submit and track PR(s) via github. Otherwise post patches to mailing
lists, etc. Maybe track manually via wiki or bugzilla.
- In lib-src, nuke our copy of thelib and use git submodule feature to
link to the fork
- If it helps, add a shell script ("lib-src/bootstrap.sh") to refresh the
submodules and/or do any other management of the submodules
- Use tags or branches in the submodules to track which version shipped
with which releases of Audacity
------------------------------------------------------------
------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
audacity-devel mailing list
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Darrell Walisser
2017-03-18 21:22:00 UTC
Permalink
Post by Paul Licameli
These seem like good ideas, it would only generalize what we did with my
patches for wxWidgets.
I have heard of the submodules feature of git, but have no experience
using it. Basically, one git repository can point at another, and include
its files when populating its working tree. Is that right?
​Yes, the repository stores a link/reference to another repository. They
are not included by default when cloning. However, can be setup so that
"git submodule init" will fetch each submodule (with the correct
branch/commit etc).
Loading...