[Lunar-commits] <moonbase-other> chromium: A little tweaking to BUILD and DEPENDS.

[stumbles]

commit 96f47819b29f3916e67e4203ac540140f6ce1d56
Author: stumbles <stumbles at lunar-linux.org>
Date: Mon, 25 Feb 2013 13:20:21 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/96f47819b29f3916e67e4203ac540140f6ce1d56

chromium: A little tweaking to BUILD and DEPENDS.
---
  web/chromium/BUILD   | +1/-1     
  web/chromium/DEPENDS | +15/-27   
  2 files changed, 16 insertions(+), 28 deletions(-)

--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -37,7 +37,7 @@ EOF
     OPTS+=" -Duse_libjpeg_turbo=1"
   fi &&
 
-  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 -Duse_system_zlib=1 -Duse_system_ffmpeg=0 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 -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"
+  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 -Duse_system_zlib=0 -Duse_system_ffmpeg=0 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 -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
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -13,35 +13,23 @@ depends zlib
 depends libgnome-keyring
 depends libXScrnSaver
 depends Switch
-
-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"  ""                      ""                      "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"
+depends speech-dispatcher
+
+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"
+
+# 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 "libgnome-keyring"  "-Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"  \
                                      "-Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"  \
                                      "To use gnome keyring"
 
-# 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"
-
-
-#Not supported in chromium 12.0
-#optional_depends "sqlite"  "-Duse_system_sqlite=1"  ""  \
-#                 "To use system sqlite"
-
-#not working in chromium 14.0
-#optional_depends "icu4c"  "-Duse_system_icu=1"    "-Duse_system_icu=0"    "To use system icu library"
-