From d5b7eabbbb33ffe46371cb7061996d33cf66eb93 Mon Sep 17 00:00:00 2001 From: taeyoon Date: Tue, 9 Aug 2016 17:31:08 +0900 Subject: [PATCH 1/1] Revert "[3.0] Fix ivi build error" This reverts commit ddf2576e6cc88dac47d66cb466f75401c3d313fe. Change-Id: Ifff9970d99eb0c61b0326266a3460d3f126b58c3 --- 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, 4 insertions(+), 117 deletions(-) diff --git a/build/tizen/adaptor-uv/Makefile.am b/build/tizen/adaptor-uv/Makefile.am index c4f9ee7..d0e0b26 100644 --- a/build/tizen/adaptor-uv/Makefile.am +++ b/build/tizen/adaptor-uv/Makefile.am @@ -88,10 +88,6 @@ 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 @@ -238,32 +234,6 @@ 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 @@ -434,11 +404,6 @@ 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 @@ -499,19 +464,6 @@ 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 615cc9d..b81e4a9 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,IVI,UBUNTU], + [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,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" != "xIVI" -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" != "xUBUNTU"; then AC_MSG_ERROR([$enable_profile is an invalid profile]) fi @@ -210,7 +210,6 @@ 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]) @@ -243,10 +242,6 @@ 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 @@ -300,9 +295,6 @@ 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 530d4cb..299e638 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -88,10 +88,6 @@ 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 @@ -242,33 +238,6 @@ 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 @@ -490,19 +459,6 @@ 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 e9f3994..4037024 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,IVI,UBUNTU], + [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,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" != "xIVI" -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" != "xUBUNTU"; then AC_MSG_ERROR([$enable_profile is an invalid profile]) fi @@ -192,7 +192,6 @@ 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]) @@ -234,10 +233,6 @@ 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 1098ed8..d50bd53 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -60,14 +60,6 @@ BuildRequires: pkgconfig(appcore-watch) %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