From acba26a1e10d514ca80b5012f0d5c255f0203eee Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 17 May 2017 13:38:20 +0900 Subject: [PATCH] Remove profile build dependencies - From Tizen 4.0, profile dependent build is not allowed. So, removed profile macro in .spec file and configure.ac file. Change-Id: Id8f62eafb78ea87704e00577ffbbf3ecc1d52046 Signed-off-by: Seoyeon Kim --- build/tizen/configure.ac | 4 ++-- packaging/dali-toolkit.spec | 18 +----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac index f12ab89..80e4a8f 100755 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -89,7 +89,7 @@ fi # Tizen Profile options AC_ARG_ENABLE([profile], - [AC_HELP_STRING([--enable-profile=UBUNTU,MOBILE,WEARABLE,TV], + [AC_HELP_STRING([--enable-profile=UBUNTU,TIZEN], [Select the variant of tizen])], [dali_profile=$enableval], [dali_profile=UBUNTU]) @@ -102,7 +102,7 @@ AC_ARG_WITH(style, [dali_style=480x800]) # Ensure valid profile selected -if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xMOBILE" -a "x$dali_profile" != "xWEARABLE" -a "x$dali_profile" != "xTV" ; then +if test "x$dali_profile" != "xUBUNTU" -a "x$dali_profile" != "xTIZEN"; then AC_MSG_ERROR([$enable_profile is an invalid profile]) fi diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index dca59a9..b389379 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -34,21 +34,6 @@ BuildRequires: pkgconfig(libtzplatform-config) %define profile %{tizen_profile_name} %endif -%if "%{profile}" == "mobile" -%define dali_toolkit_profile MOBILE -%define dali_style_folder 720x1280 -# dali_style to be provided by build system as with dali_toolkit_profile or by passing --define 'dali_style 470x800' to the rpm build command -%endif - -%if "%{profile}" == "tv" -%define dali_toolkit_profile TV -%define dali_style_folder 1920x1080 -%endif - -%if "%{?dali_style}" - %define dali_style_folder %{dali_style} -%endif - %description The OpenGLES Canvas Core Library Toolkit - a set of controls that provide user interface functionality. @@ -144,8 +129,7 @@ autoreconf --install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR -%configure --enable-profile=%{dali_toolkit_profile} \ - --with-style=%{dali_style_folder} \ +%configure --enable-profile=TIZEN \ %if 0%{?enable_debug} --enable-debug \ %endif -- 2.7.4