[Lunar-commits] <moonbase> chromium: updated to 10.0.625.0

[Zbigniew Luszpinski]

commit 3a39cd34d313cf677f43eecc7fa6e78b5ed9b003
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Dec 31 22:32:15 2010 +0100

    chromium: updated to 10.0.625.0
---
 web/chromium/BUILD   |   29 +++++++++++++++++++++++++----
 web/chromium/DEPENDS |   17 +++++++++++++++--
 web/chromium/DETAILS |    6 +++---
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/web/chromium/BUILD b/web/chromium/BUILD
index ceb2578..8108120 100644
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -2,6 +2,18 @@
 
   sedit "s/'-Werror'/''/" build/common.gypi  &&
 
+  echo Fixing dumb CPU optimizations please wait in patience...
+  find . -type f -exec 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  &&
@@ -14,9 +26,14 @@
 }
 EOF
 
-  OPTS="$OPTS -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1"
+  if module_installed libjpeg-turbo; then
+  OPTS="$OPTS -Duse_libjpeg_turbo=1"
+  fi &&
 
-  OPTS="$OPTS -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+  OPTS="$OPTS -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 \
+  -Duse_system_libxml=1 -Duse_system_libxslt=1 -Dbuildtype=Official -Dfastbuild=1 -Duse_system_zlib=1 \
+  -Dproprietary_codecs=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 -Dffmpeg_branding=Chrome \
+  -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
 
   # set the target arch here
   if [ "`arch`" == "x86_64" ]; then
@@ -31,11 +48,14 @@ EOF
   fi
 
   # This is the configure step
-  build/gyp_chromium -f make build/all.gyp $OPTS --depth=. &&
-
+#  build/gyp_chromium -f make build/all.gyp $OPTS --depth=. &&
+   build/gyp_chromium --depth=. -Ddisable_sse2=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_zlib=1 -Duse_system_sqlite=1 -Duse_cups=1 -Duse_gconf=0 -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0 -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Dproprietary_codecs=1 -Dtarget_arch=ia32 -Dwerror= &&
   # This is the make step
   make V=1 chrome chrome_sandbox BUILDTYPE=Release &&
 
+  # Make missing libffmpegsumo.so
+  make -C third_party/ffmpeg -f ffmpeg.Makefile &&
+
   prepare_install &&
 
   mkdir -p ${CHROMIUM_HOME} &&
@@ -50,6 +70,7 @@ EOF
   cp -a out/Release/resources ${CHROMIUM_HOME} &&
   install -m 644 out/Release/chrome.1 /usr/share/man/man1/ &&
   install -m 644 out/Release/chrome.1 /usr/share/man/man1/chromium.1 &&
+  install -m 644 third_party/ffmpeg/out/Debug/libffmpegsumo.so ${CHROMIUM_HOME} &&
   if module_installed ffmpeg; then
     ln -sf /usr/lib/libavcodec.so.52 ${CHROMIUM_HOME}/libavcodec.so.52
     ln -sf /usr/lib/libavformat.so.52 ${CHROMIUM_HOME}/libavformat.so.52
diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS
index daa2533..6b8f200 100644
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -13,6 +13,19 @@ depends zlib
 depends libgnome-keyring
 depends libXScrnSaver
 
-optional_depends "ffmpeg"  "-Duse_system_Ffmpeg"  ""  \
-                 "To enable system ffmpeg"
+# Use internal ffmpeg to build missing libffmpegsumo.so
+#optional_depends "ffmpeg"  "-Duse_system_ffmpeg"  "-Dffmpeg_branding=Chrome"  \
+#                 "To enable system ffmpeg"
 
+optional_depends "yasm"  "-Duse_system_yasm=1"  ""  \
+                 "To use system yasm to compile assembler parts"
+#Breaks build 10.0.616.0
+#optional_depends "libvpx"  "-Duse_system_vpx=1"  ""  \
+#                 "To use system VP8 library"
+
+#Breaks build 10.0.616.0
+#optional_depends "icu4c"  "-Duse_system_icu=1"  ""  \
+#                 "To use system icu library"
+
+optional_depends "sqlite"  "-Duse_system_sqlite=1"  ""  \
+                 "To use system sqlite"
diff --git a/web/chromium/DETAILS b/web/chromium/DETAILS
index 036b4e8..f91a0ba 100644
--- a/web/chromium/DETAILS
+++ b/web/chromium/DETAILS
@@ -1,11 +1,11 @@
           MODULE=chromium
-         VERSION=10.0.616.0
+         VERSION=10.0.625.0
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://build.chromium.org/buildbot/official
-      SOURCE_VFY=sha1:4f96cabce1c4e877b627451e46ac32e5bcfbc9e0
+      SOURCE_VFY=sha1:89d6a983c84ab19a4a0984c38aa73307355c1a1b
         WEB_SITE=http://www.chromium.org/Home
          ENTERED=20100104
-         UPDATED=20101224
+         UPDATED=20101231
            PSAFE=no
            SHORT="Open-source version of Google Chrome web browser"