From c02ca3942f031eef334c3225b3f79b388e930332 Mon Sep 17 00:00:00 2001 From: shann-wen Date: Fri, 21 Jul 2023 16:52:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9osip2=E6=94=B9=E4=B8=BAli?= =?UTF-8?q?bosip2=E8=A7=A3=E5=86=B3=E8=87=AA=E5=8A=A8=E5=8C=96=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=B8=8D=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=8A=E4=BC=A0=E8=87=AA=E5=8A=A8=E5=8C=96=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shann-wen --- thirdparty/{osip2 => libosip2}/HPKBUILD | 2 +- thirdparty/libosip2/HPKCHECK | 15 ++++++++++++ thirdparty/{osip2 => libosip2}/OAT.xml | 4 ++-- .../{osip2 => libosip2}/README.OpenSource | 4 ++-- thirdparty/{osip2 => libosip2}/README_zh.md | 4 ++-- thirdparty/{osip2 => libosip2}/SHA512SUM | 0 .../{osip2 => libosip2}/docs/hap_integrate.md | 22 +++++++++++------- .../docs/pic/osip2_install_dir.jpg | Bin .../docs/pic/osip2_test.jpg | Bin .../docs/pic/osip2_usage.jpg | Bin 10 files changed, 35 insertions(+), 16 deletions(-) rename thirdparty/{osip2 => libosip2}/HPKBUILD (88%) create mode 100644 thirdparty/libosip2/HPKCHECK rename thirdparty/{osip2 => libosip2}/OAT.xml (83%) rename thirdparty/{osip2 => libosip2}/README.OpenSource (53%) rename thirdparty/{osip2 => libosip2}/README_zh.md (59%) rename thirdparty/{osip2 => libosip2}/SHA512SUM (100%) rename thirdparty/{osip2 => libosip2}/docs/hap_integrate.md (89%) rename thirdparty/{osip2 => libosip2}/docs/pic/osip2_install_dir.jpg (100%) rename thirdparty/{osip2 => libosip2}/docs/pic/osip2_test.jpg (100%) rename thirdparty/{osip2 => libosip2}/docs/pic/osip2_usage.jpg (100%) diff --git a/thirdparty/osip2/HPKBUILD b/thirdparty/libosip2/HPKBUILD similarity index 88% rename from thirdparty/osip2/HPKBUILD rename to thirdparty/libosip2/HPKBUILD index a4b46188..8fbadd2d 100644 --- a/thirdparty/osip2/HPKBUILD +++ b/thirdparty/libosip2/HPKBUILD @@ -3,7 +3,7 @@ pkgname=libosip2 pkgver=5.3.1 pkgrel=0 -pkgdesc="osip2 is a C language library for parsing and processing the SIP protocol. It provides a powerful set of APIs used to implement SIP clients and servers." +pkgdesc="libosip2 is a C language library for parsing and processing the SIP protocol. It provides a powerful set of APIs used to implement SIP clients and servers." url="https://ftp.gnu.org/gnu/osip/" archs=("armeabi-v7a" "arm64-v8a") license=("LGPL") diff --git a/thirdparty/libosip2/HPKCHECK b/thirdparty/libosip2/HPKCHECK new file mode 100644 index 00000000..c0632614 --- /dev/null +++ b/thirdparty/libosip2/HPKCHECK @@ -0,0 +1,15 @@ +# Contributor: shann +# Maintainer: shann + +source HPKBUILD > /dev/null 2>&1 +logfile=${LYCIUM_ROOT}/../thirdparty/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log + +openharmonycheck() { + res=0 + cd $builddir/$ARCH-build/src/test/ + make check > ${logfile} 2>&1 + res=$? + cd $OLDPWD + + return $res +} \ No newline at end of file diff --git a/thirdparty/osip2/OAT.xml b/thirdparty/libosip2/OAT.xml similarity index 83% rename from thirdparty/osip2/OAT.xml rename to thirdparty/libosip2/OAT.xml index 06855414..90978a8a 100644 --- a/thirdparty/osip2/OAT.xml +++ b/thirdparty/libosip2/OAT.xml @@ -4,13 +4,13 @@ + - - + diff --git a/thirdparty/osip2/README.OpenSource b/thirdparty/libosip2/README.OpenSource similarity index 53% rename from thirdparty/osip2/README.OpenSource rename to thirdparty/libosip2/README.OpenSource index 64a9d2f6..fdfcd0a9 100644 --- a/thirdparty/osip2/README.OpenSource +++ b/thirdparty/libosip2/README.OpenSource @@ -1,11 +1,11 @@ [ { - "Name": "osip2", + "Name": "libosip2", "License": "LGPL", "License File": "http://www.gnu.org", "Version Number": "5.3.1", "Owner": "swkec@isoftstone.com", "Upstream URL": "https://ftp.gnu.org/gnu/osip/libosip2-5.3.1.tar.gz", - "Description": "osip2 is a C language library for parsing and processing the SIP protocol. It provides a powerful set of APIs used to implement SIP clients and servers." + "Description": "libosip2 is a C language library for parsing and processing the SIP protocol. It provides a powerful set of APIs used to implement SIP clients and servers." } ] diff --git a/thirdparty/osip2/README_zh.md b/thirdparty/libosip2/README_zh.md similarity index 59% rename from thirdparty/osip2/README_zh.md rename to thirdparty/libosip2/README_zh.md index a2e3286f..88bf0231 100644 --- a/thirdparty/osip2/README_zh.md +++ b/thirdparty/libosip2/README_zh.md @@ -1,6 +1,6 @@ -# osip2三方库说明 +# libosip2三方库说明 ## 功能简介 -Osip2是一个开放源代码的sip协议栈,是开源代码中不多使用C语言写的协议栈之一,它具有短小简洁的特点,专注于sip底层解析使得它的效率比较高. +libosip2是一个开放源代码的sip协议栈,是开源代码中不多使用C语言写的协议栈之一,它具有短小简洁的特点,专注于sip底层解析使得它的效率比较高. ## 使用约束 - IDE版本：DevEco Studio 3.1 Release - SDK版本：ohos_sdk_public 4.0.8.1 (API Version 10 Release) diff --git a/thirdparty/osip2/SHA512SUM b/thirdparty/libosip2/SHA512SUM similarity index 100% rename from thirdparty/osip2/SHA512SUM rename to thirdparty/libosip2/SHA512SUM diff --git a/thirdparty/osip2/docs/hap_integrate.md b/thirdparty/libosip2/docs/hap_integrate.md similarity index 89% rename from thirdparty/osip2/docs/hap_integrate.md rename to thirdparty/libosip2/docs/hap_integrate.md index d997889f..876d827d 100644 --- a/thirdparty/osip2/docs/hap_integrate.md +++ b/thirdparty/libosip2/docs/hap_integrate.md @@ -1,4 +1,4 @@ -# osip2集成到应用hap +# libosip2集成到应用hap 本库是在RK3568开发板上基于OpenHarmony3.2 Release版本的镜像验证的，如果是从未使用过RK3568，可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 ## 开发环境 - ubuntu20.04 @@ -12,10 +12,9 @@ ``` wget https://ftp.gnu.org/gnu/osip/libosip2-5.3.1.tar.gz ``` - - 三方库目录结构 ``` - tpc_c_cplusplus/thirdparty/osip2 #三方库osip2的目录结构如下 + tpc_c_cplusplus/thirdparty/libosip2 #三方库libosip2的目录结构如下 ├── docs #三方库相关文档的文件夹 ├── HPKBUILD #构建脚本 ├── SHA512SUM #三方库校验文件 @@ -23,18 +22,22 @@ ├── README_zh.md ``` +- 将libosip2拷贝至lycium/main目录下(没有main目录就手动创建一下) + ``` + cd tpc_c_cplusplus + cp thirdparty/libosip2 lycium/main -rf + ``` - 在lycium目录下编译三方库 - osip2库不需要依赖其它库，所以在build时只需要编译osip2库即可 + libosip2库不需要依赖其它库，所以在build时只需要编译libosip2库即可 编译环境的搭建参考[准备三方库构建环境](../../../lycium/README.md#1编译环境准备) ``` cd lycium - ./build.sh osip2 + ./build.sh libosip2 ``` - - 三方库头文件及生成的库 在lycium目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库 ``` - osip2/arm64-v8a osip2/armeabi-v7a + libosip2/arm64-v8a libosip2/armeabi-v7a ``` - [测试三方库](#测试三方库) @@ -43,7 +46,6 @@ - 在IDE的cpp目录下新增thirdparty目录，将编译生成的库拷贝到该目录下，如下图所示 -  ![thirdparty_install_dir](pic/osip2_install_dir.jpg) - 在最外层（cpp目录下）CMakeLists.txt中添加如下语句 @@ -51,13 +53,15 @@ #将三方库加入工程中 target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libosip2/${OHOS_ARCH}/lib/libosip2.a ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libosip2/${OHOS_ARCH}/lib/libosipparser2.a) - + #将三方库的头文件加入工程中 target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libosip2/${OHOS_ARCH}/include/osip2/ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libosip2/${OHOS_ARCH}/include/osipparser2/ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libosip2/${OHOS_ARCH}/include/osipparser2/headers) ``` + ![osip2_usage](pic/osip2_usage.jpg) + ## 测试三方库 三方库的测试使用原库自带的测试用例来做测试，[准备三方库测试环境](../../../lycium/README.md#3ci环境准备) diff --git a/thirdparty/osip2/docs/pic/osip2_install_dir.jpg b/thirdparty/libosip2/docs/pic/osip2_install_dir.jpg similarity index 100% rename from thirdparty/osip2/docs/pic/osip2_install_dir.jpg rename to thirdparty/libosip2/docs/pic/osip2_install_dir.jpg diff --git a/thirdparty/osip2/docs/pic/osip2_test.jpg b/thirdparty/libosip2/docs/pic/osip2_test.jpg similarity index 100% rename from thirdparty/osip2/docs/pic/osip2_test.jpg rename to thirdparty/libosip2/docs/pic/osip2_test.jpg diff --git a/thirdparty/osip2/docs/pic/osip2_usage.jpg b/thirdparty/libosip2/docs/pic/osip2_usage.jpg similarity index 100% rename from thirdparty/osip2/docs/pic/osip2_usage.jpg rename to thirdparty/libosip2/docs/pic/osip2_usage.jpg -- Gitee From c7874e8d3d27123619b8ab295712eafc0286e244 Mon Sep 17 00:00:00 2001 From: shann-wen Date: Tue, 25 Jul 2023 10:39:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlicense=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shann-wen --- thirdparty/fdk-aac/HPKBUILD | 2 +- thirdparty/fdk-aac/README.OpenSource | 4 ++-- thirdparty/libosip2/HPKCHECK | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thirdparty/fdk-aac/HPKBUILD b/thirdparty/fdk-aac/HPKBUILD index b7601a26..19a9bfad 100644 --- a/thirdparty/fdk-aac/HPKBUILD +++ b/thirdparty/fdk-aac/HPKBUILD @@ -6,7 +6,7 @@ pkgrel=0 pkgdesc="A standalone library of the Fraunhofer FDK AAC code from Android" url="https://github.com/mstorsjo/fdk-aac" archs=("armeabi-v7a" "arm64-v8a") -license=("Apache License 2.0") +license=("LicenseRef-scancode-fraunhofer-fdk-aac-codec") depends=() makedepends=() diff --git a/thirdparty/fdk-aac/README.OpenSource b/thirdparty/fdk-aac/README.OpenSource index ade15363..822133c1 100644 --- a/thirdparty/fdk-aac/README.OpenSource +++ b/thirdparty/fdk-aac/README.OpenSource @@ -1,8 +1,8 @@ [ { "Name": "fdk-aac", - "License": "Apache License 2.0", - "License File": "https://github.com/mstorsjo/fdk-aac/blob/master/METADATA", + "License": "LicenseRef-scancode-fraunhofer-fdk-aac-codec", + "License File": "https://developer.garmin.com/open-source/fraunhofer/", "Version Number": "v2.0.2", "Owner": "swkec@isoftstone.com", "Upstream URL": "https://github.com/mstorsjo/fdk-aac/archive/refs/tags/v2.0.2.tar.gz", diff --git a/thirdparty/libosip2/HPKCHECK b/thirdparty/libosip2/HPKCHECK index c0632614..5c932120 100644 --- a/thirdparty/libosip2/HPKCHECK +++ b/thirdparty/libosip2/HPKCHECK @@ -2,7 +2,7 @@ # Maintainer: shann source HPKBUILD > /dev/null 2>&1 -logfile=${LYCIUM_ROOT}/../thirdparty/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log +logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log openharmonycheck() { res=0 -- Gitee