From 134a941dba34d4ae544a4cc7a73a37bb614562a1 Mon Sep 17 00:00:00 2001 From: Venugopal S M Date: Sun, 15 Feb 2015 01:54:08 +0900 Subject: [PATCH] Revert "Remove ffmpeg dependency" FFT is used for Analyzing WebAudio track. It requires FFMPEG. This reverts commit f8d73fd6fe9b0a579d668667f3891a3bb6e8c03e. This also fixes the renderer crash issue in some webaudio site. Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=11414 Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=10516 Change-Id: I93c75a7e6ae55761ddd16ca92c32dbce64ea6623 Signed-off-by: Venugopal S M --- tizen_src/build/gyp_chromiumefl.sh | 1 - tizen_src/packaging/chromium-efl.spec | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh index 43664de..0dd2ad5 100755 --- a/tizen_src/build/gyp_chromiumefl.sh +++ b/tizen_src/build/gyp_chromiumefl.sh @@ -47,7 +47,6 @@ COMMON_GYP_PARAMETERS=" -Duse_openssl=1 -Duse_openssl_certs=1 -Dtoolkit_uses_gtk=0 - -Dbuild_ffmpegsumo=0 " if [[ $BUILD_CONTENT_SHELL == 1 ]]; then COMMON_GYP_PARAMETERS+="-Dchromium_efl_library_type=static_library" diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec index 8beb710..7ff1bff 100644 --- a/tizen_src/packaging/chromium-efl.spec +++ b/tizen_src/packaging/chromium-efl.spec @@ -254,7 +254,7 @@ ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" angle_unittests env_chromium_unittests url_unittests sandbox_linux_unittests crypto_unittests sql_unittests accessibility_unittests \ gfx_unittests printing_unittests events_unittests ppapi_unittests jingle_unittests \ flip_in_mem_edsm_server_unittests breakpad_unittests dbus_unittests libphonenumber_unittests \ - base_unittests gin_unittests net_unittests snapshot_unittests \ + base_unittests ffmpeg_unittests gin_unittests net_unittests snapshot_unittests \ google_apis_unittests # TODO: Fix compilation of the following tests content_unittests cc_unittests shell_dialogs_unittests # gpu_unittests compositor_unittests media_unittests @@ -301,6 +301,7 @@ install -m 0755 "%{OUTPUT_FOLDER}"/locales/*.pak "%{buildroot}%{CHROMIUM_EX install -m 0755 "%{OUTPUT_FOLDER}"/lib/libchromium-efl.so "%{buildroot}"%{_libdir} install -m 0755 "%{OUTPUT_FOLDER}"/lib/libchromium-ewk.so "%{buildroot}"%{_libdir} +install -m 0755 "%{OUTPUT_FOLDER}"/libffmpegsumo.so "%{buildroot}%{CHROMIUM_EXE_DIR}" install -m 0755 "%{OUTPUT_FOLDER}"/efl_webprocess "%{buildroot}%{CHROMIUM_EXE_DIR}" install -m 0755 "%{OUTPUT_FOLDER}"/icudtl.dat "%{buildroot}%{CHROMIUM_EXE_DIR}" install -m 0755 "%{OUTPUT_FOLDER}"/content_shell.pak "%{buildroot}%{CHROMIUM_EXE_DIR}" @@ -368,6 +369,7 @@ chown -R app:app %{CHROMIUM_WEBDB_DIR}/data %{_libdir}/libchromium-efl.so %{_libdir}/libchromium-ewk.so %{CHROMIUM_EXE_DIR}/efl_webprocess +%{CHROMIUM_EXE_DIR}/libffmpegsumo.so %{CHROMIUM_EXE_DIR}/icudtl.dat %{CHROMIUM_EXE_DIR}/content_shell.pak %{CHROMIUM_EXE_DIR}/locales/*.pak -- 2.7.4