From: Adeel Kazmi Date: Fri, 3 May 2019 13:52:52 +0000 (+0000) Subject: Merge "Remove CXX03 Build & old Tizen Version Builds" into devel/master X-Git-Tag: dali_1.4.19~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=34aec01c5e704ac218b08d007426da6f941b801e;hp=0227b3a0b65bfdf1c5e1cad971cc018efca1055f Merge "Remove CXX03 Build & old Tizen Version Builds" into devel/master --- diff --git a/build/tizen/adaptor/Makefile.am b/build/tizen/adaptor/Makefile.am index de67a78..ef77c19 100644 --- a/build/tizen/adaptor/Makefile.am +++ b/build/tizen/adaptor/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Samsung Electronics Co., Ltd. +# Copyright (c) 2019 Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,11 +24,7 @@ include ./module.list pkgconfigdir = $(libdir)/pkgconfig -if ENABLE_CXX03_ABI -pkgconfig_DATA = dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc -else pkgconfig_DATA = dali-adaptor.pc dali-adaptor-integration.pc -endif # sources if UBUNTU_PROFILE @@ -644,19 +640,6 @@ packagedoxydir = $(devincludepath)/dali/doc packagedoxy_HEADERS = $(package_doxy_files) - -if ENABLE_CXX03_ABI - -lib_LTLIBRARIES = libdali-adaptor.la - -libdali_adaptor_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES) -libdali_adaptor_la_includes = $(LIBDALI_ADAPTOR_LA_INCLUDES) -libdali_adaptor_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS) -libdali_adaptor_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS) -libdali_adaptor_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD) - -else - lib_LTLIBRARIES = libdali-adaptor-cxx11.la libdali_adaptor_cxx11_la_SOURCES = $(LIBDALI_ADAPTOR_LA_SOURCES) @@ -665,8 +648,6 @@ libdali_adaptor_cxx11_la_CFLAGS = $(LIBDALI_ADAPTOR_LA_CFLAGS) libdali_adaptor_cxx11_la_CXXFLAGS = $(LIBDALI_ADAPTOR_LA_CXXFLAGS) libdali_adaptor_cxx11_la_LIBADD = $(LIBDALI_ADAPTOR_LA_LIBADD) -endif - # linking test noinst_PROGRAMS = linker.test @@ -687,21 +668,6 @@ linker_test_LDADD = \ $(HARFBUZZ_LIBS) \ -L${prefix}/lib -if ENABLE_CXX03_ABI - -linker_test_LDADD += libdali-adaptor.la -linker_test_DEPENDENCIES = libdali-adaptor.la - -if ENABLE_RENAME_SO -#rename -install: install-am - rm -rf $(libdir)/libdali-adaptor.so - rm -rf $(libdir)/libdali-adaptor-cxx03.so - ln -s $(libdir)/libdali-adaptor.so.0.0.* $(libdir)/libdali-adaptor-cxx03.so -endif - -else - linker_test_LDADD += libdali-adaptor-cxx11.la linker_test_DEPENDENCIES = libdali-adaptor-cxx11.la @@ -713,4 +679,3 @@ install: install-am ln -s $(libdir)/libdali-adaptor-cxx11.so.0.0.* $(libdir)/libdali-adaptor.so endif -endif diff --git a/build/tizen/adaptor/configure.ac b/build/tizen/adaptor/configure.ac index 95384a3..a2a542b 100644 --- a/build/tizen/adaptor/configure.ac +++ b/build/tizen/adaptor/configure.ac @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Samsung Electronics Co., Ltd. +# Copyright (c) 2019 Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -69,11 +69,7 @@ fi AC_SUBST(DALI_ELDBUS_AVAILABLE) -if test "x$enable_cxx03_abi" = "xyes"; then -PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl-deprecated, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] ) -else PKG_CHECK_MODULES(TPKP_CURL, tpkp-curl, [ tpkp_curl_available=yes ], [ tpkp_curl_available=no ] ) -fi if test "x$tpkp_curl_available" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DTPK_CURL_ENABLED " @@ -142,13 +138,6 @@ AC_ARG_ENABLE([appfw], [enable_appfw=$enableval], [enable_appfw=no]) -# Option to allow building with Tizen SDK 2.2 -AC_ARG_WITH([tizen-2-2-compatibility], - [AC_HELP_STRING([--with-tizen-2-2-compatibility], - [Use Tizen SDK 2.2 compatibility])], - [with_tizen_2_2_compatibility=$withval], - [with_tizen_2_2_compatibility=no]) - # Tizen Profile options AC_ARG_ENABLE([profile], [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV,IVI,UBUNTU], @@ -178,12 +167,6 @@ AC_ARG_ENABLE(ecore_wayland2, enable_ecore_wayland2=yes, enable_ecore_wayland2=no) -AC_ARG_ENABLE([cxx03_abi], - [AC_HELP_STRING([--enable-cxx03-abi], - [Specify abi for the build])], - [enable_cxx03_abi=$enableval], - [enable_cxx03_abi=no]) - AC_ARG_ENABLE([rename_so], [AC_HELP_STRING([--enable-rename-so], [Specify whether so file is renamed or not])], @@ -201,7 +184,6 @@ AM_CONDITIONAL([UBUNTU_PROFILE], [test x$enable_profile = xUBUNTU]) AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) AM_CONDITIONAL([ECORE_WAYLAND2], [test x$enable_ecore_wayland2 = xyes]) AM_CONDITIONAL([USE_APPFW], [test x$enable_appfw = xyes]) -AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes]) AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes]) # Platforms with highp shader support can use vector based text @@ -228,11 +210,7 @@ if test "x$enable_profile" = "xLITE"; then PKG_CHECK_MODULES(OPENGLES20, gles20) fi -if test "x$enable_cxx03_abi" = "xyes"; then -PKG_CHECK_MODULES(DALICORE, dali-core-cxx03) -else PKG_CHECK_MODULES(DALICORE, dali-core) -fi if test "x$enable_profile" = "xWEARABLE"; then PKG_CHECK_MODULES(OPENGLES20, glesv2) @@ -257,15 +235,9 @@ if test "x$enable_profile" = "xUBUNTU"; then PKG_CHECK_MODULES(OPENGLES20, glesv2 egl) else -if test "x$enable_cxx03_abi" = "xyes"; then - DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" -fi - PKG_CHECK_MODULES(DLOG, dlog) PKG_CHECK_MODULES(TTS, tts) PKG_CHECK_MODULES(VCONF, vconf) - -if test "x$with_tizen_2_2_compatibility" = "xno"; then PKG_CHECK_MODULES(CAPI_SYSTEM_INFO, capi-system-info) PKG_CHECK_MODULES(CAPI_SYSTEM_SENSOR, capi-system-sensor, [ capi_system_sensor_support=yes ], [ capi_system_sensor_support=no ] ) @@ -273,8 +245,6 @@ if test "x$capi_system_sensor_support" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DCAPI_SYSTEM_SENSOR_SUPPORT" fi -fi - fi # ubuntu profile test if test "x$enable_appfw" = "xyes"; then @@ -354,13 +324,11 @@ AC_SUBST(tizenPlatformConfigSupported) devincludepath=${includedir} AC_SUBST(devincludepath) -AC_CONFIG_FILES([Makefile]) - -if test "x$enable_cxx03_abi" = "xyes"; then -AC_CONFIG_FILES([dali-adaptor-cxx03.pc dali-adaptor-integration-cxx03.pc]) -else -AC_CONFIG_FILES([dali-adaptor.pc dali-adaptor-integration.pc]) -fi +AC_CONFIG_FILES([ + Makefile + dali-adaptor.pc + dali-adaptor-integration.pc +]) if test "x$freetype_bitmap_support" = "xyes"; then DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DFREETYPE_BITMAP_SUPPORT" @@ -380,7 +348,6 @@ Configuration Profile: $enable_profile Data Dir (Read/Write): $dataReadWriteDir Data Dir (Read Only): $dataReadOnlyDir - Tizen SDK 2.2 compatibility: $with_tizen_2_2_compatibility EldBus: $eldbus_available Shader Binary Cache: $enable_shaderbincache Ecore Version At Least 1.13.0 $ecore_imf_1_13 diff --git a/build/tizen/adaptor/dali-adaptor-cxx03.pc.in b/build/tizen/adaptor/dali-adaptor-cxx03.pc.in deleted file mode 100644 index edf75d5..0000000 --- a/build/tizen/adaptor/dali-adaptor-cxx03.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -apiversion=@DALI_ADAPTOR_VERSION@ -libdir=@libdir@ -includedir=@devincludepath@ - -Name: dali-adaptor-cxx03 -Description: DALi adaptor using ecore -Version: ${apiversion} -Requires: dali-core-cxx03 -Libs: -L${libdir} -ldali-adaptor-cxx03 -Cflags: -I${includedir}/dali diff --git a/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in b/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in deleted file mode 100644 index db22442..0000000 --- a/build/tizen/adaptor/dali-adaptor-integration-cxx03.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -apiversion=@DALI_ADAPTOR_VERSION@ -libdir=@libdir@ -includedir=@devincludepath@ - -Name: dali-adaptor-integration-cxx03 -Description: Integration APIs for dali-adaptor -Version: ${apiversion} -Requires: dali-adaptor-cxx03 -Libs: -L${libdir} -Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptors/ diff --git a/build/tizen/plugins/Makefile.am b/build/tizen/plugins/Makefile.am index bdbd546..282f9f4 100644 --- a/build/tizen/plugins/Makefile.am +++ b/build/tizen/plugins/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2015 Samsung Electronics Co., Ltd. +# Copyright (c) 2019 Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,20 +25,10 @@ plugin_sounds_dir = ../../../plugins/sounds lib_LTLIBRARIES = -if ENABLE_CXX03_ABI - -if USE_FEEDBACK -lib_LTLIBRARIES += libdali-feedback-plugin.la -endif - -else # ENABLE_CXX03_ABI - if USE_FEEDBACK lib_LTLIBRARIES += libdali-feedback-plugin-cxx11.la endif -endif # ENABLE_CXX03_ABI - if USE_FEEDBACK dalisounddir = ${dataReadOnlyDir}/plugins/sounds/ dalisound_DATA = ${dali_plugin_sound_files} @@ -73,25 +63,6 @@ LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD += \ endif -if ENABLE_CXX03_ABI - -if USE_FEEDBACK -libdali_feedback_plugin_la_SOURCES = $(LIBDALI_FEEDBACK_PLUGIN_LA_SOURCES) -libdali_feedback_plugin_la_LIBADD = $(LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD) -libdali_feedback_plugin_la_CXXFLAGS = $(LIBDALI_FEEDBACK_PLUGIN_LA_CXXFLAGS) -libdali_feedback_plugin_la_LDFLAGS = $(LIBDALI_FEEDBACK_PLUGIN_LA_LDFLAGS) - -if ENABLE_RENAME_SO -#rename -install: install-am - rm -rf $(libdir)/libdali_feedback_plugin.so - rm -rf $(libdir)/libdali_feedback_plugin-cxx03.so - ln -s $(libdir)/libdali_feedback_plugin.so.0.0.* $(libdir)/libdali_feedback_plugin-cxx03.so -endif -endif - -else # CXX03 - if USE_FEEDBACK libdali_feedback_plugin_cxx11_la_SOURCES = $(LIBDALI_FEEDBACK_PLUGIN_LA_SOURCES) libdali_feedback_plugin_cxx11_la_LIBADD = $(LIBDALI_FEEDBACK_PLUGIN_LA_LIBADD) @@ -107,4 +78,3 @@ install: install-am endif endif -endif # CXX03 diff --git a/build/tizen/plugins/configure.ac b/build/tizen/plugins/configure.ac index 83b8a95..10e9e13 100644 --- a/build/tizen/plugins/configure.ac +++ b/build/tizen/plugins/configure.ac @@ -24,13 +24,8 @@ AM_CONDITIONAL([WAYLAND], [test x$enable_wayland = xyes]) AM_CONDITIONAL([USE_FEEDBACK], [test x$enable_feedback = xyes]) -AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes]) AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes]) -if test "x$enable_cxx03_abi" = "xyes"; then - DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" -fi - if test "x$enable_feedback" = "xyes"; then if test "x$enable_profile" != "xUBUNTU"; then diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp index ef4fc15..13f8c0a 100755 --- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp +++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp @@ -849,7 +849,6 @@ Dali::InputMethodContext::KeyboardType InputMethodContextEcoreWl::GetKeyboardTyp { DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextEcoreWl::GetKeyboardType\n" ); -#ifdef OVER_TIZEN_VERSION_4 if( mIMFContext ) { int value; @@ -869,7 +868,7 @@ Dali::InputMethodContext::KeyboardType InputMethodContextEcoreWl::GetKeyboardTyp } } } -#endif // OVER_TIZEN_VERSION_4 + return Dali::InputMethodContext::KeyboardType::SOFTWARE_KEYBOARD; } diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index 7e7cb85..04828cc 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -331,7 +331,6 @@ bool WindowRenderSurface::PreRender( bool resizingSurface ) if( resizingSurface ) { -#ifdef OVER_TIZEN_VERSION_4 // Window rotate or screen rotate if( !mRotationFinished || !mScreenRotationFinished ) { @@ -351,7 +350,6 @@ bool WindowRenderSurface::PreRender( bool resizingSurface ) { mWindowBase->SetEglWindowTransform( mRotationAngle ); } -#endif // Resize case if( !mResizeFinished ) diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp index b055d40..06490d2 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -178,7 +178,6 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::TRACKBALL; break; } -#ifdef OVER_TIZEN_VERSION_4 case ECORE_DEVICE_SUBCLASS_REMOCON: { deviceSubclass = Device::Subclass::REMOCON; @@ -189,7 +188,6 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::VIRTUAL_KEYBOARD; break; } -#endif default: { deviceSubclass = Device::Subclass::NONE; diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp index b701bac..2ae12f1 100755 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -180,7 +180,6 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::TRACKBALL; break; } -#ifdef OVER_TIZEN_VERSION_4 case ECORE_DEVICE_SUBCLASS_REMOCON: { deviceSubclass = Device::Subclass::REMOCON; @@ -191,7 +190,6 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::VIRTUAL_KEYBOARD; break; } -#endif default: { deviceSubclass = Device::Subclass::NONE; diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 352b182..b36acd2 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -15,8 +15,6 @@ %global __provides_exclude_from ^.*\\.(wearable|mobile|tv|ivi|common)$ %endif -%bcond_with wayland - Name: dali-adaptor Summary: The DALi Tizen Adaptor Version: 1.4.18 @@ -30,22 +28,8 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: giflib -#need libtzplatform-config for directory if tizen version is 3.x - -%if 0%{?tizen_version_major} >= 3 %define tizen_platform_config_supported 1 BuildRequires: pkgconfig(libtzplatform-config) -%endif - -%if 0%{?tizen_version_major} < 4 -%define disable_cxx03_build 1 -%endif - -# Get the profile from tizen_profile_name if tizen version is 2.x and tizen_profile_name exists. - -%if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1} -%define profile %{tizen_profile_name} -%endif # This is for backward-compatibility. This does not deteriorate 4.0 Configurability # if wearable || "undefined" @@ -59,10 +43,6 @@ BuildRequires: pkgconfig(gles20) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(ttrace) -%if !0%{?disable_cxx03_build} -BuildRequires: dali-devel-cxx03 -BuildRequires: dali-integration-devel-cxx03 -%endif BuildRequires: dali-devel BuildRequires: dali-integration-devel @@ -88,9 +68,6 @@ BuildRequires: pkgconfig(capi-system-sensor) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(cairo) -%if %{with wayland} - -####### BUILDING FOR WAYLAND ####### BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-client) BuildRequires: wayland-devel @@ -107,42 +84,21 @@ BuildRequires: pkgconfig(ecore-wayland) # dali-adaptor needs tbm_surface in tizen 3.0 wayland BuildRequires: pkgconfig(libtbm) -# tpkp-curl (certificate pinning for libcurl functions) is only available in Tizen 3.0 -%if !0%{?disable_cxx03_build} -BuildRequires: pkgconfig(tpkp-curl-deprecated) -%endif BuildRequires: pkgconfig(tpkp-curl) -####### BUILDING FOR X11####### -%else -BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xdamage) -BuildRequires: pkgconfig(utilX) -%endif - # for dali-adaptor -%if 0%{?tizen_version_major} == 3 -BuildRequires: pkgconfig(capi-appfw-application) -BuildRequires: pkgconfig(elementary) -%else BuildRequires: pkgconfig(appcore-ui) BuildRequires: pkgconfig(appcore-widget-base) BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(capi-appfw-app-common) BuildRequires: pkgconfig(capi-appfw-app-control) BuildRequires: pkgconfig(ecore-imf) -%endif BuildRequires: pkgconfig(capi-system-system-settings) # for feedback plugin BuildRequires: pkgconfig(mm-sound) -%if 0%{?tizen_version_major} >= 3 BuildRequires: pkgconfig(feedback) -%endif # for multiprofile Requires: %{name}-compat = %{version}-%{release} @@ -152,16 +108,6 @@ Recommends: %{name}-profile_common = %{version}-%{release} The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core platform abstraction and application shell -%if !0%{?disable_cxx03_build} -%package cxx03 -Summary: The DALi Tizen Adaptor with cxx03 abi -Provides: %{name}-cxx03 = %{version}-%{release} - -%description cxx03 -The DALi Tizen Adaptor provides a Tizen specific implementation of the dali-core -platform abstraction and application shell -%endif - ########################################### # Dali adapter for profiles ########################################### @@ -227,7 +173,6 @@ The DALi Tizen Adaptor for ivi. %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" # Currently Tizen Common we use does not have wayland extensions like xdg-shell %package profile_common -%define tizen_2_2_compatibility 0 Summary: The DALi Tizen Adaptor for common Provides: %{name}-compat = %{version}-%{release} Conflicts: %{name}-profile_mobile @@ -238,84 +183,6 @@ Conflicts: %{name}-profile_ivi The DALi Tizen Adaptor for common. %endif -%if !0%{?disable_cxx03_build} -########################################### -# Dali adapter for profiles for cxx03 ABI -########################################### - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if mobile || "undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -%package profile_mobile-cxx03 -Summary: The DALi Tizen Adaptor for mobile with cxx03 abi -Provides: %{name}-cxx03-compat = %{version}-%{release} -Conflicts: %{name}-profile_tv-cxx03 -Conflicts: %{name}-profile_wearable-cxx03 -Conflicts: %{name}-profile_ivi-cxx03 -Conflicts: %{name}-profile_common-cxx03 -%description profile_mobile-cxx03 -The DALi Tizen Adaptor for mobile. -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if tv ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -%package profile_tv-cxx03 -Summary: The DALi Tizen Adaptor for tv with cxx03 abi -Provides: %{name}-cxx03-compat = %{version}-%{release} -Conflicts: %{name}-profile_mobile-cxx03 -Conflicts: %{name}-profile_wearable-cxx03 -Conflicts: %{name}-profile_ivi-cxx03 -Conflicts: %{name}-profile_common-cxx03 -%description profile_tv-cxx03 -The DALi Tizen Adaptor for tv. -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if wearable || "undefined" -%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -%package profile_wearable-cxx03 -Summary: The DALi Tizen Adaptor for wearable with cxx03 abi -Provides: %{name}-cxx03-compat = %{version}-%{release} -Conflicts: %{name}-profile_mobile-cxx03 -Conflicts: %{name}-profile_tv-cxx03 -Conflicts: %{name}-profile_ivi-cxx03 -Conflicts: %{name}-profile_common-cxx03 -%description profile_wearable-cxx03 -The DALi Tizen Adaptor for wearable. -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if ivi ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" -%package profile_ivi-cxx03 -Summary: The DALi Tizen Adaptor for ivi with cxx03 abi -Provides: %{name}-cxx03-compat = %{version}-%{release} -Conflicts: %{name}-profile_mobile-cxx03 -Conflicts: %{name}-profile_wearable-cxx03 -Conflicts: %{name}-profile_tv-cxx03 -Conflicts: %{name}-profile_common-cxx03 -%description profile_ivi-cxx03 -The DALi Tizen Adaptor for ivi. -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if common ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -# Currently Tizen Common we use does not have wayland extensions like xdg-shell -%package profile_common-cxx03 -%define tizen_2_2_compatibility 0 -Summary: The DALi Tizen Adaptor for common with cxx03 abi -Provides: %{name}-cxx03-compat = %{version}-%{release} -Conflicts: %{name}-profile_mobile-cxx03 -Conflicts: %{name}-profile_wearable-cxx03 -Conflicts: %{name}-profile_tv-cxx03 -Conflicts: %{name}-profile_ivi-cxx03 -%description profile_common-cxx03 -The DALi Tizen Adaptor for common. -%endif -%endif - ############################## # devel ############################## @@ -339,31 +206,6 @@ Requires: %{name} = %{version}-%{release} %description integration-devel Integration development package for the Adaptor - headers for integrating with an adaptor library. -%if !0%{?disable_cxx03_build} -############################## -# devel cxx03 -############################## -%package devel-cxx03 -Summary: Development components for the DALi Tizen Adaptor with cxx03 abi -Group: Development/Building -Requires: %{name}-cxx03 = %{version}-%{release} -Requires: %{name}-integration-devel-cxx03 = %{version}-%{release} - -%description devel-cxx03 -Development components for the DALi Tizen Adaptor - public headers and package configs - -############################## -# integration-devel cxx03 -############################## -%package integration-devel-cxx03 -Summary: Integration development package for the Adaptor with cxx03 abi -Group: Development/Building -Requires: %{name}-cxx03 = %{version}-%{release} - -%description integration-devel-cxx03 -Integration development package for the Adaptor - headers for integrating with an adaptor library. -%endif - ############################## # Dali Feedback Plugin ############################## @@ -374,20 +216,6 @@ Requires: %{name} = %{version}-%{release} %description dali-feedback-plugin Feedback plugin to play haptic and audio feedback for Dali -%if !0%{?disable_cxx03_build} -############################## -# Dali Feedback Plugin cxx03 -############################## - -%package dali-feedback-plugin-cxx03 -Summary: Plugin to play haptic and audio feedback for Dali with cxx03 abi -Group: System/Libraries -Requires: %{name}-cxx03 = %{version}-%{release} -%description dali-feedback-plugin-cxx03 -Feedback plugin to play haptic and audio feedback for Dali - -%endif - ############################## # Preparation ############################## @@ -396,21 +224,12 @@ Feedback plugin to play haptic and audio feedback for Dali #Use TZ_PATH when tizen version is 3.x or greater -%if 0%{?tizen_version_major} >= 3 %define dali_data_rw_dir %TZ_SYS_RO_SHARE/dali/ %define dali_data_ro_dir %TZ_SYS_RO_SHARE/dali/ %define font_preloaded_path %TZ_SYS_RO_SHARE/fonts/ %define font_downloaded_path %TZ_SYS_SHARE/fonts/ %define font_application_path %TZ_SYS_RO_SHARE/app_fonts/ %define font_configuration_file %TZ_SYS_ETC/fonts/conf.avail/99-slp.conf -%else -%define dali_data_rw_dir /usr/share/dali/ -%define dali_data_ro_dir /usr/share/dali/ -%define font_preloaded_path /usr/share/fonts/ -%define font_downloaded_path /opt/share/fonts/ -%define font_application_path /usr/share/app_fonts/ -%define font_configuration_file /opt/etc/fonts/conf.avail/99-slp.conf -%endif %define user_shader_cache_dir %{dali_data_ro_dir}/core/shaderbin/ %define dali_plugin_sound_files /plugins/sounds/ @@ -428,32 +247,18 @@ LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections -lttrace -Wl CXXFLAGS+=" -D_ARCH_ARM_ -lgcc" %endif -%if %{with wayland} CFLAGS+=" -DWAYLAND" CXXFLAGS+=" -DWAYLAND" configure_flags="--enable-wayland" -# Need Ecore-Wayland2 when Tizen version is 5.x or greater -%if 0%{?tizen_version_major} >= 5 -CFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" -CXXFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" -configure_flags+=" --enable-ecore-wayland2" -%endif -%endif - # Use this conditional when Tizen version is 5.x or greater %if 0%{?tizen_version_major} >= 5 CXXFLAGS+=" -DOVER_TIZEN_VERSION_5" -%endif - -# Use this conditional when Tizen version is 4.x or greater -%if 0%{?tizen_version_major} >= 4 -CXXFLAGS+=" -DOVER_TIZEN_VERSION_4" -%endif -%if 0%{?tizen_2_2_compatibility} -CFLAGS+=" -DTIZEN_SDK_2_2_COMPATIBILITY" -CXXFLAGS+=" -DTIZEN_SDK_2_2_COMPATIBILITY" +# Need Ecore-Wayland2 when Tizen version is 5.x or greater +CFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" +CXXFLAGS+=" -DECORE_WAYLAND2 -DEFL_BETA_API_SUPPORT" +configure_flags+=" --enable-ecore-wayland2" %endif libtoolize --force @@ -470,11 +275,6 @@ FONT_CONFIGURATION_FILE="%{font_configuration_file}" ; export FONT_CONFIGURATION TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TIZEN_PLATFORM_CONFIG_SUPPORTED %endif -# Default to GLES 2.0 if not specified. -%if 0%{?target_gles_version} == 0 -%define target_gles_version 20 -%endif - # Set up the build via configure. ####################################################################### # This is for backward-compatibility. This does not deteriorate 4.0 Configurability @@ -483,17 +283,8 @@ TIZEN_PLATFORM_CONFIG_SUPPORTED="%{tizen_platform_config_supported}" ; export TI %configure --prefix=$PREFIX --with-jpeg-turbo \ --enable-shaderbincache=DISABLE --enable-profile=MOBILE \ --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 --enable-feedback \ -%endif -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} --enable-efl=no \ -%else - --enable-efl=yes \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -528,17 +319,8 @@ make clean %configure --prefix=$PREFIX --with-jpeg-turbo \ --enable-shaderbincache=DISABLE --enable-profile=TV \ --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 --enable-feedback \ -%endif -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} --enable-efl=no \ -%else - --enable-efl=yes \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -572,17 +354,8 @@ make clean %configure --prefix=$PREFIX --with-jpeg-turbo \ --enable-shaderbincache=DISABLE --enable-profile=WEARABLE \ --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 --enable-feedback \ -%endif -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} --enable-efl=no \ -%else - --enable-efl=yes \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -616,17 +389,8 @@ make clean %configure --prefix=$PREFIX --with-jpeg-turbo \ --enable-shaderbincache=DISABLE --enable-profile=IVI \ --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 --enable-feedback \ -%endif -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} --enable-efl=no \ -%else - --enable-efl=yes \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -662,17 +426,8 @@ make clean %configure --prefix=$PREFIX --with-jpeg-turbo \ --enable-shaderbincache=DISABLE --enable-profile=COMMON \ --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 --enable-feedback \ -%endif -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} --enable-efl=no \ -%else - --enable-efl=yes \ -%endif %if 0%{?enable_debug} --enable-debug \ %endif @@ -701,230 +456,6 @@ make clean %endif -%if !0%{?disable_cxx03_build} -####################################################################### -#BUILD for cxx03 ABI -####################################################################### - -# Set up the build via configure. -####################################################################### -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if mobile || "undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" - -%configure --prefix=$PREFIX --with-jpeg-turbo \ - --enable-shaderbincache=DISABLE --enable-profile=MOBILE \ - --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 - --enable-feedback \ -%endif - --enable-cxx03-abi=yes \ -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} - --enable-efl=no \ -%else - --enable-efl=yes \ -%endif -%if 0%{?enable_debug} - --enable-debug \ -%endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --enable-appfw=yes \ - $configure_flags --libdir=%{_libdir} \ - --enable-rename-so=no - -# Build. -make %{?jobs:-j%jobs} - -pushd %{_builddir}/%{name}-%{version}/build/tizen -%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" -popd - -pushd %{buildroot}%{_libdir} -for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.mobile"; done -for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done -popd - -make clean - -%endif - -####################################################################### -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if tv ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" - -%configure --prefix=$PREFIX --with-jpeg-turbo \ - --enable-shaderbincache=DISABLE --enable-profile=TV \ - --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 - --enable-feedback \ -%endif - --enable-cxx03-abi=yes \ -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} - --enable-efl=no \ -%else - --enable-efl=yes \ -%endif -%if 0%{?enable_debug} - --enable-debug \ -%endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --enable-appfw=yes \ - $configure_flags --libdir=%{_libdir} \ - --enable-rename-so=no - -# Build. -make %{?jobs:-j%jobs} - -pushd %{_builddir}/%{name}-%{version}/build/tizen -%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" -popd - -pushd %{buildroot}%{_libdir} -for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.tv"; done -for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done -popd - -make clean -%endif - -####################################################################### -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if wearable || "undefined" -%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" - -%configure --prefix=$PREFIX --with-jpeg-turbo \ - --enable-shaderbincache=DISABLE --enable-profile=WEARABLE \ - --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 - --enable-feedback \ -%endif - --enable-cxx03-abi=yes \ -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} - --enable-efl=no \ -%else - --enable-efl=yes \ -%endif -%if 0%{?enable_debug} - --enable-debug \ -%endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --enable-appfw=yes \ - $configure_flags --libdir=%{_libdir} \ - --enable-rename-so=no - -# Build. -make %{?jobs:-j%jobs} - -pushd %{_builddir}/%{name}-%{version}/build/tizen -%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" -popd - -pushd %{buildroot}%{_libdir} -for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.wearable"; done -for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done -popd - -make clean -%endif - -####################################################################### -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if ivi ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" - -%configure --prefix=$PREFIX --with-jpeg-turbo \ - --enable-shaderbincache=DISABLE --enable-profile=IVI \ - --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 - --enable-feedback \ -%endif - --enable-cxx03-abi=yes \ -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} - --enable-efl=no \ -%else - --enable-efl=yes \ -%endif -%if 0%{?enable_debug} - --enable-debug \ -%endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --enable-appfw=yes \ - $configure_flags --libdir=%{_libdir} \ - --enable-rename-so=no - -# Build. -make %{?jobs:-j%jobs} - -pushd %{_builddir}/%{name}-%{version}/build/tizen -%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" -popd - -pushd %{buildroot}%{_libdir} -for FILE in libdali-adap*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done -for FILE in libdali-*plugin.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done -popd - -make clean -%endif - -####################################################################### -# common -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if common ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" - -%configure --prefix=$PREFIX --with-jpeg-turbo \ - --enable-shaderbincache=DISABLE --enable-profile=COMMON \ - --enable-tizen-major-version=%{tizen_version_major} \ -%if 0%{?tizen_version_major} >= 3 - --enable-feedback \ -%endif - --enable-cxx03-abi=yes \ -%if 0%{?tizen_2_2_compatibility} - --with-tizen-2-2-compatibility \ -%endif -%if %{with wayland} - --enable-efl=no \ -%else - --enable-efl=yes \ -%endif -%if 0%{?enable_debug} - --enable-debug \ -%endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --enable-appfw=yes \ - $configure_flags --libdir=%{_libdir} \ - --enable-rename-so=no - -# Build. -make %{?jobs:-j%jobs} - -%endif -%endif - ############################## # Installation ############################## @@ -958,9 +489,6 @@ pushd %{buildroot}%{_libdir} # if common ||"undefined" #%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" rm -rf libdali-adaptor*.so -%if !0%{?disable_cxx03_build} -ln -s libdali-adaptor.so.0.0.0 libdali-adaptor-cxx03.so -%endif ln -s libdali-adaptor-cxx11.so.0.0.0 libdali-adaptor.so #%endif @@ -968,9 +496,6 @@ ln -s libdali-adaptor-cxx11.so.0.0.0 libdali-adaptor.so # if wearable || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" rm -rf libdali-adaptor*.so.wearable -%if !0%{?disable_cxx03_build} -ln -s libdali-adaptor.so.0.0.*.wearable libdali-adaptor-cxx03.so.wearable -%endif ln -s libdali-adaptor-cxx11.so.0.0.*.wearable libdali-adaptor.so.wearable %endif @@ -978,9 +503,6 @@ ln -s libdali-adaptor-cxx11.so.0.0.*.wearable libdali-adaptor.so.wearable # if tv ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" rm -rf libdali-adaptor*.so.tv -%if !0%{?disable_cxx03_build} -ln -s libdali-adaptor.so.0.0.*.tv libdali-adaptor-cxx03.so.tv -%endif ln -s libdali-adaptor-cxx11.so.0.0.*.tv libdali-adaptor.so.tv %endif @@ -988,9 +510,6 @@ ln -s libdali-adaptor-cxx11.so.0.0.*.tv libdali-adaptor.so.tv # if ivi ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" rm -rf libdali-adaptor*.so.ivi -%if !0%{?disable_cxx03_build} -ln -s libdali-adaptor.so.0.0.*.ivi libdali-adaptor-cxx03.so.ivi -%endif ln -s libdali-adaptor-cxx11.so.0.0.*.ivi libdali-adaptor.so.ivi %endif @@ -998,9 +517,6 @@ ln -s libdali-adaptor-cxx11.so.0.0.*.ivi libdali-adaptor.so.ivi # if mobile || "undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" rm -rf libdali-adaptor*.so.mobile -%if !0%{?disable_cxx03_build} -ln -s libdali-adaptor.so.0.0.*.mobile libdali-adaptor-cxx03.so.mobile -%endif ln -s libdali-adaptor-cxx11.so.0.0.*.mobile libdali-adaptor.so.mobile %endif popd @@ -1106,77 +622,6 @@ exit 0 exit 0 %endif -%if !0%{?disable_cxx03_build} -############################## -#cxx03 ABI -############################# -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if mobile || "undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -%post profile_mobile-cxx03 -pushd %{_libdir} -for FILE in libdali-adaptor.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done -popd -/sbin/ldconfig -exit 0 - -%postun profile_mobile-cxx03 -/sbin/ldconfig -exit 0 -%endif - -############################## - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if tv ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -%post profile_tv-cxx03 -pushd %{_libdir} -for FILE in libdali-adaptor.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done -popd -/sbin/ldconfig -exit 0 - -%postun profile_tv-cxx03 -/sbin/ldconfig -exit 0 -%endif - -############################## - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if wearable || "undefined" -%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -%post profile_wearable-cxx03 -pushd %{_libdir} -for FILE in libdali-adaptor.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done -popd -/sbin/ldconfig -exit 0 - -%postun profile_wearable-cxx03 -/sbin/ldconfig -exit 0 -%endif - -############################## - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if ivi ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" -%post profile_ivi-cxx03 -pushd %{_libdir} -for FILE in libdali-adaptor.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done -popd -/sbin/ldconfig -exit 0 - -%postun profile_ivi-cxx03 -/sbin/ldconfig -exit 0 -%endif -%endif - ############################## # Files in Binary Packages ############################## @@ -1200,43 +645,13 @@ exit 0 %exclude %{_libdir}/libdali-adap*.so*.ivi #%endif -%if !0%{?disable_cxx03_build} -%files cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%dir %{user_shader_cache_dir} -%{_bindir}/* -%license LICENSE -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if common ||"undefined" -#%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -%defattr(-,root,root,-) -%{_libdir}/libdali-adaptor.so.0* -%{_libdir}/libdali-adaptor-cxx03.so -%exclude %{_libdir}/libdali-adap*.so*.mobile -%exclude %{_libdir}/libdali-adap*.so*.wearable -%exclude %{_libdir}/libdali-adap*.so*.tv -%exclude %{_libdir}/libdali-adap*.so*.ivi -#%endif - -%if 0%{?tizen_version_major} >= 3 -%files dali-feedback-plugin-cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-feedback-plugin.so* -%{dali_plugin_sound_files}/* -%endif -%endif - ################################################# -%if 0%{?tizen_version_major} >= 3 %files dali-feedback-plugin %manifest dali-adaptor.manifest %defattr(-,root,root,-) %{_libdir}/libdali-feedback-plugin-cxx11.so* %{dali_plugin_sound_files}/* -%endif ################################################# @@ -1301,69 +716,3 @@ exit 0 %{dev_include_path}/dali/integration-api/adaptors/* %{_libdir}/pkgconfig/dali-adaptor-integration.pc -%if !0%{?disable_cxx03_build} -################################################ -# cxx03 ABI -################################################ - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if common ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -%files profile_common-cxx03 -# default .so files are housed in the main pkg. -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if mobile || "undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -%files profile_mobile-cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-adaptor-cxx03.so.mobile -%{_libdir}/libdali-adaptor.so.0*mobile -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if tv ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -%files profile_tv-cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-adaptor-cxx03.so.tv -%{_libdir}/libdali-adaptor.so.0*.tv -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if wearable || "undefined" -%if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -%files profile_wearable-cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-adaptor-cxx03.so.wearable -%{_libdir}/libdali-adaptor.so.0*.wearable -%endif - -# This is for backward-compatibility. This does not deteriorate 4.0 Configurability -# if ivi ||"undefined" -%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" -%files profile_ivi-cxx03 -%manifest dali-adaptor.manifest -%defattr(-,root,root,-) -%{_libdir}/libdali-adaptor-cxx03.so.ivi -%{_libdir}/libdali-adaptor.so.0*.ivi -%endif - - -%files devel-cxx03 -%defattr(-,root,root,-) -%{dev_include_path}/dali/dali.h -%{dev_include_path}/dali/public-api/* -%{dev_include_path}/dali/devel-api/* -%{dev_include_path}/dali/doc/* -%{_libdir}/pkgconfig/dali-adaptor-cxx03.pc - -%files integration-devel-cxx03 -%defattr(-,root,root,-) -%{dev_include_path}/dali/integration-api/adaptors/* -%{_libdir}/pkgconfig/dali-adaptor-integration-cxx03.pc -%endif