Last gyp patch for cross-platform Unix support

media/media.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     'player_x11_renderer%': 'x11',
   },
   'targets': [
@@ skipping 188 matching lines @@
           '..',
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'video/mft_h264_decode_engine.cc',
             'video/mft_h264_decode_engine.h',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS == "linux" or OS == "freebsd" or OS == "solaris"', {
           'link_settings': {
             'libraries': [
               '-lasound',
             ],
           },
         }],
         ['OS=="openbsd"', {
           'sources/': [ ['exclude', 'alsa_' ],
                         ['exclude', 'audio_manager_linux' ],
                         ['exclude', '\\.mm?$' ] ],
           'link_settings': {
             'libraries': [
             ],
           },
         }],
         ['OS!="openbsd"', {
           'sources!': [
             'audio/openbsd/audio_manager_openbsd.cc',
             'audio/openbsd/audio_manager_openbsd.h',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        ['os_posix == 1 and OS != "mac"', {
           'sources': [
             'filters/omx_video_decoder.cc',
             'filters/omx_video_decoder.h',
           ],
           'dependencies': [
             'omx_wrapper',
           ]
         }],
-        ['OS=="linux"', {
+        ['os_posix == 1 and OS != "mac"', {
           'sources!': [
             'video/capture/video_capture_device_dummy.cc',
             'video/capture/video_capture_device_dummy.h',
           ],
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
               '$(SDKROOT)/System/Library/Frameworks/AudioToolbox.framework',
@@ skipping 52 matching lines @@
         'base/yuv_row.h',
       ],
     },
     {
       'target_name': 'yuv_convert_sse2',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+        [ 'os_posix == 1 and OS != "mac"', {
           'cflags': [
             '-msse2',
           ],
         }],
       ],
       'sources': [
         'base/yuv_convert_sse2.cc',
       ],
     },
     {
       'target_name': 'ffmpeg_unittests',
       'type': 'executable',
       'dependencies': [
         'media',
         'media_test_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:test_support_perf',
         '../testing/gtest.gyp:gtest',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
       ],
       'sources': [
         'ffmpeg/ffmpeg_unittest.cc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
             #   ../base/test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
@@ skipping 64 matching lines @@
         'filters/ffmpeg_h264_bitstream_converter_unittest.cc',
         'filters/ffmpeg_video_decoder_unittest.cc',
         'filters/file_data_source_unittest.cc',
         'filters/rtc_video_decoder_unittest.cc',
         'filters/video_renderer_base_unittest.cc',
         'omx/mock_omx.cc',
         'omx/mock_omx.h',
         'video/ffmpeg_video_decode_engine_unittest.cc',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             # Needed for the following #include chain:
             #   base/run_all_unittests.cc
             #   ../base/test_suite.h
             #   gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
           'sources': [
             'omx/omx_codec_unittest.cc',
           ],
@@ skipping 182 matching lines @@
             'tools/shader_bench/gpu_color_painter_exp.cc',
             'tools/shader_bench/gpu_color_painter_exp.h',
             'tools/shader_bench/gpu_painter.cc',
             'tools/shader_bench/gpu_painter.h',
             'tools/shader_bench/painter.cc',
             'tools/shader_bench/painter.h',
             'tools/shader_bench/window.cc',
             'tools/shader_bench/window.h',
           ],
           'conditions': [
-            ['OS=="linux"', {
+            ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
               'sources': [
                 'tools/shader_bench/window_linux.cc',
               ],
             }],
             ['OS=="win"', {
               'dependencies': [
                 '../third_party/angle/src/build_angle.gyp:libEGL',
@@ skipping 19 matching lines @@
           'libraries': [
             '-lGL',
             '-ldl',
           ],
           'sources': [
             'tools/tile_render_bench/tile_render_bench.cc',
           ],
         },
       ],
     }],
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+    ['os_posix == 1 and OS != "mac"', {
       'targets': [
         {
           'target_name': 'omx_test',
           'type': 'executable',
           'dependencies': [
             'media',
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
             '../third_party/openmax/openmax.gyp:il',
           ],
           'sources': [
@@ skipping 11 matching lines @@
           'type': 'executable',
           'dependencies': [
             'media',
             'omx_wrapper',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
           ],
           'conditions': [
-            ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+            ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
             }],
           ],
           'sources': [
             'omx/omx_unittest.cc',
             'omx/run_all_unittests.cc',
           ],
         },
@@ skipping 75 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: