[deadbeef/f28] Update patches to use upstream code.