[Lunar-commits] <moonbase-other> chromium: bump to 40.0.2175.0. Many changes all around borrowed from gentoo and arch linux.
Dennis Veatch
dennisveatch at bellsouth.net
Thu Oct 2 19:02:54 CEST 2014
commit 6e3288ecf8eed5d0e39df9a976e76764ac43b418
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Thu, 02 Oct 2014 13:01:27 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/6e3288ecf8eed5d0e39df9a976e76764ac43b418
chromium: bump to 40.0.2175.0. Many changes all around borrowed from gentoo and arch linux.
---
web/chromium/BUILD | +11/-6
web/chromium/CONFIGURE | +0/-1
web/chromium/DEPENDS | +28/-31
web/chromium/DETAILS | +6/-3
web/chromium/PRE_BUILD | +145/-29
web/chromium/nacl.gypi | +0/-8
6 files changed, 190 insertions(+), 78 deletions(-)
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -1,10 +1,17 @@
+# Lets do some ffmpeg stuff
+ pushd third_party/ffmpeg > /dev/null &&
+ chromium/scripts/build_ffmpeg.py linux ${FFMPEG_OPTS} --branding=Chrome &&
+ chromium/scripts/copy_config.sh &&
+ chromium/scripts/generate_gyp.py &&
+ popd > /dev/null &&
+ build/linux/unbundle/replace_gyp_files.py $OPTS &&
+
# This is the configure step
- build/gyp_chromium -f make build/all.gyp $OPTS -Drelease_extra_cflags="$CFLAGS" --depth=. &&
+ build/gyp_chromium build/all.gyp --depth=. $OPTS &&
# This is the make step
- make V=1 chrome chrome_sandbox BUILDTYPE=Release -j${MAKES} &&
- make -C third_party/ffmpeg -f ffmpeg.Makefile BUILDTYPE=Release &&
+ ninja -C out/Release chrome chrome_sandbox -j${MAKES} &&
prepare_install &&
@@ -12,7 +19,7 @@
install -D out/Release/chrome ${CHROMIUM_HOME}/chrome &&
install -Dm4755 -o root -g root out/Release/chrome_sandbox ${CHROMIUM_HOME}/chrome-sandbox &&
- cp out/Release/{*.pak,libffmpegsumo.so} ${CHROMIUM_HOME} &&
+ cp out/Release/{*.pak,libffmpegsumo.so,libpdf.so,*.TOC} ${CHROMIUM_HOME} &&
cp -a out/Release/locales out/Release/resources ${CHROMIUM_HOME}/ &&
@@ -35,8 +42,6 @@
install -Dm644 LICENSE /usr/share/licenses/chromium/LICENSE &&
- install -m 755 out/Release/xdg-settings ${CHROMIUM_HOME} &&
-
# symlink to lunar location for browser plugins, should be /usr/lib/lunar/plugins
ln -sf /usr/lib/lunar/plugins ${CHROMIUM_HOME}/plugins &&
--- a/web/chromium/CONFIGURE
+++ b/web/chromium/CONFIGURE
@@ -1,2 +1 @@
-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
@@ -1,43 +1,40 @@
-depends libevent
-depends alsa-lib
+depends zlib
+depends minizip
+depends ninja
+depends snappy
+depends protobuf
depends gperf
+depends re2
+depends xdg-utils
+depends icu4c
+depends libevent
depends %JPEG
+depends alsa-lib
depends libxml2
depends libxslt
+depends jsoncpp
+depends libpng
+depends libwebp
depends nss
+depends BeautifulSoup
+depends Jinja2
+depends ply
+depends simplejson
+depends Switch
+depends libgnome-keyring
+depends harfbuzz
depends pango
-depends Python
-depends zlib
+depends speex
depends libXScrnSaver
-depends Switch
-depends speech-dispatcher
-depends ffmpeg
-depends usbutils
-
-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"
-optional_depends "snappy" "-Duse_system_snappy=1" "-Duse_system_snappy=0" "To use system provided snappy, fast decompression/compression support"
-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 "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 "pulseaudio" "-Dlinux_link_pulseaudio=1" "-Dlinux_link_pulseaudio=1" "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 "libgnome-keyring" "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" \
- "-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" \
- "To use system provided gnome keyring"
+# For now no
+#optional_depends "libvpx" "-Duse_system_vpx=1" "-Duse_system_vpx=0" "To use system provided VP8 library"
# 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,14 @@
MODULE=chromium
- VERSION=31.0.1650.63
+ VERSION=40.0.2175.0
SOURCE=$MODULE-$VERSION.tar.xz
+ SOURCE2=chromium-system-jinja-r7.patch
SOURCE_URL=https://gsdview.appspot.com/chromium-browser-official/
- SOURCE_VFY=sha1:34f9281faf7e94557b77514106e85122e6175c5a
+ SOURCE2_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/chromium/files/
+ SOURCE_VFY=sha1:d132c962e9612e4cde823722d3477c2feb7d9520
+ SOURCE2_VFY=sha1:c24d14029714d2295f3220a7173a5a7362f578a2
WEB_SITE=http://www.chromium.org/Home
ENTERED=20100104
- UPDATED=20140912
+ UPDATED=20141002
SHORT="Open-source version of Google Chrome web browser"
cat << EOF
--- a/web/chromium/PRE_BUILD
+++ b/web/chromium/PRE_BUILD
@@ -1,8 +1,15 @@
default_pre_build &&
-
+
+ patch_it $SOURCE2 0 &&
+
export CHROMIUM_HOME=/usr/lib/$MODULE &&
- PYTHON_VER=`installed_version Python | cut -c 1-3` &&
+ QA_FLAGS_IGNORED=".*\.nexe" &&
+ QA_PRESTRIPPED=".*\.nexe" &&
+
+ mkdir python2-path &&
+ PYTHON_VER=`module_version Python | cut -c 1-3` &&
+ ln -s /usr/bin/python2 python2-path/python &&
sedit "s/'-Werror'/''/" build/common.gypi &&
sedit "s:/bin/echo:/usr/bin/echo:g" build/common.gypi &&
@@ -11,8 +18,6 @@
# When using pepperflash gets rid of; ERROR:audio_manager_base.cc(422)] Not implemented reached
sedit "s:NOTIMPLEMENTED();::" media/audio/audio_manager_base.cc
- 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' \
@@ -25,19 +30,6 @@
-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
@@ -47,35 +39,159 @@ EOF
# set the target arch here
if [ `arch` == "x86_64" ]; then
OPTS+=" -Dtarget_arch=x64 -Dffmpeg_target_arch=x64 -Dsystem_libdir=lib64"
+ FFMPEG_OPTS+=" x64"
else
OPTS+=" -Dtarget_arch=ia32 -Dffmpeg_target_arch=ia32"
+ FFMPEG_OPTS+=" ia32"
fi &&
-# A little jiggle for adboe/flash
- echo > third_party/adobe/flash/flapper_version.h &&
+# Removing some bundled stuff.
+ build/linux/unbundle/remove_bundled_libraries.py \
+ 'base/third_party/dmg_fp' \
+ 'base/third_party/dynamic_annotations' \
+ 'base/third_party/icu' \
+ 'base/third_party/nspr' \
+ 'base/third_party/superfasthash' \
+ 'base/third_party/symbolize' \
+ 'base/third_party/valgrind' \
+ 'base/third_party/xdg_mime' \
+ 'base/third_party/xdg_user_dirs' \
+ 'breakpad/src/third_party/curl' \
+ 'chrome/third_party/mozilla_security_manager' \
+ 'courgette/third_party' \
+ 'crypto/third_party/nss' \
+ 'net/third_party/mozilla_security_manager' \
+ 'net/third_party/nss' \
+ 'third_party/adobe' \
+ 'third_party/WebKit' \
+ 'third_party/angle' \
+ 'third_party/angle/src/third_party/compiler' \
+ 'third_party/brotli' \
+ 'third_party/cacheinvalidation' \
+ 'third_party/cld_2' \
+ 'third_party/cros_system_api' \
+ 'third_party/cython/python_flags.py' \
+ 'third_party/dom_distiller_js' \
+ 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \
+ 'third_party/ffmpeg' \
+ 'third_party/fips181' \
+ 'third_party/flot' \
+ 'third_party/hunspell' \
+ 'third_party/iccjpeg' \
+ 'third_party/jstemplate' \
+ 'third_party/khronos' \
+ 'third_party/leveldatabase' \
+ 'third_party/libaddressinput' \
+ 'third_party/libjingle' \
+ 'third_party/libphonenumber' \
+ 'third_party/libsrtp' \
+ 'third_party/libusb' \
+ 'third_party/libvpx' \
+ 'third_party/libvpx/source/libvpx/third_party/x86inc' \
+ 'third_party/libwebm' \
+ 'third_party/libxml/chromium' \
+ 'third_party/libXNVCtrl' \
+ 'third_party/libyuv' \
+ 'third_party/lss' \
+ 'third_party/lzma_sdk' \
+ 'third_party/mesa' \
+ 'third_party/modp_b64' \
+ 'third_party/mt19937ar' \
+ 'third_party/npapi' \
+ 'third_party/opus' \
+ 'third_party/ots' \
+ 'third_party/pdfium' \
+ 'third_party/pdfium/third_party/logging.h' \
+ 'third_party/pdfium/third_party/macros.h' \
+ 'third_party/pdfium/third_party/numerics' \
+ 'third_party/pdfium/third_party/template_util.h' \
+ 'third_party/polymer' \
+ 'third_party/qcms' \
+ 'third_party/readability' \
+ 'third_party/sfntly' \
+ 'third_party/skia' \
+ 'third_party/smhasher' \
+ 'third_party/sqlite' \
+ 'third_party/tcmalloc' \
+ 'third_party/tlslite' \
+ 'third_party/trace-viewer' \
+ 'third_party/trace-viewer/third_party/jszip' \
+ 'third_party/trace-viewer/third_party/tvcm' \
+ 'third_party/trace-viewer/third_party/tvcm/third_party/d3' \
+ 'third_party/trace-viewer/third_party/tvcm/third_party/gl-matrix' \
+ 'third_party/trace-viewer/third_party/tvcm/third_party/polymer' \
+ 'third_party/undoview' \
+ 'third_party/usrsctp' \
+ 'third_party/webdriver' \
+ 'third_party/webrtc' \
+ 'third_party/widevine' \
+ 'third_party/x86inc' \
+ 'third_party/zlib/google' \
+ 'url/third_party/mozilla' \
+ 'v8/src/third_party/kernel' \
+ 'v8/src/third_party/valgrind' \
+ 'v8/third_party/fdlibm' \
+ --do-remove &&
# chrome-sandbox is hardcoded so using anything but that won't work
# Let chromium find the usb id paths on launch instead of compiling
# in the path.
OPTS+=" -Dproprietary_codecs=1 \
-Dwerror= \
+ -Ddisable_fatal_linker_warnings=1 \
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome-sandbox \
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome \
+ -Drelease_extra_cflags=${CFLAGS} \
+ -Dpython_ver=${PYTHON_VER} \
-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_bzip2=1 \
+ -Duse_system_flac=1 \
+ -Duse_system_harfbuzz=1 \
+ -Duse_system_icu=1 \
+ -Duse_system_jsoncpp=1 \
-Duse_system_libevent=1 \
+ -Duse_system_libjpeg=1 \
+ -Duse_system_libpng=1 \
+ -Duse_system_libwebp=1 \
-Duse_system_libxml=1 \
-Duse_system_libxslt=1 \
- -Dproprietary_codecs=1 \
- -Duse_system_ffmpeg=1 \
- -Dpython_ver=${PYTHON_VER} \
- -Duse_system_libjpeg=1 \
+ -Duse_system_minizip=1 \
+ -Duse_system_nspr=1 \
+ -Duse_system_protobuf=1 \
+ -Duse_system_re2=1 \
+ -Duse_system_snappy=1 \
+ -Duse_system_speex=1 \
+ -Duse_system_xdg_utils=1 \
+ -Duse_system_zlib=1 \
+ -Dlinux_link_libspeechd=1 \
+ -Dlibspeechd_h_prefix=speech-dispatcher/ \
-Dremove_webcore_debug_symbols=1 \
- -Dusb_ids_path=/usr/share/usb.ids"
+ -Dusb_ids_path=/usr/share/usb.ids \
+ -Duse_gnome_keyring=1 \
+ -Dlinux_link_gnome_keyring=1 \
+ -Dlinux_link_gsettings=1 \
+ -Dlinux_link_libpci=1 \
+ -Duse_mojo=0 \
+ -Dclang=0 \
+ -Dhost_clang=0 \
+ -Dicu_use_data_file_flag=0 \
+ -Dlinux_use_seccomp_sandbox=1 \
+ -Dlinux_use_bundled_binutils=0 \
+ -Dlinux_use_bundled_gold=0 \
+ -Dlinux_use_gold_flags=0 \
+ -Dlogging_like_official_build=1 \
+ -Ddisable_nacl=1" &&
+
+# A little jiggle for adboe/flash
+ echo > third_party/adobe/flash/flapper_version.h &&
+ OPTS+=" -Dflapper_version_h_file=flapper_version.h" &&
+
+ third_party/libaddressinput/chromium/tools/update-strings.py &&
+
+# The 100 percent avatar png was causing tools/grit/grit.py to tank on its chunkability
+# Don't care 200 percent is bigger, just copy one to the other and press on.
+ cp chrome/app/theme/default_200_percent/common/avatar_menu_profile.png chrome/app/theme/default_100_percent/common/avatar_menu_profile.png
+
--- a/web/chromium/nacl.gypi
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'nacl',
- 'type': 'static_library',
- },
- ],
-}
More information about the Lunar-commits
mailing list