From f9daded1136a7a1eb18febf3f130d7557f6942d8 Mon Sep 17 00:00:00 2001 From: wuguangzhao Date: Tue, 3 Dec 2024 11:42:26 +0800 Subject: [PATCH] =?UTF-8?q?speechd=E5=BA=93=E7=A7=BB=E5=85=A5thirdparty?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0HPKCHECK=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuguangzhao --- community/pulseaudio/HPKBUILD | 5 ++- community/speechd/OAT.xml | 16 -------- {community => thirdparty}/speechd/HPKBUILD | 0 thirdparty/speechd/HPKCHECK | 38 ++++++++++++++++++ .../speechd/README.OpenSource | 0 .../speechd/README_zh.md | 0 {community => thirdparty}/speechd/SHA512SUM | 0 .../speechd/docs/hap_integrate.md | 0 .../speechd/docs/pic/install_dir.png | Bin .../speechd/docs/pic/test_result1.png | Bin .../speechd/docs/pic/test_result2.png | Bin .../speechd/speechd_ohos.patch | 0 12 files changed, 42 insertions(+), 17 deletions(-) delete mode 100644 community/speechd/OAT.xml rename {community => thirdparty}/speechd/HPKBUILD (100%) create mode 100644 thirdparty/speechd/HPKCHECK rename {community => thirdparty}/speechd/README.OpenSource (100%) rename {community => thirdparty}/speechd/README_zh.md (100%) rename {community => thirdparty}/speechd/SHA512SUM (100%) rename {community => thirdparty}/speechd/docs/hap_integrate.md (100%) rename {community => thirdparty}/speechd/docs/pic/install_dir.png (100%) rename {community => thirdparty}/speechd/docs/pic/test_result1.png (100%) rename {community => thirdparty}/speechd/docs/pic/test_result2.png (100%) rename {community => thirdparty}/speechd/speechd_ohos.patch (100%) diff --git a/community/pulseaudio/HPKBUILD b/community/pulseaudio/HPKBUILD index 4ee220de..e4cb93df 100644 --- a/community/pulseaudio/HPKBUILD +++ b/community/pulseaudio/HPKBUILD @@ -10,7 +10,10 @@ archs=("armeabi-v7a" "arm64-v8a") license=("LGPLv2.1") depends=("libsndfile" "libatomic_ops" "speexdsp" "json-c" "gettext" "check" "fftw3" "gdbm") makedepends=("meson" "ninja") -source="git://anongit.freedesktop.org/$pkgname/$pkgname" + +# 官网提供的两个地址，其中一个不行可以更换为另一个 +# source="git://anongit.freedesktop.org/$pkgname/$pkgname" +source="http://anongit.freedesktop.org/git/$pkgname/$pkgname.git" downloadpackage=false autounpack=false diff --git a/community/speechd/OAT.xml b/community/speechd/OAT.xml deleted file mode 100644 index 03ee5a76..00000000 --- a/community/speechd/OAT.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/community/speechd/HPKBUILD b/thirdparty/speechd/HPKBUILD similarity index 100% rename from community/speechd/HPKBUILD rename to thirdparty/speechd/HPKBUILD diff --git a/thirdparty/speechd/HPKCHECK b/thirdparty/speechd/HPKCHECK new file mode 100644 index 00000000..b2868bd6 --- /dev/null +++ b/thirdparty/speechd/HPKCHECK @@ -0,0 +1,38 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Contributor: huangminzhong +# Maintainer: huangminzhong + +source HPKBUILD > /dev/null 2>&1 +logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log + +openharmonycheck() { + res=0 + + cd ${builddir}/${ARCH}-build/src/tests + + # run_test为执行测试脚本，若sed语句报错，可能会改变环境变量LD_LIBRARY_PATH的值，导致run_test执行失败 + # 可以尝试直接执行.libs/run_test basic.test 或者 更换sed版本 + ../../run-speechd > ${logfile} 2>&1 && ./run_test basic.test >> ${logfile} 2>&1 + res=$? + if [ $res -ne 0 ]; then + echo "test failed" >> ${logfile} 2>&1 + cd $OLDPWD + return $res + fi + + echo "test pass" >> ${logfile} 2>&1 + cd $OLDPWD + return $res +} diff --git a/community/speechd/README.OpenSource b/thirdparty/speechd/README.OpenSource similarity index 100% rename from community/speechd/README.OpenSource rename to thirdparty/speechd/README.OpenSource diff --git a/community/speechd/README_zh.md b/thirdparty/speechd/README_zh.md similarity index 100% rename from community/speechd/README_zh.md rename to thirdparty/speechd/README_zh.md diff --git a/community/speechd/SHA512SUM b/thirdparty/speechd/SHA512SUM similarity index 100% rename from community/speechd/SHA512SUM rename to thirdparty/speechd/SHA512SUM diff --git a/community/speechd/docs/hap_integrate.md b/thirdparty/speechd/docs/hap_integrate.md similarity index 100% rename from community/speechd/docs/hap_integrate.md rename to thirdparty/speechd/docs/hap_integrate.md diff --git a/community/speechd/docs/pic/install_dir.png b/thirdparty/speechd/docs/pic/install_dir.png similarity index 100% rename from community/speechd/docs/pic/install_dir.png rename to thirdparty/speechd/docs/pic/install_dir.png diff --git a/community/speechd/docs/pic/test_result1.png b/thirdparty/speechd/docs/pic/test_result1.png similarity index 100% rename from community/speechd/docs/pic/test_result1.png rename to thirdparty/speechd/docs/pic/test_result1.png diff --git a/community/speechd/docs/pic/test_result2.png b/thirdparty/speechd/docs/pic/test_result2.png similarity index 100% rename from community/speechd/docs/pic/test_result2.png rename to thirdparty/speechd/docs/pic/test_result2.png diff --git a/community/speechd/speechd_ohos.patch b/thirdparty/speechd/speechd_ohos.patch similarity index 100% rename from community/speechd/speechd_ohos.patch rename to thirdparty/speechd/speechd_ohos.patch -- Gitee