[Lunar-commits] <moonbase-other> chromium: making a few depends optional.

[Dennis Veatch]

commit 5700aae2983fa9bb94bc2df8d68457a17c73ebdf
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Tue, 05 Aug 2014 03:46:02 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/5700aae2983fa9bb94bc2df8d68457a17c73ebdf

chromium: making a few depends optional.
---
  web/chromium/BUILD   | +9/-3     
  web/chromium/DEPENDS | +3/-2     
  2 files changed, 12 insertions(+), 5 deletions(-)

--- a/web/chromium/BUILD
+++ b/web/chromium/BUILD
@@ -31,11 +31,17 @@
 }
 EOF
 
-  if module_installed libjpeg-turbo; then
-    OPTS+=" -Duse_libjpeg_turbo=1"
+  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_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"
+  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
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -1,9 +1,7 @@
 depends libevent
 depends alsa-lib
-depends bzip2
 depends gperf
 depends %JPEG
-depends libpng
 depends libxml2
 depends libxslt
 depends nss
@@ -14,6 +12,9 @@ depends libXScrnSaver
 depends Switch
 depends speech-dispatcher
 
+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"