diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | tools/Linux/FEH-ARM.py.in (renamed from tools/Linux/FEH-ARM.py) | 8 | ||||
| -rw-r--r-- | tools/Linux/FEH.py.in (renamed from tools/Linux/FEH.py) | 13 |
3 files changed, 14 insertions, 11 deletions
diff --git a/configure.in b/configure.in index a0ae4c6b00..b652569b2e 100644 --- a/configure.in +++ b/configure.in @@ -2139,6 +2139,7 @@ else fi if test "$use_x11" = "yes"; then + USE_X11=1 final_message="$final_message\n X11:\t\tYes" else final_message="$final_message\n X11:\t\tNo" @@ -2474,6 +2475,8 @@ OUTPUT_FILES="Makefile \ xbmc/visualizations/EGLHelpers/Makefile \ tools/Linux/xbmc.sh \ tools/Linux/xbmc-standalone.sh \ + tools/Linux/FEH.py \ + tools/Linux/FEH-ARM.py \ tools/TexturePacker/Makefile \ tools/EventClients/Clients/OSXRemote/Makefile \ xbmc/peripherals/bus/Makefile \ @@ -2587,6 +2590,7 @@ AC_SUBST(USE_PVR_ADDONS) AC_SUBST(UPNP_DEFINES) AC_SUBST(USE_SSE4) AC_SUBST(USE_MMAL) +AC_SUBST(USE_X11) # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions diff --git a/tools/Linux/FEH-ARM.py b/tools/Linux/FEH-ARM.py.in index 1fc4e7240a..e92dea68f9 100644 --- a/tools/Linux/FEH-ARM.py +++ b/tools/Linux/FEH-ARM.py.in @@ -166,8 +166,8 @@ if __name__=="__main__": if "--no-test" in sys.argv: exit(0) - if (badDirectRendering()): - error("XBMC needs hardware accelerated OpenGL rendering.\nInstall an appropriate graphics driver.\n\nPlease consult XBMC Wiki for supported hardware\nhttp://xbmc.org/wiki/?title=Supported_hardware") + if (@USE_X11@ == 1 and @USE_OPENGL@ == 1 and badDirectRendering()): + error("@APP_NAME@ needs hardware accelerated OpenGL rendering.\nInstall an appropriate graphics driver.\n\nPlease consult @APP_NAME@ Wiki for supported hardware\nhttp://xbmc.org/wiki/?title=Supported_hardware") - if (badColorDepth()): - error("XBMC cannot run unless the\nscreen color depth is atleast 24 bit.\n\nPlease reconfigure your screen.") + if (@USE_X11@ == 1 and badColorDepth()): + error("@APP_NAME@ cannot run unless the\nscreen color depth is atleast 24 bit.\n\nPlease reconfigure your screen.") diff --git a/tools/Linux/FEH.py b/tools/Linux/FEH.py.in index cd2e09d841..a65a706906 100644 --- a/tools/Linux/FEH.py +++ b/tools/Linux/FEH.py.in @@ -45,7 +45,7 @@ def createQt(errorLine): , app , SLOT('quit()') ) - + dialog = QDialog(None, "Error", 0, 0) dialog.setCaption(dialog.tr("Error")) layout=QVBoxLayout(dialog) @@ -117,7 +117,7 @@ def createSDL(errorLine): text = font.render(line, 1, (255,255,255) ) place[1] += font.size(line)[1] screen.blit(text, text.get_rect().move(place)) - + quitline = "Press any button to continue (" quitline += str(autoQuit - delta.seconds) @@ -140,7 +140,6 @@ def badDirectRendering(): def badColorDepth(): out = os.popen('xdpyinfo | grep "depth of root"', 'r') - p = re.compile("([0-9]*) planes") for line in out.readlines(): match = p.search(line) @@ -169,8 +168,8 @@ if __name__=="__main__": if "--no-test" in sys.argv: exit(0) - if (badDirectRendering()): - error("XBMC needs hardware accelerated OpenGL rendering.\nInstall an appropriate graphics driver.\n\nPlease consult XBMC Wiki for supported hardware\nhttp://wiki.xbmc.org/?title=Supported_hardware") + if (@USE_X11@ == 1 and @USE_OPENGL@ == 1 and badDirectRendering()): + error("@APP_NAME@ needs hardware accelerated OpenGL rendering.\nInstall an appropriate graphics driver.\n\nPlease consult @APP_NAME@ Wiki for supported hardware\nhttp://wiki.xbmc.org/?title=Supported_hardware") - if (badColorDepth()): - error("XBMC cannot run unless the\nscreen color depth is atleast 24 bit.\n\nPlease reconfigure your screen.") + if (@USE_X11@ == 1 and badColorDepth()): + error("@APP_NAME@ cannot run unless the\nscreen color depth is atleast 24 bit.\n\nPlease reconfigure your screen.") |