From 0464cdb161cfe7786bfee96017a4a70dba044060 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Mon, 14 Sep 2015 17:25:02 -0700 Subject: [PATCH] allow to build xwalk on m44 Update build patch with latest version form chromium xwalk In spec file: depends on dbus-glib. Modify dump.json path which has changed in gyp. And update package versions Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=13152 Reviewed by: a1.gomes, sns.park Change-Id: Ic4fc5707b67605309d91fbdc3394f1287a467b4a Signed-off-by: Arnaud Renevier --- ...do-not-build-several-chromium-dependencies.diff | 251 +++++++++++---------- tizen_src/packaging/chromium-efl-libs.spec | 6 +- tizen_src/packaging/crosswalk-bin.spec | 2 +- 3 files changed, 135 insertions(+), 124 deletions(-) diff --git a/tizen_src/build/patches/crosswalk/crosswalk-do-not-build-several-chromium-dependencies.diff b/tizen_src/build/patches/crosswalk/crosswalk-do-not-build-several-chromium-dependencies.diff index e1e494b..75cbc03 100644 --- a/tizen_src/build/patches/crosswalk/crosswalk-do-not-build-several-chromium-dependencies.diff +++ b/tizen_src/build/patches/crosswalk/crosswalk-do-not-build-several-chromium-dependencies.diff @@ -197,9 +197,9 @@ BUG=XWALK-2571 + + '../device/battery/battery.gyp:device_battery_mojo_bindings', + '../device/vibration/vibration.gyp:device_vibration_mojo_bindings', ++ '../mojo/mojo_base.gyp:mojo_application_bindings', + '../mojo/mojo_base.gyp:mojo_environment_chromium', + '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', -+ '../third_party/mojo/mojo_public.gyp:mojo_application_bindings', + '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', + 'content_common_mojo_bindings.gyp:content_common_mojo_bindings', + ], @@ -366,11 +366,10 @@ BUG=XWALK-2571 '../base/base.gyp:base', --- src/net/net.gyp +++ src/net/net.gyp -@@ -44,6 +44,42 @@ - ], - 'targets': [ +@@ -104,6 +104,41 @@ + }, { -+ 'target_name': 'net', + 'target_name': 'net', + 'type': 'none', + 'link_settings': { + 'libraries': [ @@ -404,21 +403,12 @@ BUG=XWALK-2571 + }], + ], + }, -+ + { - 'target_name': 'net_derived_sources', - 'type': 'none', - 'sources': [ -@@ -80,7 +116,7 @@ - }, - }, - { -- 'target_name': 'net', + 'target_name': 'net_original', - 'type': '<(component)', - 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ -@@ -1177,6 +1213,16 @@ + '../base/base.gyp:base_i18n', + '../third_party/icu/icu.gyp:icui18n', +@@ -842,6 +842,15 @@ 'targets': [ { 'target_name': 'net_with_v8', @@ -429,7 +419,6 @@ BUG=XWALK-2571 + ], + }, + }, -+ + { + 'target_name': 'net_with_v8_original', 'type': '<(component)', @@ -487,19 +476,17 @@ BUG=XWALK-2571 # Setting both variables means we pull in the sources from both --- src/skia/skia.gyp +++ src/skia/skia.gyp -@@ -54,6 +54,46 @@ +@@ -62,7 +62,56 @@ 'targets': [ { 'target_name': 'skia', +- 'type': 'shared_library', + 'type': 'none', + 'link_settings': { + 'libraries': [ + '-lskia', + ], + }, -+ 'includes': [ -+ 'skia_common.gypi', -+ ], + 'direct_dependent_settings': { + 'defines': [ + 'SKIA_DLL', @@ -527,13 +514,24 @@ BUG=XWALK-2571 + '../third_party/skia/include/utils', + ], + }, ++ 'includes': [ ++ 'skia_common.gypi', ++ ], ++ + }, + + { + 'target_name': 'skia_original', - 'type': 'shared_library', ++ 'type': 'none', ++ 'link_settings': { ++ 'libraries': [ ++ '-lskia', ++ ], ++ }, ++ 'includes': [ 'skia_library.gypi', + 'skia_chrome.gypi', --- src/storage/storage_browser.gyp +++ src/storage/storage_browser.gyp @@ -10,6 +10,17 @@ @@ -607,7 +605,7 @@ BUG=XWALK-2571 'defines': [ --- src/third_party/WebKit/public/blink.gyp +++ src/third_party/WebKit/public/blink.gyp -@@ -36,17 +36,19 @@ +@@ -36,17 +36,18 @@ # GN version: //third_party/WebKit/public:blink 'target_name': 'blink', 'type': 'none', @@ -625,7 +623,6 @@ BUG=XWALK-2571 + 'direct_dependent_settings': { + 'include_dirs': [ + '..', -+ '<(DEPTH)/v8/include', + ], + }, + 'link_settings': { @@ -659,117 +656,106 @@ BUG=XWALK-2571 'includes': [ '../build/common_defines.gypi', ], --- src/third_party/ffmpeg/ffmpeg.gyp +++ src/third_party/ffmpeg/ffmpeg.gyp -@@ -150,6 +150,12 @@ - 'targets': [ +@@ -168,6 +168,27 @@ + + 'targets': [{ + 'target_name': 'ffmpeg', ++ 'type': 'none', ++ 'link_settings': { ++ 'libraries': [ ++ '-lffmpeg', ++ ], ++ }, ++ 'variables': { ++ # Path to platform configuration files. ++ 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)', ++ }, ++ 'direct_dependent_settings': { ++ 'include_dirs': [ ++ '../..', # The chromium 'src' directory. ++ '<(platform_config_root)', ++ '.', ++ ], ++ }, ++ }, ++ ++ { ++ 'target_name': 'ffmpeg_original', + 'type': '<(ffmpeg_component)', + 'variables': { + # Path to platform configuration files. +--- src/third_party/icu/icu.gyp ++++ src/third_party/icu/icu.gyp +@@ -171,6 +171,37 @@ + }, { - 'target_name': 'ffmpegsumo', + 'target_name': 'icui18n', + 'type': 'none', -+ # No 'link_settings', ffmpegsumo is a 'loadable_module'. ++ 'toolsets': ['host', 'target'], ++ 'link_settings': { ++ 'libraries': [ ++ '-licui18n', ++ ], ++ }, ++ 'direct_dependent_settings': { ++ 'include_dirs': [ ++ 'source/i18n', ++ ], ++ }, ++ }, ++ { ++ 'target_name': 'icuuc', ++ 'type': 'none', ++ 'toolsets': ['host', 'target'], ++ 'link_settings': { ++ 'libraries': [ ++ '-licuuc', ++ ], ++ }, ++ 'direct_dependent_settings': { ++ 'include_dirs': [ ++ 'source/common', ++ ], ++ }, + }, + + { -+ 'target_name': 'ffmpegsumo_original', - 'type': 'loadable_module', ++ 'target_name': 'icui18n_original', + 'type': '<(component)', 'sources': [ - '<@(c_sources)', -@@ -429,6 +435,61 @@ - 'targets': [ + '<@(icui18n_sources)', +@@ -259,7 +288,7 @@ + ], # conditions + }, + { +- 'target_name': 'icuuc', ++ 'target_name': 'icuuc_original', + 'type': '<(component)', + 'sources': [ + '<@(icuuc_sources)', +--- src/ui/aura/aura.gyp ++++ src/ui/aura/aura.gyp +@@ -10,6 +10,17 @@ { - 'target_name': 'ffmpeg', + # GN version: //ui/aura + 'target_name': 'aura', + 'type': 'none', + 'link_settings': { + 'libraries': [ -+ '-lffmpeg', ++ '-laura', + ], + }, -+ 'direct_dependent_settings': { -+ 'defines': [ -+ '__STDC_CONSTANT_MACROS', # FFmpeg uses INT64_C. -+ ], -+ 'include_dirs': [ -+ '<(output_root)', -+ '../..', # The chromium 'src' directory. -+ '<(platform_config_root)', -+ '.', -+ ], -+ }, -+ 'variables': { -+ 'outfile_type': 'posix_stubs', -+ 'stubs_filename_root': 'ffmpeg_stubs', -+ 'project_path': 'third_party/ffmpeg', -+ 'intermediate_dir': '<(INTERMEDIATE_DIR)', -+ 'output_root': '<(SHARED_INTERMEDIATE_DIR)/ffmpeg', -+ 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)' -+ }, -+ 'actions': [ -+ { -+ 'action_name': 'generate_stubs', -+ 'inputs': [ -+ '<(generate_stubs_script)', -+ '<(extra_header)', -+ '<@(sig_files)', -+ ], -+ 'outputs': [ -+ '<(intermediate_dir)/<(stubs_filename_root).cc', -+ '<(output_root)/<(project_path)/<(stubs_filename_root).h', -+ ], -+ 'action': ['python', -+ '<(generate_stubs_script)', -+ '-i', '<(intermediate_dir)', -+ '-o', '<(output_root)/<(project_path)', -+ '-t', '<(outfile_type)', -+ '-e', '<(extra_header)', -+ '-s', '<(stubs_filename_root)', -+ '-p', '<(project_path)', -+ '<@(_inputs)', -+ ], -+ 'process_outputs_as_sources': 1, -+ 'message': 'Generating FFmpeg stubs for dynamic loading', -+ }, -+ ], + }, + + { -+ 'target_name': 'ffmpeg_original', - 'sources': [ - # Files needed for stub generation rules. - '<@(sig_files)', -@@ -536,32 +597,6 @@ - '.', - ], - }, -- 'actions': [ -- { -- 'action_name': 'generate_stubs', -- 'inputs': [ -- '<(generate_stubs_script)', -- '<(extra_header)', -- '<@(sig_files)', -- ], -- 'outputs': [ -- '<(intermediate_dir)/<(stubs_filename_root).cc', -- '<(output_root)/<(project_path)/<(stubs_filename_root).h', -- ], -- 'action': ['python', -- '<(generate_stubs_script)', -- '-i', '<(intermediate_dir)', -- '-o', '<(output_root)/<(project_path)', -- '-t', '<(outfile_type)', -- '-e', '<(extra_header)', -- '-s', '<(stubs_filename_root)', -- '-p', '<(project_path)', -- '<@(_inputs)', -- ], -- 'process_outputs_as_sources': 1, -- 'message': 'Generating FFmpeg stubs for dynamic loading', -- }, -- ], - 'conditions': [ - # Linux/Solaris need libdl for dlopen() and friends. - ['OS == "linux" or OS == "solaris"', { ++ # GN version: //ui/aura ++ 'target_name': 'aura_original', + 'type': '<(component)', + 'dependencies': [ + '../../base/base.gyp:base', --- src/ui/base/ui_base.gyp +++ src/ui/base/ui_base.gyp -@@ -11,6 +11,26 @@ +@@ -10,6 +10,25 @@ { # GN version: //ui/base 'target_name': 'ui_base', @@ -782,7 +768,6 @@ BUG=XWALK-2571 + 'dependencies': [ + '../../net/net.gyp:net', + '../gfx/gfx.gyp:gfx', -+ '../accessibility/accessibility.gyp:ax_gen', + ], + 'export_dependent_settings': [ + '../../net/net.gyp:net', @@ -862,6 +847,32 @@ BUG=XWALK-2571 'type': '<(component)', 'product_name': 'gl_wrapper', # Avoid colliding with OS X's libGL.dylib 'dependencies': [ +--- src/ui/views/views.gyp ++++ src/ui/views/views.gyp +@@ -570,6 +570,23 @@ + { + # GN version: //ui/views + 'target_name': 'views', ++ 'type': 'none', ++ 'link_settings': { ++ 'libraries': [ ++ '-lviews', ++ ], ++ }, ++ 'dependencies': [ ++ '../accessibility/accessibility.gyp:ax_gen', ++ ], ++ 'export_dependent_settings': [ ++ '../accessibility/accessibility.gyp:ax_gen', ++ ], ++ }, # target_name: views ++ ++ { ++ # GN version: //ui/views ++ 'target_name': 'views_original', + 'type': '<(component)', + 'dependencies': [ + '../../base/base.gyp:base', --- src/ui/wm/wm.gyp +++ src/ui/wm/wm.gyp @@ -10,6 +10,17 @@ diff --git a/tizen_src/packaging/chromium-efl-libs.spec b/tizen_src/packaging/chromium-efl-libs.spec index 44a146f..5313323 100644 --- a/tizen_src/packaging/chromium-efl-libs.spec +++ b/tizen_src/packaging/chromium-efl-libs.spec @@ -5,7 +5,7 @@ %define _binary_payload w3.gzdio Name: chromium-efl-libs -%define ChromiumVersion 42.2311.0 +%define ChromiumVersion 44.2403.0 %define Week 11 Version: %{ChromiumVersion}.%{Week} Release: 1 @@ -40,7 +40,7 @@ BuildRequires: perl BuildRequires: which BuildRequires: yasm BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gles20) @@ -237,7 +237,7 @@ export GYP_GENERATORS="dump_dependency_json,ninja" # what crosswalk-bin.spec does. We want the Chromium dependencies that those # targets need to build all the shared libraries we have to package. NINJA_TARGETS="chromium-ewk xwalk xwalk_application_tools" -DEPENDENCIES=`python %{SOURCE1002} dump.json ${NINJA_TARGETS}` +DEPENDENCIES=`python %{SOURCE1002} %{OUTPUT_BASE_FOLDER}/dump.json ${NINJA_TARGETS}` %ifarch %{arm} tizen_src/build/prebuild/ninja.arm %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \ diff --git a/tizen_src/packaging/crosswalk-bin.spec b/tizen_src/packaging/crosswalk-bin.spec index 2fe6f9b..71c77ad 100644 --- a/tizen_src/packaging/crosswalk-bin.spec +++ b/tizen_src/packaging/crosswalk-bin.spec @@ -5,7 +5,7 @@ %define _binary_payload w3.gzdio Name: crosswalk-bin -Version: 14.42.333.0 +Version: 15.44.2403.0 Release: 0 Summary: Chromium-based app runtime License: (BSD-3-Clause and LGPL-2.1+) -- 2.7.4