id3lib: Consolidate patches. Fix compiling with clang.

Closes #23446.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>