[raspberrypi-vc/f29] Refactor for RPM Fusion See RFBZ 5074