Ok, never mind.
I search the svn log and adapted the changes to the linux branch. It worked!
Attached is the patch I used. It would be good if someone with svn access could commit it.
The video issue I talked about is still present. When I run the game I get in the console the message "Mídia não encontrada" (that means "media not found" in Portuguese). Since the message is in Portuguese I assume it is a SDL error because CTP2 doesn't have Portuguese translations. Anyone got a clue?