[cinelerra-gg/f31] (2 commits) ...Remaining fixes for rawhide / F31 builds