diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build index 3daf9b6b83..e3e60cf603 100755 --- a/packages/mediacenter/xbmc-pvr/build +++ b/packages/mediacenter/xbmc-pvr/build @@ -100,7 +100,7 @@ cd - $XBMC_CRYSTALHD \ --disable-profiling \ --disable-joystick \ - --enable-xrandr \ + --disable-xrandr \ --disable-ccache \ --disable-pulse \ --enable-faac \ @@ -121,7 +121,6 @@ cd - make externals make xbmc.bin -make xbmc-xrandr # make -C tools/TexturePacker \ # CC=$HOST_CC \ diff --git a/packages/mediacenter/xbmc-pvr/init.d/67_xbmc b/packages/mediacenter/xbmc-pvr/init.d/67_xbmc index 52b7ead236..c8b482d7fc 100755 --- a/packages/mediacenter/xbmc-pvr/init.d/67_xbmc +++ b/packages/mediacenter/xbmc-pvr/init.d/67_xbmc @@ -1,26 +1,26 @@ -# configure X.Org video settings +# starting Mediacenter # # runlevels: openelec args="--standalone -fs --lircdev $LIRC_OUTPUT" -if test "$XBMC_CACHING" = "yes" ; then - wait_for_xbmc_cache - XBMC_BIN="/var/cache/bin/xbmc.bin" -else - XBMC_BIN="/usr/share/xbmc/xbmc.bin" -fi - progress "starting Mediacenter" -while true; do + if test "$XBMC_CACHING" = "yes" ; then + wait_for_xbmc_cache + XBMC_BIN="/var/cache/bin/xbmc.bin" + else + XBMC_BIN="/usr/share/xbmc/xbmc.bin" + fi - DISPLAY=:0.0 $XBMC_BIN ${args} > /dev/null 2>&1 - RET=$? - echo "Exited with code $RET" + while true; do - [ "$RET" == 0 ] && break - [ "$RET" == 64 ] && sync && poweroff - [ "$RET" == 66 ] && sync && reboot + DISPLAY=:0.0 $XBMC_BIN ${args} > /dev/null 2>&1 + RET=$? + echo "Exited with code $RET" -done + [ "$RET" == 0 ] && break + [ "$RET" == 64 ] && sync && poweroff + [ "$RET" == 66 ] && sync && reboot + + done diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install index e0adb5bcbb..fb3f197b3f 100755 --- a/packages/mediacenter/xbmc-pvr/install +++ b/packages/mediacenter/xbmc-pvr/install @@ -64,7 +64,6 @@ $SCRIPTS/install samba PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/share/xbmc - cp -PR $PKG_BUILD/xbmc-xrandr $INSTALL/usr/share/xbmc cp -PR $PKG_BUILD/xbmc.bin $INSTALL/usr/share/xbmc mkdir -p $INSTALL/usr/share/xbmc/language @@ -77,15 +76,11 @@ mkdir -p $INSTALL/usr/share/xbmc/media/Fonts mkdir -p $INSTALL/usr/share/xbmc/media cp -PR $PKG_BUILD/media/weather.zip $INSTALL/usr/share/xbmc/media/ cp -PR $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/ - cp -PR $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/ mkdir -p $INSTALL/usr/share/xbmc/scripts cp -PR $PKG_BUILD/scripts/*.zip $INSTALL/usr/share/xbmc/scripts/ mkdir -p $INSTALL/usr/share/xbmc/skin -# cp -PR $PKG_BUILD/skin/* $INSTALL/usr/share/xbmc/skin -# find $INSTALL/usr/share/xbmc/skin -name *.bat -exec rm -rf {} ";" -# find $INSTALL/usr/share/xbmc/skin -name Makefile -exec rm -rf {} ";" mkdir -p $INSTALL/usr/share/xbmc/sounds cp -PR $PKG_BUILD/sounds/* $INSTALL/usr/share/xbmc/sounds diff --git a/packages/mediacenter/xbmc-pvr/splash/Splash.png b/packages/mediacenter/xbmc-pvr/splash/Splash.png deleted file mode 100644 index 8c86ae06a7..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/Splash.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-pvr/splash/Splash_00.png b/packages/mediacenter/xbmc-pvr/splash/Splash_00.png deleted file mode 100644 index b9ae922ca8..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/Splash_00.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-pvr/splash/Splash_01.png b/packages/mediacenter/xbmc-pvr/splash/Splash_01.png deleted file mode 100644 index 15fc56ccaa..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/Splash_01.png and /dev/null differ diff --git a/packages/mediacenter/xbmc-pvr/splash/Splash_new-001.png b/packages/mediacenter/xbmc-pvr/splash/Splash_new-001.png deleted file mode 100644 index cb6248d3c6..0000000000 Binary files a/packages/mediacenter/xbmc-pvr/splash/Splash_new-001.png and /dev/null differ