Add Build Option to enable/disable audio_session_manager support

diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 485853f..2332a41 100644 (file)
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -619,7 +619,11 @@
 #define ENABLE_TIZEN_WEBKIT2_TILED_AC_DONT_ADJUST_COVER_RECT 1 /* Eunsol Park(eunsol47.park@samsung.
 com) : Patch to do not adjust cover rect as fixed pixel size*/
 #define ENABLE_TIZEN_GSTREAMER_VIDEO 1 /* Kwangyong Choi : Fixed media control display when using gstreamer video */
+#if ENABLE(TIZEN_AUDIO_SESSION_MANAGER)
 #define ENABLE_TIZEN_GSTREAMER_AUDIO 1 /* Keonho Kim : Audio session manager for media element */
+#else
+#define ENABLE_TIZEN_GSTREAMER_AUDIO 0
+#endif
 
 #define ENABLE_TIZEN_PREFERENCE 1 /* Eunmi Lee(eunmi15.lee@samsung.com) : for slp specific preferences */
 #define ENABLE_TIZEN_LOAD_REMOTE_IMAGES 1 /* Dongjae Kim(dongjae1.kim@samsung.com) : for tizen remode image load setting */

diff --git a/Source/WebCore/PlatformTizen.cmake b/Source/WebCore/PlatformTizen.cmake
index fdd1ed6..39a3af0 100755 (executable)
--- a/Source/WebCore/PlatformTizen.cmake
+++ b/Source/WebCore/PlatformTizen.cmake
@@ -12,7 +12,6 @@ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/platform/graphics/surfaces/tizen"
     "${WEBCORE_DIR}/platform/graphics/texmap/tizen"
     "${WEBCORE_DIR}/platform/mediastream/tizen"
-    ${ASM_INCLUDE_DIRS}
     ${CAPI_INCLUDE_DIRS}
     ${ELEMENTARY_INCLUDE_DIRS}
     ${ENCHANT_INCLUDE_DIRS}
@@ -22,15 +21,19 @@ LIST(APPEND WebCore_INCLUDE_DIRECTORIES
     ${LevelDB_INCLUDE_DIRS}
     ${LevelDB-MemEnv_INCLUDE_DIRS}
     ${Libavcodec_INCLUDE_DIR}
-    ${MMSOUND_INCLUDE_DIRS}
-    ${MM-Player_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIRS}
     ${Pmapi_INCLUDE_DIRS}
-    ${SESSION_INCLUDE_DIRS}
     ${VConf_INCLUDE_DIRS}
     ${feedback_INCLUDE_DIR}
 )
-
+IF (ENABLE_TIZEN_AUDIO_SESSION_MANAGER)
+    LIST(APPEND WebCore_INCLUDE_DIRECTORIES
+    ${ASM_INCLUDE_DIRS}
+    ${MMSOUND_INCLUDE_DIRS}
+    ${MM-Player_INCLUDE_DIRS}
+    ${SESSION_INCLUDE_DIRS}
+    )
+ENDIF()
 IF (WTF_PLATFORM_X11)
     LIST(APPEND WebCore_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/platform/graphics/surfaces/x"
@@ -42,8 +45,16 @@ ELSEIF (WTF_PLATFORM_WAYLAND)
     )
 ENDIF ()
 
