[Lunar-commits] <moonbase> chromium: updated to 10.0.628.0 improved build

[Zbigniew Luszpinski]

commit 712434b0f2dc47627b6a7c7aebc481b1cf6a5159
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Jan 7 04:19:52 2011 +0100

    chromium: updated to 10.0.628.0 improved build
---
 web/chromium/BUILD   |   21 ++++++++++++++++-----
 web/chromium/DEPENDS |   25 +++++++++++++++++++------
 web/chromium/DETAILS |    8 +++++---
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/web/chromium/BUILD b/web/chromium/BUILD
index 8108120..9d00208 100644
--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -30,10 +30,21 @@ EOF
   OPTS="$OPTS -Duse_libjpeg_turbo=1"
   fi &&
 
+#  if module_installed libvpx; then
+#  patch_it $SOURCE2 0
+#  sedit 's at third_party/libvpx/source/libvpx/@@' remoting/base/*coder_vp8.cc
+#  sedit 's at third_party/libvpx/include/@@' third_party/ffmpeg/ffmpeg_stub_headers.fragment
+#  fi &&
+
+#  if module_installed speex; then
+#  sedit 's at third_party/speex/include/@@' chrome/browser/speech/speech_recognizer.cc
+#  cp $SOURCE_CACHE/$SOURCE3 third_party/speex
+#  fi &&
+
   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"
+  -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 \
+  -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Duse_system_zlib=1 \
+  -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1"
 
   # set the target arch here
   if [ "`arch`" == "x86_64" ]; then
@@ -48,8 +59,8 @@ EOF
   fi
 
   # This is the configure step
-#  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= &&
+  build/gyp_chromium -f make build/all.gyp $OPTS --depth=. &&
+
   # This is the make step
   make V=1 chrome chrome_sandbox BUILDTYPE=Release &&
 
diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS
index 6b8f200..a8a1506 100644
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -13,19 +13,32 @@ depends zlib
 depends libgnome-keyring
 depends libXScrnSaver
 
-# Use internal ffmpeg to build missing libffmpegsumo.so
-#optional_depends "ffmpeg"  "-Duse_system_ffmpeg"  "-Dffmpeg_branding=Chrome"  \
+# Current ffmpeg does not have libavcore/samplefmt.h
+# Uncomment this when future Lunar's ffmpeg will have it
+#optional_depends "ffmpeg"  "-Duse_system_ffmpeg=1"  ""  \
 #                 "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
+
+# in system libvpx 0.9.5 the vpx_codec_vp8_dx is missing
 #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 "icu4c"  "-Duse_system_icu=1"  ""  \
+                 "To use system icu library"
 
 optional_depends "sqlite"  "-Duse_system_sqlite=1"  ""  \
                  "To use system sqlite"
+
+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 "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"  "-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"  \
+                 "To use gnome keyring"
+
+optional_depends "speex"  ""  ""  \
+                 "To use system speex"
diff --git a/web/chromium/DETAILS b/web/chromium/DETAILS
index f91a0ba..7b42c66 100644
--- a/web/chromium/DETAILS
+++ b/web/chromium/DETAILS
@@ -1,11 +1,13 @@
           MODULE=chromium
-         VERSION=10.0.625.0
+         VERSION=10.0.628.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=chromium-system-vpx.patch
+         SOURCE3=speex.gyp
       SOURCE_URL=http://build.chromium.org/buildbot/official
-      SOURCE_VFY=sha1:89d6a983c84ab19a4a0984c38aa73307355c1a1b
+      SOURCE_VFY=sha1:ee59d656b6a4c9611be6eea2eec7f2f21b804406
         WEB_SITE=http://www.chromium.org/Home
          ENTERED=20100104
-         UPDATED=20101231
+         UPDATED=20110106
            PSAFE=no
            SHORT="Open-source version of Google Chrome web browser"