jackaudio / jack-example-tools

Official examples and tools from the JACK project
GNU General Public License v2.0
37 stars 14 forks source link

Compare and merge jack2 example-clients and tools #9

Closed dvzrv closed 2 years ago

dvzrv commented 3 years ago

Some example-clients and tools in jack2 have diverted slightly from the ones in the dedicated repositories (and thus also from here) and new ones have been added.

The below list is a checklist of files that need to be consolidated. All files that have only seen non-functional changes (e.g. indentation, non code changes) are ignored:

A few more test executables are always built alongside jack2 (iodelay.c is actually from the tools repository) and should be merged into this repository as well.

dvzrv commented 3 years ago

With #10 we now have "feature parity", but not "behavioral parity" with jack2 (unless something has been forgotten).

The executables and libraries now need to be compared.

dvzrv commented 2 years ago

@falkTX FYI my process for comparing these things is roughly:

git clone git@github.com:jackaudio/jack2.git
git-filter-repo --path <path/to/file> --prune-empty always
git clone git@github.com:jackaudio/jack-example-tools.git
git checkout <feature_branch>
git remote add jack2 <dir_to_jack2_clone>
git fetch jack2

Then I look around for in which commit the file has been introduced in the jack2 repo and attempt a diff in the jack-example-tools repo:

git diff <checksum> <path_to_file>

If I found a matching commit (empty diff), then I was able to apply the commits from the jack2 repo via cherry-pick. If there was no matching commit, I nuked the original version and merged the file over from the jack2 remote.

dvzrv commented 2 years ago

All jack2 related changes have been applied and this ticket can be closed.