ichromium-new: Fix two more build conditionals to reduce undefined references

* Include *_auralinux.cc to build target
* Build OpenGL UI files

diff --git a/chromium-new/Makefile b/chromium-new/Makefile
index 3cfb22680ecdc0a7f53a7a53890383a05d6d5fd3..9089ae63cd5cde523ca6a417725f0e4ba6b7c67f 100644 (file)
--- a/chromium-new/Makefile
+++ b/chromium-new/Makefile
@@ -60,7 +60,7 @@ GYP_DEFINES+= proprietary_codecs=1
 GYP_DEFINES+=  ffmpeg_branding=Chrome
 
 # Some gyp or gn files may be broken for NetBSD...
-GYP_DEFINES+=  desktop_linux=1
+#GYP_DEFINES+= desktop_linux=1
 
 GYP_DEFINES+=  use_gconf=0
 GYP_DEFINES+=  use_pulseaudio=1
@@ -87,7 +87,7 @@ GYP_DEFINES+= use_allocator=none
 GYP_DEFINES+=  use_cups=1
 GYP_DEFINES+=  linux_link_gsettings=1
 GYP_DEFINES+=  linux_link_libpci=1
-GYP_DEFINES+=  linux_link_libspeechd=0
+GYP_DEFINES+=  linux_link_libspeechd=1
 GYP_DEFINES+=  want_separate_host_toolset=0
 GYP_DEFINES+=  use_system_bzip2=1
 GYP_DEFINES+=  use_system_flac=1
@@ -322,6 +322,7 @@ do-build:
        ninja -C out/${BUILDTYPE} ${target}
 .endfor
 
+.include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"

diff --git a/chromium-new/distinfo b/chromium-new/distinfo
index 28f3d53c27af71fd149555fe50ac6f7d3bdbf9bb..1896cafd5b7bb06649d58b7cddde9cd95673c752 100644 (file)
--- a/chromium-new/distinfo
+++ b/chromium-new/distinfo
@@ -43,7 +43,7 @@ SHA1 (patch-base_trace__event_process__memory__dump.cc) = 7c28a6ac88c6b812dab3c7
 SHA1 (patch-base_trace__event_process__memory__dump.h) = 8f9fea6a2a271482a6e5290a8e768372683fe2de
 SHA1 (patch-build_build__config.h) = f6c09cbcf5d917da3104842ce307d60303707401
 SHA1 (patch-build_common.gypi) = 3ab9dc8b10debb863190e2b017528a123af68cc9
-SHA1 (patch-build_filename__rules.gypi) = 0c1a9ee4423933ac149c029d7b3fdc9bc7867e2d
+SHA1 (patch-build_filename__rules.gypi) = e49a3fb871e3328decd2a971f17b4138312753fa
 SHA1 (patch-build_linux_system.gyp) = c1b58d24d653be2926d47340304647faedc9c935
 SHA1 (patch-build_linux_unbundle_libwebp.gyp) = 05e963f78891c2954b5cdc4fb5f644135ad96b10
 SHA1 (patch-cc_layers_scrollbar__layer__impl__base.cc) = 294c29df3025d921482e7cdfa4b3351b6f2ab584
@@ -405,7 +405,7 @@ SHA1 (patch-ui_gfx_color__utils.cc) = 13c78463244a6020445be05441a3693566d69987
 SHA1 (patch-ui_gfx_font__fallback__linux.cc) = 6eb56aa2bb1838a8a55f0a8298026ca579a57bd9
 SHA1 (patch-ui_gfx_font__render__params.h) = b3da6ca2f475ab3da509745ee21291ef85657567
 SHA1 (patch-ui_gfx_render__text.cc) = a3ad95b6eac82d1b73cd35e9cc918ca1e6d79648
-SHA1 (patch-ui_gl_gl.gyp) = 5af6259f55e23b6a8299d514df1bf5c3e592d9c7
+SHA1 (patch-ui_gl_gl.gyp) = 06b1786ad4a3f7af0eb6c247cd038a4e2402a53d
 SHA1 (patch-ui_gl_gl__surface__glx.cc) = e507b6bb50b5439f335a1469bf6d16ec7931ac21
 SHA1 (patch-ui_gl_sync__control__vsync__provider.cc) = eb8aa4e9170c315c35be8bbc33e583e81e94892e
 SHA1 (patch-ui_message__center_message__center__style.h) = 825b969362b1b270d98567dd57c76b567c2687ca

diff --git a/chromium-new/patches/patch-build_filename__rules.gypi b/chromium-new/patches/patch-build_filename__rules.gypi
index 176520fb0a3a07a74fd759034907db492844c85f..4367ec225d684f4fc6ff9abae3c89ee898351f70 100644 (file)
--- a/chromium-new/patches/patch-build_filename__rules.gypi
+++ b/chromium-new/patches/patch-build_filename__rules.gypi
@@ -16,7 +16,7 @@ $NetBSD$
        ]
      }],
 -    ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', {
-+    ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', {
++    ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd" and OS!="netbsd") or >(nacl_untrusted_build)==1', {
        'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ]
      }],
      ['<(use_ozone)==0 or >(nacl_untrusted_build)==1', {

diff --git a/chromium-new/patches/patch-ui_gl_gl.gyp b/chromium-new/patches/patch-ui_gl_gl.gyp
index 2e9c55ea1b4a5a87e12980f81c8a0a5ffabc5e2a..767b8e29f3cfdcd770b5628a6ed8d2159499b3c8 100644 (file)
--- a/chromium-new/patches/patch-ui_gl_gl.gyp
+++ b/chromium-new/patches/patch-ui_gl_gl.gyp
@@ -7,7 +7,7 @@ $NetBSD$
        ],
        'conditions': [
 -        ['OS in ("win", "android", "linux")', {
-+        ['OS in ("win", "android", "linux", "freebsd", "openbsd")', {
++        ['OS in ("win", "android", "linux", "freebsd", "openbsd", "netbsd")', {
            'sources': [
              'egl_util.cc',
              'egl_util.h',
@@ -16,7 +16,7 @@ $NetBSD$
          ],
          }],
 -        ['OS in ("android", "linux")', {
-+        ['OS in ("android", "linux", "freebsd", "openbsd")', {
++        ['OS in ("android", "linux", "freebsd", "openbsd", "netbsd")', {
            'sources': [
              'gl_implementation_osmesa.cc',
              'gl_implementation_osmesa.h',