Merge all work required to compile with the Video on Mac OS X and on Linux without DBus and SHM support.