chromium: improve start script

This commit is contained in:
Sascha Kuehndel (InuSasha) 2017-12-14 16:48:20 +01:00
parent de77a797a4
commit 9d2b6be4e0
No known key found for this signature in database
GPG Key ID: 15FED89617B88D1B

View File

@ -16,25 +16,29 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>. # along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
. /etc/profile
oe_setup_addon browser.chromium
if [ -e $ADDON_HOME/env ]
then
. $ADDON_HOME/env
fi
# drop profile for testing only # drop profile for testing only
#rm -rf /storage/.kodi/userdata/addon_data/browser.chromium/profile #rm -rf /storage/.kodi/userdata/addon_data/browser.chromium/profile
. /etc/profile
oe_setup_addon browser.chromium
# fix file permissons (zip packaging) # fix file permissons (zip packaging)
chmod +x /storage/.kodi/addons/browser.chromium/bin/chromium /storage/.kodi/addons/browser.chromium/bin/chromium.bin chmod +x $ADDON_DIR/bin/chromium $ADDON_DIR/bin/chromium.bin
chmod 4755 /storage/.kodi/addons/browser.chromium/bin/chrome-sandbox chmod 4755 $ADDON_DIR/bin/chrome-sandbox
# make sure we use "own" gtk/pango/nss/etc # make sure we use "own" gtk/pango/nss/etc
export LD_LIBRARY_PATH=/storage/.kodi/addons/browser.chromium/lib export LD_LIBRARY_PATH=$ADDON_DIR/lib
# configure pango/pixbuf # configure pango/pixbuf
export PANGO_RC_FILE=/storage/.kodi/addons/browser.chromium/config/pangorc export PANGO_RC_FILE=$ADDON_DIR/config/pangorc
export GDK_PIXBUF_MODULE_FILE=/storage/.kodi/addons/browser.chromium/config/pixbuf.loaders.cache export GDK_PIXBUF_MODULE_FILE=$ADDON_DIR/config/pixbuf.loaders.cache
# font rendering in gtk widgets is brokeen with nvidia blob. use our Xdefaults # font rendering in gtk widgets is brokeen with nvidia blob. use our Xdefaults
export XENVIRONMENT=/storage/.kodi/addons/browser.chromium/config/Xdefaults export XENVIRONMENT=$ADDON_DIR/config/Xdefaults
# start unclutter # start unclutter
if [ "$HIDE_CURSOR" == "true" ] if [ "$HIDE_CURSOR" == "true" ]
@ -44,29 +48,26 @@ then
fi fi
# vaapi # vaapi
LIBVA_DRIVERS_PATH="/usr/lib/dri:$ADDON_DIR/lib"
LIBVA_DRIVER_NAME=''
case $VAAPI_MODE in case $VAAPI_MODE in
'intel') 'intel')
LIBVA_DRIVERS_PATH='/usr/lib/va'
LIBVA_DRIVER_NAME='i965' LIBVA_DRIVER_NAME='i965'
CHROMIUM_OPTS="$CHROMIUM_OPTS --enable-accelerated-video" CHROMIUM_OPTS="$CHROMIUM_OPTS --enable-accelerated-video"
export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH
;; ;;
'amd') 'amd')
LIBVA_DRIVERS_PATH='/storage/.kodi/addons/browser.chromium/lib'
LIBVA_DRIVER_NAME='vdpau' LIBVA_DRIVER_NAME='vdpau'
CHROMIUM_OPTS="$CHROMIUM_OPTS --enable-accelerated-video" CHROMIUM_OPTS="$CHROMIUM_OPTS --enable-accelerated-video"
export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH
;; ;;
'nvidia') 'nvidia')
LIBVA_DRIVERS_PATH='/storage/.kodi/addons/browser.chromium/lib'
LIBVA_DRIVER_NAME='vdpau' LIBVA_DRIVER_NAME='vdpau'
CHROMIUM_OPTS="$CHROMIUM_OPTS --enable-accelerated-video --allow-no-sandbox-job --disable-gpu-sandbox" CHROMIUM_OPTS="$CHROMIUM_OPTS --enable-accelerated-video --allow-no-sandbox-job --disable-gpu-sandbox"
export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH
;; ;;
*) *)
LIBGL_ALWAYS_SOFTWARE='1' LIBGL_ALWAYS_SOFTWARE='1'
export LIBGL_ALWAYS_SOFTWARE export LIBGL_ALWAYS_SOFTWARE
esac esac
export LIBVA_DRIVER_NAME LIBVA_DRIVERS_PATH
# windowed # windowed
case $WINDOW_MODE in case $WINDOW_MODE in
@ -81,8 +82,8 @@ case $RASTER_MODE in
esac esac
# flash # flash
if [ -e /storage/.kodi/addons/browser.chromium/PepperFlash/libpepflashplayer.so ]; then if [ -e $ADDON_DIR/PepperFlash/libpepflashplayer.so ]; then
CHROMIUM_OPTS="$CHROMIUM_OPTS --ppapi-flash-path=/storage/.kodi/addons/browser.chromium/PepperFlash/libpepflashplayer.so" CHROMIUM_OPTS="$CHROMIUM_OPTS --ppapi-flash-path=$ADDON_DIR/PepperFlash/libpepflashplayer.so"
fi fi
# alsa # alsa
@ -91,10 +92,11 @@ if [ ! -z $ALSA_DEVICE ]; then
fi fi
# start chromium # start chromium
LD_PRELOAD=/usr/lib/libGL.so /storage/.kodi/addons/browser.chromium/bin/chromium.bin \ LD_PRELOAD=/usr/lib/libGL.so $ADDON_DIR/bin/chromium.bin \
$CHROMIUM_OPTS \ $CHROMIUM_OPTS \
--user-data-dir=/storage/.kodi/userdata/addon_data/browser.chromium/profile \ --user-data-dir=$ADDON_HOME/profile \
--test-type $@ --test-type $@ \
2>&1 | tee $ADDON_LOG_FILE
# kill unclutter # kill unclutter
if [ "$HIDE_CURSOR" == "true" ] if [ "$HIDE_CURSOR" == "true" ]