-LIST(APPEND WebCore_LIBRARIES
+IF (ENABLE_TIZEN_AUDIO_SESSION_MANAGER)
+    LIST(APPEND WebCore_LIBRARIES
     ${ASM_LIBRARIES}
+    ${MMSOUND_LIBRARIES}
+    ${MM-Player_LIBRARIES}
+    ${SESSION_LIBRARIES}
+    )
+ENDIF()
+
+LIST(APPEND WebCore_LIBRARIES
     ${CAPI_LIBRARIES}
     ${ELEMENTARY_LIBRARIES}
     ${ENCHANT_LIBRARIES}
@@ -53,11 +64,8 @@ LIST(APPEND WebCore_LIBRARIES
     ${LevelDB_LIBRARIES}
     ${LevelDB-MemEnv_LIBRARIES}
     ${Libavcodec_LIBS}
-    ${MMSOUND_LIBRARIES}
-    ${MM-Player_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${Pmapi_LIBRARIES}
-    ${SESSION_LIBRARIES}
     ${VConf_LIBRARIES}
     ${feedback_LIBRARY}
 )

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index 0b505d0..6bd5d9b 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -111,6 +111,8 @@ WEBKIT_OPTION_DEFINE(ENABLE_TIZEN_WEBKIT2 "Enable Tizen WebKit2 feature" ON)
 WEBKIT_OPTION_DEFINE(ENABLE_TIZEN_GESTURE "Use Gesture which uses elm_gesture_layer" ON)
 WEBKIT_OPTION_DEFINE(ENABLE_TIZEN_WEBKIT2_FORM_DATABASE "Support for Remember Form on tizen webkit2" ON)
 WEBKIT_OPTION_DEFINE(ENABLE_TIZEN_WEBKIT2_TEXT_SELECTION "Text selection in WebKit 2" ON)
+WEBKIT_OPTION_DEFINE(ENABLE_TIZEN_AUDIO_SESSION_MANAGER "Audio Session Manager Support" OFF)
+
 
 #--------------------------------------------------------------------------------------
 # Enabled WebKit Features for Tizen or Tizen Specific Features.
@@ -328,11 +330,14 @@ IF (ENABLE_WEB_AUDIO)
     SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ENABLE_TIZEN_WEB_AUDIO")
     ADD_DEFINITIONS(-DENABLE_TIZEN_WEB_AUDIO=1)
 
-       IF(GST_API_VERSION_1)
+    IF (ENABLE_TIZEN_AUDIO_SESSION_MANAGER)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_AUDIO_SESSION_MANAGER=1)
+    ENDIF ()
+    IF(GST_API_VERSION_1)
     SET(GSTREAMER_COMPONENTS app pbutils)
-       ELSE ()
+    ELSE ()
     SET(GSTREAMER_COMPONENTS app interfaces pbutils)
-       ENDIF()
+    ENDIF()
     SET(WTF_USE_GSTREAMER 1)
     ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
 
@@ -358,16 +363,17 @@ IF (ENABLE_WEB_AUDIO)
 ENDIF ()
 
 IF (ENABLE_VIDEO)
-       IF(GST_API_VERSION_1)
+    IF(GST_API_VERSION_1)
     SET(GSTREAMER_COMPONENTS app pbutils video)
-       ELSE ()
+    ELSE ()
     SET(GSTREAMER_COMPONENTS app interfaces pbutils video)
-       ENDIF ()
+    ENDIF ()
     FIND_PACKAGE(GStreamer REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
+    IF (ENABLE_TIZEN_AUDIO_SESSION_MANAGER)
     FIND_PACKAGE(ASM REQUIRED)
     FIND_PACKAGE(SESSION REQUIRED)
     FIND_PACKAGE(MMSOUND REQUIRED)
-
+    ENDIF ()
     SET(WTF_USE_GSTREAMER 1)
     ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
 ENDIF()

diff --git a/packaging/webkit2-efl.spec b/packaging/webkit2-efl.spec
index 67d8744..bb8055f 100644 (file)
--- a/packaging/webkit2-efl.spec
+++ b/packaging/webkit2-efl.spec
@@ -51,8 +51,10 @@ BuildRequires: pkgconfig(libxslt)
 BuildRequires: pkgconfig(location)
 BuildRequires: pkgconfig(mmutil-imgp)
 BuildRequires: pkgconfig(mmutil-jpeg)
+%if %{with audio_session_manager}
 BuildRequires: pkgconfig(mm-session)
 BuildRequires: pkgconfig(mm-sound)
+%endif
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(utilX)
 BuildRequires: pkgconfig(vconf)
@@ -160,6 +162,9 @@ then
        -DENABLE_WEBKIT=Off \
        -DENABLE_WEBKIT2=On \
        -DENABLE_ALLINONE=On \
+%if %{with audio_session_manager}
+       -DENABLE_TIZEN_AUDIO_SESSION_MANAGER=On \
+%endif
        -DENABLE_TIZEN_SCREEN_READER=Off \
        -DEFL_TARGET=%{EFL_TARGET} \
        -DDefaultTheme_RESOURCE_NAME=webkit.edj \