add a few patches and switch to default config, still build broken

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>