From a22b7eb577ec92addb4b8980160e7b748e8ae3ff Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 06:58:37 +0000 Subject: [PATCH 1/4] update ft_multimedia.spec. Signed-off-by: zxstty --- ft_multimedia.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ft_multimedia.spec b/ft_multimedia.spec index 1dfe834..4a774f4 100644 --- a/ft_multimedia.spec +++ b/ft_multimedia.spec @@ -24,9 +24,22 @@ URL: https://gitee.com/openeuler/ft_multimedia Source0: https://gitee.com/openeuler/ft_multimedia/repository/archive/ft_multimedia-1.0.0.tar.gz BuildRequires: clang compiler-rt llvm-devel python3 python3-pip python-toml tar cmake libexif-devel zlib-devel giflib-devel libpng-devel libjpeg-turbo-devel libwebp-devel -BuildRequires: distributed-utils distributed-build ft_flutter-devel +BuildRequires: ft_flutter-devel +BuildRequires: distributed-build distributed-beget +BuildRequires: commonlibrary_c_utils +BuildRequires: notification_eventhandler +BuildRequires: communication_ipc communication_dsoftbus +BuildRequires: security_device_auth security_huks security_device_security_level security_dataclassification +BuildRequires: systemabilitymgr_safwk systemabilitymgr_samgr + Requires: compiler-rt llvm-devel python3 libexif-devel zlib-devel giflib-devel libpng-devel libjpeg-turbo-devel libwebp-devel -Requires: distributed-utils ft_flutter +Requires: ft_flutter +Requires: distributed-beget +Requires: commonlibrary_c_utils +Requires: notification_eventhandler +Requires: communication_ipc communication_dsoftbus +Requires: security_device_auth security_huks security_device_security_level security_dataclassification +Requires: systemabilitymgr_safwk systemabilitymgr_samgr %description ft_multimedia provides media (image, audio, media...) framework for FangTian. From b007f1f490d8d8da8fe59a559169fa0beb04d035 Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 08:07:24 +0000 Subject: [PATCH 2/4] update ft_multimedia.spec. Signed-off-by: zxstty --- ft_multimedia.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_multimedia.spec b/ft_multimedia.spec index 4a774f4..4a089ae 100644 --- a/ft_multimedia.spec +++ b/ft_multimedia.spec @@ -25,7 +25,7 @@ Source0: https://gitee.com/openeuler/ft_multimedia/repository/archive/ft_ BuildRequires: clang compiler-rt llvm-devel python3 python3-pip python-toml tar cmake libexif-devel zlib-devel giflib-devel libpng-devel libjpeg-turbo-devel libwebp-devel BuildRequires: ft_flutter-devel -BuildRequires: distributed-build distributed-beget +BuildRequires: distributed-build distributed-beget distributedhardware_device_manager BuildRequires: commonlibrary_c_utils BuildRequires: notification_eventhandler BuildRequires: communication_ipc communication_dsoftbus @@ -34,7 +34,7 @@ BuildRequires: systemabilitymgr_safwk systemabilitymgr_samgr Requires: compiler-rt llvm-devel python3 libexif-devel zlib-devel giflib-devel libpng-devel libjpeg-turbo-devel libwebp-devel Requires: ft_flutter -Requires: distributed-beget +Requires: distributed-beget distributedhardware_device_manager Requires: commonlibrary_c_utils Requires: notification_eventhandler Requires: communication_ipc communication_dsoftbus From 2352d30807b4c210c88f26d9984f2894fa493321 Mon Sep 17 00:00:00 2001 From: heppen Date: Thu, 14 Dec 2023 18:42:00 +0800 Subject: [PATCH 3/4] update system deps --- 0001-update-system-deps.patch | 35 +++++++++++++++++++++++++++++++++++ ft_multimedia.spec | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-update-system-deps.patch diff --git a/0001-update-system-deps.patch b/0001-update-system-deps.patch new file mode 100644 index 0000000..9095546 --- /dev/null +++ b/0001-update-system-deps.patch @@ -0,0 +1,35 @@ +From 92406c8eef2ed323efda40def599c639c437247b Mon Sep 17 00:00:00 2001 +From: heppen +Date: Thu, 14 Dec 2023 17:42:55 +0800 +Subject: [PATCH] update system deps + +--- + build/configs/system_deps.toml | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml +index f73c03e..f6e5934 100755 +--- a/build/configs/system_deps.toml ++++ b/build/configs/system_deps.toml +@@ -33,6 +33,17 @@ package_deps = [ + "libpng-devel", + "libjpeg-turbo-devel", + "libwebp-devel", +- "distributed-utils", ++ "distributed-beget", ++ "distributedhardware_device_manager", ++ "commonlibrary_c_utils", ++ "notification_eventhandler", ++ "communication_ipc", ++ "communication_dsoftbus", ++ "security_device_auth", ++ "security_huks", ++ "security_device_security_level", ++ "security_dataclassification", ++ "systemabilitymgr_safwk", ++ "systemabilitymgr_samgr", + "distributed-build", + ] +-- +2.33.0 + diff --git a/ft_multimedia.spec b/ft_multimedia.spec index 4a089ae..1f6891c 100644 --- a/ft_multimedia.spec +++ b/ft_multimedia.spec @@ -16,12 +16,13 @@ Name: ft_multimedia Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ft_multimedia provides media (image, audio, media...) framework for FangTian. License: Apache-2.0 URL: https://gitee.com/openeuler/ft_multimedia Source0: https://gitee.com/openeuler/ft_multimedia/repository/archive/ft_multimedia-1.0.0.tar.gz +Patch0: 0001-update-system-deps.patch BuildRequires: clang compiler-rt llvm-devel python3 python3-pip python-toml tar cmake libexif-devel zlib-devel giflib-devel libpng-devel libjpeg-turbo-devel libwebp-devel BuildRequires: ft_flutter-devel @@ -94,5 +95,8 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Thu Nov 14 2023 Peng He - 1.0.0-2 +- Update requires + * Tue Oct 10 2023 xieyijun3 - 1.0.0-1 - From 3fd4bc5cc8bb2241ae80f40d9104961652811921 Mon Sep 17 00:00:00 2001 From: zxstty Date: Fri, 15 Dec 2023 02:11:42 +0000 Subject: [PATCH 4/4] update ft_multimedia.spec. Signed-off-by: zxstty --- ft_multimedia.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_multimedia.spec b/ft_multimedia.spec index 1f6891c..4e4b042 100644 --- a/ft_multimedia.spec +++ b/ft_multimedia.spec @@ -95,8 +95,8 @@ rm -rf %{buildroot} %{_includedir}/* %changelog -* Thu Nov 14 2023 Peng He - 1.0.0-2 -- Update requires +* Fri Dec 15 2023 Jiaqi Zhao - 1.0.0-2 +- Delete distributed-utils requires and update deps * Tue Oct 10 2023 xieyijun3 - 1.0.0-1 -