About 5775: there's a patch system from Stefano, and I think you can just copy the patches inside a patch folder and the CMake project will do the rest