Getting javacv running on fedora
getting this running on fedora
fixed merge conflict