commit bc4d0afe17d5b68db45dba809c8e2cf7800d94eb
Author: Elan Ruusamäe <[email protected]>
Date: Fri Jul 13 21:54:43 2012 +0300
- load pepperflash if present via commandline args
chromium-browser.sh | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/chromium-browser.sh b/chromium-browser.sh
index 60c46a0..a1830a4 100644
--- a/chromium-browser.sh
+++ b/chromium-browser.sh
@@ -8,7 +8,8 @@ if [ -f /etc/chromium-browser/default ] ; then
fi
# Always use our ffmpeg libs.
-export LD_LIBRARY_PATH=@libdir@${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
+CHROMIUM_DIR=@libdir@
+export LD_LIBRARY_PATH=$CHROMIUM_DIR${LD_LIBRARY_PATH:+:"$LD_LIBRARY_PATH"}
# for to find xdg-settings
export PATH=@libdir@${PATH:+:"$PATH"}
@@ -48,4 +49,10 @@ CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
# as not a number (NaN). Workaround that with LC_NUMERIC=C
export LC_NUMERIC=C
-exec @libdir@/chromium-browser $CHROMIUM_FLAGS "$@"
+# load PepperFlash if present
+if [ -f $CHROMIUM_DIR/PepperFlash/manifest.ver ]; then
+ . $CHROMIUM_DIR/PepperFlash/manifest.ver
+
PEPPERFLASH_ARGS="--ppapi-flash-path=$CHROMIUM_DIR/PepperFlash/libpepflashplayer.so
--ppapi-flash-version=$version"
+fi
+
+exec $CHROMIUM_DIR/chromium-browser $PEPPERFLASH_ARGS $CHROMIUM_FLAGS "$@"
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
