From 5252b0c3922e4deff6dec4ba158f2cf4077a701e Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 30 Oct 2023 06:12:31 +0000 Subject: [PATCH 1/5] add libjpeg Signed-off-by: yanansong --- ft_engine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ft_engine.spec b/ft_engine.spec index e523c9f..f584829 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -26,11 +26,13 @@ BuildRequires: distributed-utils distributed-build ft_surface-devel ft_mmi-deve BuildRequires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers BuildRequires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm BuildRequires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers +BuildRequires: libjpeg-turbo-devel Requires: compiler-rt llvm-devel python3 libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel Requires: distributed-utils ft_surface ft_mmi ft_flutter ft_multimedia Requires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers Requires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm Requires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers +Requires: libjpeg-turbo %description Ft_engine consists of window display and window management, providing the core capabilities of the Windows engine. From c8f44f315717c84fcc0a1a377e1c08cadfcdc2b9 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 30 Oct 2023 06:44:49 +0000 Subject: [PATCH 2/5] fix name of jpeg-devel rpm Signed-off-by: yanansong --- ft_engine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ft_engine.spec b/ft_engine.spec index f584829..f53eb8c 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -26,7 +26,7 @@ BuildRequires: distributed-utils distributed-build ft_surface-devel ft_mmi-deve BuildRequires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers BuildRequires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm BuildRequires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers -BuildRequires: libjpeg-turbo-devel +BuildRequires: libjpeg-devel Requires: compiler-rt llvm-devel python3 libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel Requires: distributed-utils ft_surface ft_mmi ft_flutter ft_multimedia Requires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers From ebf2953e6162ec10f5eb051e85d769ddbf7ff9b3 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 30 Oct 2023 07:23:08 +0000 Subject: [PATCH 3/5] fix out lib path Signed-off-by: yanansong --- ft_engine.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_engine.spec b/ft_engine.spec index f53eb8c..b228462 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -55,10 +55,10 @@ cd %{_builddir}/%{name}-%{version} %install mkdir -p %{buildroot}%{_libdir} %ifarch x86_64 -cp -pdf %{_builddir}/%{name}-%{version}/out/Release/x64/lib/lib*.so %{buildroot}%{_libdir} +cp -pdf %{_builddir}/%{name}-%{version}/out/Release/x64/common/common/lib*.so %{buildroot}%{_libdir} %endif %ifarch aarch64 -cp -pdf %{_builddir}/%{name}-%{version}/out/Release/aarch64/lib/lib*.so %{buildroot}%{_libdir} +cp -pdf %{_builddir}/%{name}-%{version}/out/Release/aarch64/common/common/lib*.so %{buildroot}%{_libdir} %endif mkdir -p %{buildroot}/system/profile/ft From 7298c1f2c883b600547650206da47cc0d8ece736 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 30 Oct 2023 08:46:17 +0000 Subject: [PATCH 4/5] cp icon\desktop Signed-off-by: yanansong --- ft_engine.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ft_engine.spec b/ft_engine.spec index b228462..6435dfc 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -65,8 +65,10 @@ mkdir -p %{buildroot}/system/profile/ft cp -pdf %{_builddir}/%{name}-%{version}/etc/ft.xml %{buildroot}/system/profile/ft mkdir -p %{buildroot}/usr/local/share/ft -cp -pdf %{_builddir}/%{name}-%{version}/etc/icon %{buildroot}/usr/local/share/ft/ -cp -pdf %{_builddir}/%{name}-%{version}/etc/desktop %{buildroot}/usr/local/share/ft/ +mkdir -p %{buildroot}/usr/local/share/ft/icon +mkdir -p %{buildroot}/usr/local/share/ft/desktop +cp -pdf %{_builddir}/%{name}-%{version}/etc/icon/* %{buildroot}/usr/local/share/ft/icon +cp -pdf %{_builddir}/%{name}-%{version}/etc/desktop/* %{buildroot}/usr/local/share/ft/desktop mkdir -p %{buildroot}/usr/local/share/ft/window_manager cp -pdf %{_builddir}/%{name}-%{version}/window_manager/resources/config/other/display_manager_config.xml %{buildroot}/usr/local/share/ft/window_manager From 08a6a730b48a88c8879f512f54f30949bf645189 Mon Sep 17 00:00:00 2001 From: yanansong Date: Mon, 30 Oct 2023 09:24:45 +0000 Subject: [PATCH 5/5] fix debugfiles.list Signed-off-by: yanansong --- ft_engine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ft_engine.spec b/ft_engine.spec index 6435dfc..b19c4d7 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -11,6 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +%global debug_package %{nil} + Name: ft_engine Version: 1.0.0 Release: 1%{?dist}