From: Adeel Kazmi Date: Fri, 17 May 2024 15:12:04 +0000 (+0100) Subject: Updated the spec file so that it builds for tizen X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fdevel%2Fvulkan;p=platform%2Fcore%2Fuifw%2Fdali-core.git Updated the spec file so that it builds for tizen Change-Id: I5012e7a454df2d1e8e93dd28a62edebf83ed03bd --- diff --git a/packaging/dali.spec b/packaging/dali.spec index 105ea6edb..8d10f381d 100644 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -1,4 +1,4 @@ -Name: dali-vk +Name: dali Summary: DALi 3D Engine Version: 1.4.16 Release: 1 @@ -9,57 +9,16 @@ Source0: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig +BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: gawk -BuildRequires: Vulkan-LoaderAndValidationLayers -BuildRequires: Vulkan-LoaderAndValidationLayers-devel - -%if 0%{?tizen_version_major} >= 3 +#BuildRequires: Vulkan-LoaderAndValidationLayers +#BuildRequires: Vulkan-LoaderAndValidationLayers-devel BuildRequires: pkgconfig(libtzplatform-config) -%endif - -%if 0%{?tizen_version_major} < 4 -%define disable_cxx03_build 1 -%endif %description DALi 3D Engine -%if !0%{?disable_cxx03_build} -############################## -# cxx03 -############################## -%package cxx03 -Summary: DALi 3D Engine with cxx03 abi -Provides: %{name}-cxx03 = %{version}-%{release} - -%description cxx03 -DALi 3D Engine with cxx03 abi with cxx03 abi - -############################## -# devel-cxx03 -############################## -%package devel-cxx03 -Summary: Development components for DALi 3D Engine with cxx03 abi -Group: Development/Building -Requires: %{name}-cxx03 = %{version}-%{release} -Requires: %{name}-integration-devel-cxx03 = %{version}-%{release} - -%description devel-cxx03 -Development components for DALi 3D Engine - public headers and package config - -############################## -# integration-devel-cxx03 -############################## -%package integration-devel-cxx03 -Summary: Integration development package for DALi 3D Engine witch cxx03 abi -Group: Development/Building -Requires: %{name}-cxx03 = %{version}-%{release} - -%description integration-devel-cxx03 -Integration development package for DALi 3D Engine - headers for integrating with an adaptor/platform abstraction library. -%endif - ############################## # devel ############################## @@ -89,16 +48,6 @@ Integration development package for DALi 3D Engine - headers for integrating wit %prep %setup -q -#Use TZ_PATH when tizen version is 3.x - -%if "%{tizen_version_major}" == "2" -%define dali_data_rw_dir /opt/usr/share/dali/ -%define dali_data_ro_dir /usr/share/dali/ -%else -%define dali_data_rw_dir %TZ_SYS_SHARE/dali/ -%define dali_data_ro_dir %TZ_SYS_RO_SHARE/dali/ -%endif - %define dev_include_path %{_includedir} ############################## @@ -106,7 +55,7 @@ Integration development package for DALi 3D Engine - headers for integrating wit ############################## %build PREFIX="/usr" -CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections -std=gnu++14 " +CXXFLAGS+=" -Wall -g -Os -DNDEBUG -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections -std=gnu++14 " LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -lgcc_s -lgcc -lpthread -Wl,-Bsymbolic-functions " %ifarch %{arm} @@ -120,82 +69,23 @@ LDFLAGS+=" --coverage " libtoolize --force cd %{_builddir}/%{name}-%{version}/build/tizen -autoreconf --install -DALI_DATA_RW_DIR="%{dali_data_rw_dir}" -DALI_DATA_RO_DIR="%{dali_data_ro_dir}" -export DALI_DATA_RW_DIR -export DALI_DATA_RO_DIR CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS; LDFLAGS="${LDFLAGS:-%optflags}" ; export LDFLAGS; -./configure \ - --program-prefix=%{?_program_prefix} \ - --prefix=%{_prefix} \ - --exec-prefix=%{_exec_prefix} \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ - --sysconfdir=%{_sysconfdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ - --localstatedir=%{_localstatedir} \ - --sharedstatedir=%{_sharedstatedir} \ - --mandir=%{_mandir} \ - --enable-vulkan=yes \ +cmake \ %if 0%{?enable_debug} - --enable-debug \ + -DCMAKE_BUILD_TYPE=Debug \ %endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --infodir=%{_infodir} \ - --enable-rename-so=no + -DENABLE_TRACE=ON \ + -DENABLE_BACKTRACE=ON \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} 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-core-vk-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done -mv pkgconfig/dali-core-vk.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-core-vk.pc -popd - -%if !0%{?disable_cxx03_build} -make clean - -./configure \ - --program-prefix=%{?_program_prefix} \ - --prefix=%{_prefix} \ - --exec-prefix=%{_exec_prefix} \ - --bindir=%{_bindir} \ - --sbindir=%{_sbindir} \ - --sysconfdir=%{_sysconfdir} \ - --datadir=%{_datadir} \ - --includedir=%{_includedir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ - --localstatedir=%{_localstatedir} \ - --sharedstatedir=%{_sharedstatedir} \ - --mandir=%{_mandir} \ - --enable-cxx03-abi=yes \ - --enable-vulkan=yes \ -%if 0%{?enable_debug} - --enable-debug \ -%endif -%if 0%{?enable_trace} - --enable-trace \ -%endif - --infodir=%{_infodir} \ - --enable-rename-so=no - -make %{?jobs:-j%jobs} -%endif - ############################## # Installation ############################## @@ -204,24 +94,7 @@ rm -rf %{buildroot} cd build/tizen pushd %{_builddir}/%{name}-%{version}/build/tizen -%make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}" - -for FILE in libdali-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done -mv dali-core-vk.pc %{buildroot}%{_libdir}/pkgconfig/dali-core-vk.pc -popd - -############################# -#rename -############################# -pushd %{buildroot}%{_libdir} -rm -rf libdali-core-vk.so -rm -rf libdali-core-vk-cxx11.so -%if !0%{?disable_cxx03_build} -ln -s libdali-core-vk.so.0.0.* libdali-core-vk-cxx03.so -%endif -ln -s libdali-core-vk-cxx11.so.0.0.* libdali-core-vk.so -popd - +%make_install ############################## # Post Install @@ -241,19 +114,6 @@ exit 0 # Files in Binary Packages ############################## -%if !0%{?disable_cxx03_build} -%files cxx03 -%if 0%{?enable_dali_smack_rules} -%manifest dali.manifest-smack -%else -%manifest dali.manifest -%endif -%defattr(-,root,root,-) -%{_libdir}/libdali-core-vk.so.* -%{_libdir}/libdali-core-vk-cxx03.so -%license LICENSE -%endif - %files %if 0%{?enable_dali_smack_rules} %manifest dali.manifest-smack @@ -261,32 +121,17 @@ exit 0 %manifest dali.manifest %endif %defattr(-,root,root,-) -%{_libdir}/libdali-core-vk-cxx11.so.* -%{_libdir}/libdali-core-vk.so +%{_libdir}/libdali-core.so* %license LICENSE -%if !0%{?disable_cxx03_build} -%files devel-cxx03 -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/dali-core-vk-cxx03.pc -%{dev_include_path}/dali/public-api/* -%{dev_include_path}/dali/devel-api/* -%{dev_include_path}/dali/graphics-api/* -%{dev_include_path}/dali/doc/* - -%files integration-devel-cxx03 -%defattr(-,root,root,-) -%{_includedir}/dali/integration-api/* -%endif - %files devel %defattr(-,root,root,-) -%{_libdir}/pkgconfig/dali-core-vk.pc +%{_libdir}/pkgconfig/dali-core.pc %{dev_include_path}/dali/public-api/* %{dev_include_path}/dali/devel-api/* -%{dev_include_path}/dali/graphics-api/* %{dev_include_path}/dali/doc/* %files integration-devel %defattr(-,root,root,-) %{_includedir}/dali/integration-api/* +%{_includedir}/dali/graphics-api/*