id3lib: Consolidate patches. Fix compiling with clang.

Fix compiling for id3lib on Clang.