Waldemar Brodkorb f14c1fc551 resolve merge conflict 12 lat temu
..
patches c9613d2548 update to latest upstream, fix Darwin cross-compile 12 lat temu
Makefile f14c1fc551 resolve merge conflict 12 lat temu