ref #1931 fixes #1979 (cherry picked from commit dfac4cbe) (cherry picked from commit 0ec2f93c) Conflicts: main/libxvmc/APKBUILD