From 9df67ab02259b7979a19ad229c620c7622fe154c Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 19 Apr 2016 13:48:41 +0900 Subject: [PATCH] [3.0] Fix ivi build error This reverts commit 945ca1f0098463f34cd79ccbddd391b2ee5a3cac. Change-Id: Ie8df2261fbcf50d01f30c2c9b07ea5997a72d797 --- build/tizen/adaptor-uv/Makefile.am | 48 +++++++++++++++++++++++++++++++++++++ build/tizen/adaptor-uv/configure.ac | 12 ++++++++-- build/tizen/adaptor/Makefile.am | 44 ++++++++++++++++++++++++++++++++++ build/tizen/adaptor/configure.ac | 9 +++++-- packaging/dali-adaptor.spec | 8 +++++++ 5 files changed, 117 insertions(+), 4 deletions(-) diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am index 15e2cf3..7346cd3 100644 --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -88,6 +88,10 @@ adaptor_tv_dir = ../../../adaptors/tv include ../../../adaptors/tv/file.list endif +# IVI +adaptor_mobile_dir = ../../../adaptors/mobile +include ../../../adaptors/mobile/file.list + # Public API adaptor_public_api_dir = ../../../adaptors/public-api include ../../../adaptors/public-api/file.list @@ -234,6 +238,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 @@ -404,6 +434,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 @@ -460,6 +495,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 ee79085..5234155 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=COMMON]) # 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 @@ -295,6 +300,9 @@ fi if test "x$enable_profile" = "xCOMMON"; 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) diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index d2c80a3..0edd56e 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -88,6 +88,10 @@ adaptor_tv_dir = ../../../adaptors/tv include ../../../adaptors/tv/file.list endif +# IVI +adaptor_mobile_dir = ../../../adaptors/mobile +include ../../../adaptors/mobile/file.list + # Public API adaptor_public_api_dir = ../../../adaptors/public-api include ../../../adaptors/public-api/file.list @@ -235,6 +239,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 @@ -452,6 +483,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 7fee548..3e54007 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -172,13 +172,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=COMMON]) # 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 @@ -193,6 +193,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]) @@ -225,6 +226,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 6cdcb9e..2ef3c31 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -55,6 +55,14 @@ BuildRequires: pkgconfig(gles20) %define gles_requirement_setup 1 %endif +%if "%{profile}" == "ivi" +%define dali_profile IVI +%define dali_feedback_plugin 0 +%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