PR: 115791 Submitted by: Hung-Yi Chen <gaod@hychen.org> Approved by: Yann Berthier <yb@bashibuzuk.net> While here replace USE_XLIB with USE_XORG