8 bit color still doesn't work, but the -depth command line argument now works properly. (cherry picked from commit 6765949c27)
6765949c27
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point (cherry picked from commit 48e6a75fbd)
48e6a75fbd