From 7b7460fa96d85069304425510818e9ab5a9bc014 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Wed, 2 Mar 2016 14:28:50 +0900 Subject: [PATCH] Add ivi profile - Add IVI profile - Current this profile is same with MOBILE profile Change-Id: Iffe63132c14ee68097278304027f4d5f1890a652 --- build/tizen/adaptor-uv/Makefile.am | 44 +++++++++++++++++++++++++++++++++++++ build/tizen/adaptor-uv/configure.ac | 13 +++++++++-- build/tizen/adaptor/Makefile.am | 40 +++++++++++++++++++++++++++++++++ build/tizen/adaptor/configure.ac | 9 ++++++-- packaging/dali-adaptor.spec | 9 ++++++++ 5 files changed, 111 insertions(+), 4 deletions(-) diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am index f05baca..3c06074 100644 --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -234,6 +234,32 @@ endif # WAYLAND endif +# IVI +if IVI_PROFILE + +adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ + $(adaptor_common_internal_mobile_profile_src_files) \ + $(adaptor_tizen_internal_src_files) \ + $(static_libraries_libunibreak_src_files) + +if WAYLAND +if USE_ECORE_WAYLAND +adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) +else +adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files)\ + $(adaptor_tizen_internal_native_image_src_files) + +else +adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) +endif # WAYLAND + +endif # IVI_PROFILE + + # Node JS support for using an external libuv main loop. If not enabled then just use e-core as normal # Used for things like callbacks, file-monintors, x input handling if LIB_UV_EVENT_LOOP @@ -397,6 +423,11 @@ libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS) libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS) endif +if IVI_PROFILE +libdali_adaptor_uv_la_CXXFLAGS += $(ECORE_WAYLAND_CFLAGS) +libdali_adaptor_uv_la_LIBADD += $(ECORE_WAYLAND_LIBS) +endif + endif if USE_APPFW @@ -457,6 +488,19 @@ libdali_adaptor_uv_la_CXXFLAGS += $(HAPTIC_CFLAGS) libdali_adaptor_uv_la_LIBADD += endif +if IVI_PROFILE +libdali_adaptor_uv_la_CXXFLAGS += \ + $(DEVICED_CFLAGS) \ + $(EFL_ASSIST_CFLAGS) \ + $(NATIVE_BUFFER_CFLAGS) \ + $(NATIVE_BUFFER_POOL_CFLAGS) + +libdali_adaptor_uv_la_LIBADD += \ + $(EFL_ASSIST_LIBS) \ + $(NATIVE_BUFFER_LIBS) \ + $(NATIVE_BUFFER_POOL_LIBS) +endif + if UBUNTU_PROFILE libdali_adaptor_uv_la_LIBADD += -ljpeg CFLAGS += -fPIC diff --git a/build/tizen/adaptor-uv/configure.ac b/build/tizen/adaptor-uv/configure.ac index dad8f61..c2a125b 100644 --- a/build/tizen/adaptor-uv/configure.ac +++ b/build/tizen/adaptor-uv/configure.ac @@ -189,13 +189,13 @@ AC_ARG_WITH([tizen-2-2-compatibility], # Tizen Profile options AC_ARG_ENABLE([profile], - [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,UBUNTU], + [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,IVI,UBUNTU], [Select the variant of tizen])], [enable_profile=$enableval], [enable_profile=UBUNTU]) # Ensure valid profile selected -if test "x$enable_profile" != "xCOMMON" -a "x$enable_profile" != "xMOBILE" -a "x$enable_profile" != "xWEARABLE" -a "x$enable_profile" != "xTV" -a "x$enable_profile" != "xUBUNTU"; then +if test "x$enable_profile" != "xCOMMON" -a "x$enable_profile" != "xMOBILE" -a "x$enable_profile" != "xWEARABLE" -a "x$enable_profile" != "xTV" -a "x$enable_profile" != "xIVI" -a "x$enable_profile" != "xUBUNTU"; then AC_MSG_ERROR([$enable_profile is an invalid profile]) fi @@ -210,6 +210,7 @@ AM_CONDITIONAL([COMMON_PROFILE], [test x$enable_profile = xCOMMON]) AM_CONDITIONAL([MOBILE_PROFILE], [test x$enable_profile = xMOBILE]) AM_CONDITIONAL([WEARABLE_PROFILE], [test x$enable_profile = xWEARABLE]) AM_CONDITIONAL([TV_PROFILE], [test x$enable_profile = xTV]) +AM_CONDITIONAL([IVI_PROFILE], [test x$enable_profile = xIVI]) AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU]) AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) AM_CONDITIONAL([USE_EFL], [test x$enable_efl = xyes]) @@ -242,6 +243,10 @@ if test "x$enable_profile" = "xTV"; then PKG_CHECK_MODULES(OPENGLES20, glesv2) fi +if test "x$enable_profile" = "xIVI"; then +PKG_CHECK_MODULES(OPENGLES20, glesv2) +fi + if test "x$enable_profile" = "xUBUNTU"; then PKG_CHECK_MODULES(OPENGLES20, glesv2 egl) else @@ -290,6 +295,10 @@ if test "x$enable_profile" = "xMOBILE"; then PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) fi +if test "x$enable_profile" = "xIVI"; then +PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) +fi + fi # Using Wayland API directly ( main loop agnostic, typically for running on libuv) # wayland-extension-client include xdg-shell-client diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index cf80ebd..7a179b6 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -245,6 +245,33 @@ endif # WAYLAND endif +# IVI +if IVI_PROFILE + +adaptor_internal_src_files += $(adaptor_common_internal_src_files) \ + $(adaptor_common_internal_mobile_profile_src_files) \ + $(adaptor_tizen_internal_src_files) \ + $(static_libraries_libunibreak_src_files) + +if WAYLAND + +if USE_ECORE_WAYLAND +adaptor_internal_src_files += $(adaptor_ecore_wayland_tizen_internal_src_files) +else +adaptor_internal_src_files += $(adaptor_wayland_tizen_internal_src_files) +endif # USE_ECORE_WAYLAND + +adaptor_internal_src_files += $(adaptor_tizen_internal_egl_extension_src_files) \ + $(adaptor_tizen_internal_native_image_src_files) +else +adaptor_internal_src_files += $(adaptor_x11_tizen_internal_src_files) \ + $(adaptor_common_internal_egl_extension_src_files) +endif # WAYLAND + +endif # IVI_PROFILE + + + # Node JS support for using an external libuv main loop. If not enabled then just use e-core as normal # Used for things like callbacks, file-monintors, x input handling if LIB_UV_EVENT_LOOP @@ -466,6 +493,19 @@ libdali_adaptor_la_CXXFLAGS += $(HAPTIC_CFLAGS) libdali_adaptor_la_LIBADD += endif +if IVI_PROFILE +libdali_adaptor_la_CXXFLAGS += \ + $(DEVICED_CFLAGS) \ + $(EFL_ASSIST_CFLAGS) \ + $(NATIVE_BUFFER_CFLAGS) \ + $(NATIVE_BUFFER_POOL_CFLAGS) + +libdali_adaptor_la_LIBADD += \ + $(EFL_ASSIST_LIBS) \ + $(NATIVE_BUFFER_LIBS) \ + $(NATIVE_BUFFER_POOL_LIBS) +endif + if UBUNTU_PROFILE libdali_adaptor_la_LIBADD += -ljpeg CFLAGS += -fPIC diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index 4037024..e9f3994 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -171,13 +171,13 @@ AC_ARG_WITH([tizen-2-2-compatibility], # Tizen Profile options AC_ARG_ENABLE([profile], - [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,UBUNTU], + [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,IVI,UBUNTU], [Select the variant of tizen])], [enable_profile=$enableval], [enable_profile=UBUNTU]) # Ensure valid profile selected -if test "x$enable_profile" != "xCOMMON" -a "x$enable_profile" != "xMOBILE" -a "x$enable_profile" != "xWEARABLE" -a "x$enable_profile" != "xTV" -a "x$enable_profile" != "xUBUNTU"; then +if test "x$enable_profile" != "xCOMMON" -a "x$enable_profile" != "xMOBILE" -a "x$enable_profile" != "xWEARABLE" -a "x$enable_profile" != "xTV" -a "x$enable_profile" != "xIVI" -a "x$enable_profile" != "xUBUNTU"; then AC_MSG_ERROR([$enable_profile is an invalid profile]) fi @@ -192,6 +192,7 @@ AM_CONDITIONAL([COMMON_PROFILE], [test x$enable_profile = xCOMMON]) AM_CONDITIONAL([MOBILE_PROFILE], [test x$enable_profile = xMOBILE]) AM_CONDITIONAL([WEARABLE_PROFILE], [test x$enable_profile = xWEARABLE]) AM_CONDITIONAL([TV_PROFILE], [test x$enable_profile = xTV]) +AM_CONDITIONAL([IVI_PROFILE], [test x$enable_profile = xIVI]) AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU]) AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) AM_CONDITIONAL([USE_EFL], [test x$enable_efl = xyes]) @@ -233,6 +234,10 @@ if test "x$enable_profile" = "xTV"; then PKG_CHECK_MODULES(OPENGLES20, glesv2) fi +if test "x$enable_profile" = "xIVI"; then +PKG_CHECK_MODULES(OPENGLES20, glesv2) +fi + if test "x$enable_profile" = "xUBUNTU"; then PKG_CHECK_MODULES(OPENGLES20, glesv2 egl) else diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 55e9580..4c12438 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -67,6 +67,15 @@ BuildRequires: pkgconfig(appcore-watch) %define gles_requirement_setup 1 %endif +%if "%{profile}" == "ivi" +%define dali_profile IVI +%define dali_feedback_plugin 0 +%define dali_videoplayer_plugin 1 +%define shaderbincache_flag DISABLE +BuildRequires: pkgconfig(glesv2) +%define gles_requirement_setup 1 +%endif + %if "%{profile}" == "common" %define dali_profile COMMON %define dali_feedback_plugin 0 -- 2.7.4