[Lunar-commits] <moonbase-other> chromium: Bump to 31.0.1650.63. If you are using pepperflash you might need to launch
Dennis Veatch
dennisveatch at bellsouth.net
Wed Sep 17 11:47:44 CEST 2014
commit 67da080e30cb135246a1b354021b906a2dcb99ce
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Wed, 17 Sep 2014 05:40:29 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/67da080e30cb135246a1b354021b906a2dcb99ce
chromium: Bump to 31.0.1650.63. If you are using pepperflash you might need to launch
chromium with something like this;
chromium --ppapi-flash-path=/usr/lib/lunar/plugins/libpepflashplayer.so --ppapi-flash-version=15.0.0.152
The pepper flash version can be found in the /usr/lib/lunar/plugins/manifest.json. Yes I know
that is a bit cludgey and needs a bit of work. If you have any ideas feel free to push some
electrons.
On lanuch chromium still lets you know it cannot find any api keys. Not sure if we should or want
to follow other distro and create our own lunar api keys. Doesn't effect normal useage, just
an annoyance.
---
web/chromium/BUILD | +3/-62
web/chromium/CONFIGURE | +1/-0
web/chromium/DEPENDS | +23/-16
web/chromium/DETAILS | +3/-3
web/chromium/POST_BUILD | +6/-0
web/chromium/PRE_BUILD | +62/-0
6 files changed, 98 insertions(+), 81 deletions(-)
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -1,73 +1,16 @@
-(
-
- sedit "s/'-Werror'/''/" build/common.gypi &&
-
- cp -f $SCRIPT_DIRECTORY/nacl.gypi chrome/ &&
-
- echo Fixing dumb CPU optimizations please wait in patience...
- find . -type f -print0 | xargs -0 sed -i \
- -e 's/-mcpu=/-march=/g' \
- -e 's/-mtune=/-march=/g' \
- -e 's/=pentium4/=native/g' \
- -e 's/=i386/=native/g' \
- -e 's/=i486/=native/g' \
- -e 's/=core2/=native/g' \
- -e 's/=pentiumpro/=native/g' \
- -e 's/=pentium/=native/g' \
- -e 's/=k6/=native/g' &&
-
- export CHROMIUM_HOME=/usr/lib/$MODULE &&
-
- mkdir -p "${SOURCE_DIRECTORY}"/.gyp &&
- cat << EOF > "${SOURCE_DIRECTORY}"/.gyp/include.gypi
-{
- 'target_defaults': {
- 'cflags': [ '${CFLAGS// /','}' ],
- 'ldflags': [ '${LDFLAGS// /','}' ],
- },
- 'variables': {
- q 'remove_webcore_debug_symbols' : 1,
- },
-}
-EOF
-
- if ! grep -q sse2 /proc/cpuinfo ; then
- OPTS+=" -Ddisable_sse2=0"
- else
- OPTS+=" -Ddisable_sse2=1"
- fi &&
-
- if module_installed %JPEG; then
- OPTS+=" -Duse_system_libjpeg=1"
- fi &&
-
- OPTS+=" -Duse_system_libevent=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Dproprietary_codecs=1 -Dwerror= -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dffmpeg_branding=Chrome -DENABLE_MEDIA_CAPTURE=1"
-
- # set the target arch here
- if [ "`arch`" == "x86_64" ]; then
- OPTS+=" -Dtarget_arch=x64"
- else
- OPTS+=" -Dtarget_arch=ia32"
- fi
-
- gcc_ver=`installed_version gcc | cut -d. -f1,2`
- if [[ $gcc_ver == "4.4" ]]; then
- OPTS+=" -Dno_strict_aliasing=1 -Dgcc_version=44"
- fi
# This is the configure step
build/gyp_chromium -f make build/all.gyp $OPTS -Drelease_extra_cflags="$CFLAGS" --depth=. &&
# This is the make step
- make V=1 chrome chrome_sandbox BUILDTYPE=Release &&
-
- make -C third_party/ffmpeg -f ffmpeg.Makefile &&
+ make V=1 chrome chrome_sandbox BUILDTYPE=Release -j${MAKES} &&
+ make -C third_party/ffmpeg -f ffmpeg.Makefile BUILDTYPE=Release &&
prepare_install &&
# installing
install -D out/Release/chrome ${CHROMIUM_HOME}/chrome &&
- install -Dm4755 -o root -g root out/Release/chrome_sandbox ${CHROMIUM_HOME}/chrome_sandbox &&
+ install -Dm4755 -o root -g root out/Release/chrome_sandbox ${CHROMIUM_HOME}/chrome-sandbox &&
cp out/Release/{*.pak,libffmpegsumo.so} ${CHROMIUM_HOME} &&
@@ -101,5 +44,3 @@ EOF
cp -a $SOURCE_DIRECTORY/chrome/app/theme /usr/share/themes/Chromium/ &&
ln -sf ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-
-) > $C_FIFO 2>&1
--- a/web/chromium/CONFIGURE
+++ b/web/chromium/CONFIGURE
@@ -1 +1,2 @@
mquery NACL "Enable NaCl support?" n "-Ddisable_nacl=0" "-Ddisable_nacl=1"
+mquery ENABLE_SPELLCHECK "Enable spellchecking?" y "-Denable_spellcheck=1" "-Denable_spellcheck=0"
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -11,25 +11,32 @@ depends zlib
depends libXScrnSaver
depends Switch
depends speech-dispatcher
+depends ffmpeg
+depends usbutils
-optional_depends "bzip2" "-Duse_system_bzip2=1" "-Duse_system_bzip2=0" "To use system provided bzip"
-optional_depends "libpng" "-Duse_system_libpng=1" "-Duse_system_libpng=0" "To use system provided libpng"
-optional_depends "ffmpeg" "-Duse_system_ffmpeg=1" "-Duse_system_ffmpeg=0" "To use system provided ffmpeg"
-optional_depends "yasm" "-Duse_system_yasm=1" "-Duse_system_yasm=0" "To use system yasm to compile assembler parts"
-optional_depends "cups" "-Duse_cups=1" "-Duse_cups=0" "To use cups printing"
-optional_depends "GConf" "-Duse_gconf=1" "-Duse_gconf=0" "To use cups printing"
-optional_depends "speex" "-Duse_system_speex=1" "-Duse_system_speex=0" "To use system speex"
-optional_depends "pulseaudio" "-Denable_webrtc=1" "-Denable_webrtc=0" "To use Realtime Web Communication"
-optional_depends "heimdal" "-Duse_kerberos=1" "-Duse_kerberos=0" "To use heimdal (kerberos) support"
+optional_depends "re2c" "-Duse_system_re2=1" "-Duse_system_re2=0" "To use system proviced re2c"
+optional_depends "nspr" "-Duse_system_nspr=1" "-Duse_system_nspr=0" "To use system provided nspr"
+optional_depends "jsoncpp" "-Duse_system_jsoncpp=1" "-Duse_system_jsoncpp=0" "To use system provided jsoncpp"
+optional_depends "libwebp" "-Duse_system_libwebp=1" "-Duse_system_libwebp=0" "To use system provided webp"
+optional_depends "harfbuzz" "-Duse_system_harfbuzz=1" "-Duse_system_harfbuzz=0" "To use system provided harfbuzz"
+optional_depends "flac" "-Duse_system_flac=1" "-Duse_system_flac=0" "To use system provided flac"
+optional_depends "bzip2" "-Duse_system_bzip2=1" "-Duse_system_bzip2=0" "To use system provided bzip"
+optional_depends "libpng" "-Duse_system_libpng=1" "-Duse_system_libpng=0" "To use system provided libpng"
+optional_depends "ffmpeg" "-Duse_system_ffmpeg=1" "-Duse_system_ffmpeg=0" "To use system provided ffmpeg"
+optional_depends "yasm" "-Duse_system_yasm=1" "-Duse_system_yasm=0" "To use system yasm to compile assembler parts"
+optional_depends "cups" "-Duse_cups=1" "-Duse_cups=0" "To use system provided cups"
+optional_depends "GConf" "-Duse_gconf=1" "-Duse_gconf=0" "To use system provided GConf"
+optional_depends "speex" "-Duse_system_speex=1" "-Duse_system_speex=0" "To use system provided speex"
+optional_depends "pulseaudio" "-Denable_webrtc=1" "-Denable_webrtc=0" "To use system provided Realtime Web Communication"
+optional_depends "heimdal" "-Duse_kerberos=1" "-Duse_kerberos=0" "To use system provided heimdal (kerberos) support"
+optional_depends "libvpx" "-Duse_system_vpx=1" "-Duse_system_vpx=0" "To use system provided VP8 library"
-# Still flaky
-#optional_depends "icu4c" "-Duse_system_icu=1" "-Duse_system_icu=0" "To use system icu library"
-# Still flaky
-optional_depends "libvpx" "-Duse_system_vpx=1" "-Duse_system_vpx=0" "To use system VP8 library"
-# Still breaks the build 20130206
-#optional_depends "sqlite" "-Duse_system_sqlite=1" "-Duse_system_sqlite=0" "To use system sqlite"
+optional_depends "icu4c" "-Duse_system_icu=1 -Dicu_use_data_file_flag=0" \
+ "-Duse_system_icu=0" "To use system provided icu library"
optional_depends "libgnome-keyring" "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" \
"-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" \
- "To use gnome keyring"
+ "To use system provided gnome keyring"
+# Still breaks the build
+#optional_depends "sqlite" "-Duse_system_sqlite=1" "-Duse_system_sqlite=0" "To use system provided sqlite"
--- a/web/chromium/DETAILS
+++ b/web/chromium/DETAILS
@@ -1,11 +1,11 @@
MODULE=chromium
- VERSION=29.0.1547.57
+ VERSION=31.0.1650.63
SOURCE=$MODULE-$VERSION.tar.xz
SOURCE_URL=https://gsdview.appspot.com/chromium-browser-official/
- SOURCE_VFY=sha1:5f580fb171bc64f4cf3c296b376495b07d9a664e
+ SOURCE_VFY=sha1:34f9281faf7e94557b77514106e85122e6175c5a
WEB_SITE=http://www.chromium.org/Home
ENTERED=20100104
- UPDATED=20130820
+ UPDATED=20140912
SHORT="Open-source version of Google Chrome web browser"
cat << EOF
--- /dev/null
+++ b/web/chromium/POST_BUILD
@@ -0,0 +1,6 @@
+message ""
+message "Setting up sandbox"
+ BUILDTYPE=Release build/update-linux-sandbox.sh &&
+message ""
+message ""
+
--- /dev/null
+++ b/web/chromium/PRE_BUILD
@@ -0,0 +1,62 @@
+ default_pre_build &&
+
+ # To properly setup sandboxing need to run this script but it uses sudo, we don't,
+ # and getting rid of the echo saying it does.
+ sedit "s:sudo --::g" build/update-linux-sandbox.sh &&
+ sedit "27d" build/update-linux-sandbox.sh &&
+
+ export CHROMIUM_HOME=/usr/lib/$MODULE &&
+
+ PYTHON_VER=`installed_version Python | cut -c 1-3` &&
+
+ sedit "s/'-Werror'/''/" build/common.gypi &&
+ sedit "s:/bin/echo:/usr/bin/echo:g" build/common.gypi &&
+ sedit "s:-Wno-#pragma-messages::g" third_party/opus/opus.gyp &&
+
+ cp -f $SCRIPT_DIRECTORY/nacl.gypi chrome/ &&
+
+ echo Fixing dumb CPU optimizations please wait in patience...
+ find . -type f -print0 | xargs -0 sed -i \
+ -e 's/-mcpu=/-march=/g' \
+ -e 's/-mtune=/-march=/g' \
+ -e 's/=pentium4/=native/g' \
+ -e 's/=i386/=native/g' \
+ -e 's/=i486/=native/g' \
+ -e 's/=core2/=native/g' \
+ -e 's/=pentiumpro/=native/g' \
+ -e 's/=pentium/=native/g' \
+ -e 's/=k6/=native/g' &&
+
+ mkdir -p "${SOURCE_DIRECTORY}"/.gyp &&
+ cat << EOF > "${SOURCE_DIRECTORY}"/.gyp/include.gypi
+{
+ 'target_defaults': {
+ 'cflags': [ '${CFLAGS// /','}' ],
+ 'ldflags': [ '${LDFLAGS// /','}' ],
+ },
+ 'variables': {
+ q 'remove_webcore_debug_symbols' : 1,
+ },
+}
+EOF
+
+ if ! grep -q sse2 /proc/cpuinfo ; then
+ OPTS+=" -Ddisable_sse2=0"
+ else
+ OPTS+=" -Ddisable_sse2=1"
+ fi &&
+
+ # set the target arch here
+ if [ `arch` == "x86_64" ]; then
+ OPTS+=" -Dtarget_arch=x64 -Dffmpeg_target_arch=x64 -Dsystem_libdir=lib64"
+ else
+ OPTS+=" -Dtarget_arch=ia32 -Dffmpeg_target_arch=ia32"
+ fi &&
+
+# A little jiggle for adboe/flash
+ echo > third_party/adobe/flash/flapper_version.h &&
+
+ OPTS+=" -Dproprietary_codecs=1 -Dwerror= -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome-sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome \
+ -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0 -Dlinux_use_bundled_binutils=0 \
+ -Dffmpeg_branding=Chrome -DENABLE_MEDIA_CAPTURE=1 -Duse_system_speex=1 -Duse_system_libevent=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Dproprietary_codecs=1\
+ -Duse_system_ffmpeg=1 -Dpython_ver=${PYTHON_VER} -Duse_system_libjpeg=1 -Dremove_webcore_debug_symbols=1 -Dusb_ids_path=/usr/share/usb.ids"
More information about the Lunar-commits
mailing list