jackaudio/jack-example-tools

Compare and merge jack2 example-clients and tools

dvzrv opened this issue · 3 comments

dvzrv commented

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:

  • example-clients/capture_client.c <--> jack2/example-clients/capture_client.c #12
  • example-clients/impulse_grabber.c <--> jack2/example-clients/impulse_grabber.c #13
  • example-clients/inprocess.c <--> jack2/example-clients/inprocess.c #36
  • example-clients/latent_client.c <--> jack2/example-clients/latent_client.c #14
  • example-clients/metro.c <--> jack2/example-clients/metro.c #15
  • example-clients/midiseq.c <--> jack2/example-clients/midiseq.c #16
  • example-clients/midisine.c <--> jack2/example-clients/midisine.c #17
  • example-clients/showtime.c <--> jack2/example-clients/showtime.c #18
  • example-clients/simple_client.c <--> jack2/example-clients/simple_client.c #19
  • tools/alsa_in.c <--> jack2/tools/alsa_in.c #20
  • tools/alsa_out.c <--> jack2/tools/alsa_out.c #21
  • tools/connect.c <--> jack2/tools/connect.c #22
  • tools/evmon.c <--> jack2/tools/evmon.c #23
  • tools/freewheel.c <--> jack2/tools/freewheel.c #24
  • tools/iodelay.c <--> jack2/tests/iodelay.cpp #25
  • tools/ipload.c <--> jack2/tools/ipload.c #26
  • tools/ipunload.c <--> jack2/tools/ipunload.c #27
  • tools/midi_dump.c <--> jack2/tools/midi_dump.c #28
  • tools/monitor_client.c <--> jack2/tools/monitor_client.c #29
  • tools/netsource.c <--> jack2/tools/netsource.c #37
  • tools/property.c <--> jack2/tools/property.c #30
  • tools/samplerate.c <--> jack2/tools/samplerate.c #31
  • tools/session_notify.c <--> jack2/tools/session_notify.c #32
  • tools/transport.c <--> jack2/tools/transport.c #33
  • tools/tw.c <--> jack2/tools/tw.c #34
  • tools/wait.c <--> jack2/tools/wait.c #35

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

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

@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.

  • 👍1
dvzrv commented

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