fix Mesa build
Merge branch 'master' of github.com:jafl/jx_application_framework