From 6aa689854cd27cbe6b296fd0fa5c9f83482c3a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=9F=B1?= Date: Wed, 8 Nov 2023 17:03:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9DBoW2=EF=BC=8Cboringssl?= =?UTF-8?q?=EF=BC=8Cgiflib=EF=BC=8Cspine-runtimes=EF=BC=8Ctremolo=E7=9A=84?= =?UTF-8?q?license=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 罗柱 --- thirdparty/DBoW2/HPKBUILD | 2 +- thirdparty/DBoW2/README.OpenSource | 2 +- thirdparty/boringssl/HPKBUILD | 2 +- thirdparty/boringssl/README.OpenSource | 2 +- thirdparty/giflib/HPKBUILD | 2 +- thirdparty/giflib/README.OpenSource | 2 +- thirdparty/spine-runtimes/HPKBUILD | 2 +- thirdparty/spine-runtimes/README.OpenSource | 2 +- thirdparty/tremolo/HPKBUILD | 2 +- thirdparty/tremolo/README.OpenSource | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/thirdparty/DBoW2/HPKBUILD b/thirdparty/DBoW2/HPKBUILD index 91e7f39e..c2d6d567 100644 --- a/thirdparty/DBoW2/HPKBUILD +++ b/thirdparty/DBoW2/HPKBUILD @@ -20,7 +20,7 @@ pkgrel=0 pkgdesc="Enhanced hierarchical bag-of-word library for C++" url="https://github.com/dorian3d/DBoW2" archs=("armeabi-v7a" "arm64-v8a") -license=("Copyright (c) 2015 Dorian Galvez-Lopez. http://doriangalvez.com All rights reserved.") +license=("BSD-3-Clause") depends=("opencv_3.4.1" "boost" "DLib") makedepends=() source="https://github.com/dorian3d/$pkgname/archive/refs/tags/$pkgver.tar.gz" diff --git a/thirdparty/DBoW2/README.OpenSource b/thirdparty/DBoW2/README.OpenSource index 5227e38d..f22d3852 100644 --- a/thirdparty/DBoW2/README.OpenSource +++ b/thirdparty/DBoW2/README.OpenSource @@ -1,7 +1,7 @@ [ { "Name": "DBoW2", - "License": "Copyright (c) 2015 Dorian Galvez-Lopez. http://doriangalvez.com All rights reserved.", + "License": "BSD-3-Clause", "License File": "https://github.com/dorian3d/DBoW2/blob/master/LICENSE.txt", "Version Number": "v1.1-free", "Owner": "357489213@qq.com", diff --git a/thirdparty/boringssl/HPKBUILD b/thirdparty/boringssl/HPKBUILD index a0139727..3715928b 100644 --- a/thirdparty/boringssl/HPKBUILD +++ b/thirdparty/boringssl/HPKBUILD @@ -20,7 +20,7 @@ pkgrel=0 pkgdesc="BoringSSL is a fork of OpenSSL that is designed to meet Google's needs." url="https://boringssl.googlesource.com/boringssl" archs=("armeabi-v7a" "arm64-v8a") -license=("Apache License 2.0") # under OpenSSL licensing +license=("Apache License 2.0 and ISC License") # under OpenSSL licensing depends=() makedepends=("perl" "go") diff --git a/thirdparty/boringssl/README.OpenSource b/thirdparty/boringssl/README.OpenSource index cdb61c3a..536df352 100644 --- a/thirdparty/boringssl/README.OpenSource +++ b/thirdparty/boringssl/README.OpenSource @@ -1,7 +1,7 @@ [ { "Name": "boringssl", - "License": "Apache License 2.0", + "License": "Apache License 2.0 and ISC License", "License File": "https://github.com/google/boringssl/blob/master/LICENSE", "Version Number": "fips-20220613", "Owner": "tangshaoteng@163.com", diff --git a/thirdparty/giflib/HPKBUILD b/thirdparty/giflib/HPKBUILD index 4580c86f..9633cd3f 100644 --- a/thirdparty/giflib/HPKBUILD +++ b/thirdparty/giflib/HPKBUILD @@ -20,7 +20,7 @@ pkgrel=0 pkgdesc="giflib is a library for reading and writing gif images. " url="https://sourceforge.net/projects/giflib/" archs=("armeabi-v7a" "arm64-v8a") -license=("1997 Eric S. Raymond") +license=("MIT license") depends=() makedepends=("xmlto") # 从sourceforge仓库获取的代码需要生成html格式文件,需要xmlto工具 diff --git a/thirdparty/giflib/README.OpenSource b/thirdparty/giflib/README.OpenSource index 85e4046f..e3a0af76 100755 --- a/thirdparty/giflib/README.OpenSource +++ b/thirdparty/giflib/README.OpenSource @@ -1,7 +1,7 @@ [ { "Name": "giflib", - "License": "giflib COPYING", + "License": "MIT license", "License File": "COPYING", "Version Number": "5.2.1", "Owner": "huangminzhong2@huawei.com", diff --git a/thirdparty/spine-runtimes/HPKBUILD b/thirdparty/spine-runtimes/HPKBUILD index b08d80d4..dfda9ea6 100755 --- a/thirdparty/spine-runtimes/HPKBUILD +++ b/thirdparty/spine-runtimes/HPKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="This GitHub project hosts the Spine Runtimes which are needed to use Spine 2D skeletal animation data with various game toolkits." url="http://zh.esotericsoftware.com//" archs=("armeabi-v7a" "arm64-v8a") -license=("BSD") +license=("BSD-3-Clause") depends=() makedepends=() source="https://github.com/EsotericSoftware/${pkgname}/archive/refs/tags/${pkgver}.tar.gz" diff --git a/thirdparty/spine-runtimes/README.OpenSource b/thirdparty/spine-runtimes/README.OpenSource index 4711500b..c6d9b9af 100644 --- a/thirdparty/spine-runtimes/README.OpenSource +++ b/thirdparty/spine-runtimes/README.OpenSource @@ -1,7 +1,7 @@ [ { "Name": "spine-runtimes", - "License": "BSD", + "License": "BSD-3-Clause", "License File": "https://github.com/EsotericSoftware/spine-runtimes/blob/4.1/LICENSE", "Version Number": "4.1.00", "Owner": "1596268623@qq.com", diff --git a/thirdparty/tremolo/HPKBUILD b/thirdparty/tremolo/HPKBUILD index ebed2815..3cad9442 100644 --- a/thirdparty/tremolo/HPKBUILD +++ b/thirdparty/tremolo/HPKBUILD @@ -18,7 +18,7 @@ pkgrel=0 pkgdesc="Tremolo is an ARM optimised version of the Tremor lib from xiph.org. For those that don't know, the Tremor lib is an integer only library for doing Ogg Vorbis decompression." url="http://wss.co.uk/pinknoise/tremolo/index.html" archs=("armeabi-v7a" "arm64-v8a") -license=("GNU GPL") +license=("BSD-3-Clause") depends=() makedepends=() diff --git a/thirdparty/tremolo/README.OpenSource b/thirdparty/tremolo/README.OpenSource index e4c2dc1c..78599aa5 100644 --- a/thirdparty/tremolo/README.OpenSource +++ b/thirdparty/tremolo/README.OpenSource @@ -1,7 +1,7 @@ [ { "Name": "tremolo", - "License": "GNU GPL", + "License": "BSD-3-Clause", "License File": "http://wss.co.uk/pinknoise/tremolo/index.html", "Version Number": "008", "Owner": "swkec@isoftstone.com", -- Gitee From 5118c789b4418344ab55e24432d815134851e8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=9F=B1?= Date: Wed, 8 Nov 2023 17:15:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9libvips=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E4=B8=AD=E7=89=88=E6=9C=AC=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 罗柱 --- thirdparty/libvips/README.OpenSource | 2 +- thirdparty/libvips/README_zh.md | 2 +- thirdparty/spine-runtimes/HPKBUILD | 2 +- thirdparty/spine-runtimes/README.OpenSource | 2 +- thirdparty/tremolo/README.OpenSource | 2 +- thirdparty/tremolo/README_zh.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/thirdparty/libvips/README.OpenSource b/thirdparty/libvips/README.OpenSource index 7c30f58f..ac357d24 100755 --- a/thirdparty/libvips/README.OpenSource +++ b/thirdparty/libvips/README.OpenSource @@ -3,7 +3,7 @@ "Name": "libvips", "License": "LGPL-2.1", "License File": "LICENSE", - "Version Number": "8.14.5", + "Version Number": "v8.14.5", "Owner": "1393302983@qq.com", "Upstream URL": "https://codeload.github.com/libvips/libvips/tar.gz/refs/tags/v8.14.5", "Description": "libvips is a demand-driven, horizontally threaded image processing library." diff --git a/thirdparty/libvips/README_zh.md b/thirdparty/libvips/README_zh.md index 18156e90..84322506 100755 --- a/thirdparty/libvips/README_zh.md +++ b/thirdparty/libvips/README_zh.md @@ -4,7 +4,7 @@ libvips 是一个需求驱动的水平线程图像处理库。 ## 使用约束 - IDE版本：DevEco Studio 3.1 Release - SDK版本：ohos_sdk_public 4.0.8.1 (API Version 10 Release) -- 三方库版本：2.1.91 +- 三方库版本：v8.14.5 - 当前适配的功能：涵盖算术、直方图、卷积、形态操作、频率过滤、颜色等操作，支持多种图像格式，包括JPEG，，TIFF，PNG等。 ## 集成方式 diff --git a/thirdparty/spine-runtimes/HPKBUILD b/thirdparty/spine-runtimes/HPKBUILD index dfda9ea6..a8ce5bda 100755 --- a/thirdparty/spine-runtimes/HPKBUILD +++ b/thirdparty/spine-runtimes/HPKBUILD @@ -7,7 +7,7 @@ pkgrel=0 pkgdesc="This GitHub project hosts the Spine Runtimes which are needed to use Spine 2D skeletal animation data with various game toolkits." url="http://zh.esotericsoftware.com//" archs=("armeabi-v7a" "arm64-v8a") -license=("BSD-3-Clause") +license=("") depends=() makedepends=() source="https://github.com/EsotericSoftware/${pkgname}/archive/refs/tags/${pkgver}.tar.gz" diff --git a/thirdparty/spine-runtimes/README.OpenSource b/thirdparty/spine-runtimes/README.OpenSource index c6d9b9af..0e6a425a 100644 --- a/thirdparty/spine-runtimes/README.OpenSource +++ b/thirdparty/spine-runtimes/README.OpenSource @@ -1,7 +1,7 @@ [ { "Name": "spine-runtimes", - "License": "BSD-3-Clause", + "License": "", "License File": "https://github.com/EsotericSoftware/spine-runtimes/blob/4.1/LICENSE", "Version Number": "4.1.00", "Owner": "1596268623@qq.com", diff --git a/thirdparty/tremolo/README.OpenSource b/thirdparty/tremolo/README.OpenSource index 78599aa5..c12cb464 100644 --- a/thirdparty/tremolo/README.OpenSource +++ b/thirdparty/tremolo/README.OpenSource @@ -3,7 +3,7 @@ "Name": "tremolo", "License": "BSD-3-Clause", "License File": "http://wss.co.uk/pinknoise/tremolo/index.html", - "Version Number": "008", + "Version Number": "0.08", "Owner": "swkec@isoftstone.com", "Upstream URL": "http://wss.co.uk/pinknoise/tremolo/Tremolo008.zip", "Description": "Tremolo is an ARM optimised version of the Tremor lib from xiph.org. For those that don't know, the Tremor lib is an integer only library for doing Ogg Vorbis decompression." diff --git a/thirdparty/tremolo/README_zh.md b/thirdparty/tremolo/README_zh.md index 1d042f54..f3d9e6ec 100644 --- a/thirdparty/tremolo/README_zh.md +++ b/thirdparty/tremolo/README_zh.md @@ -4,7 +4,7 @@ Tremolo是xiph.org上Tremor lib的ARM优化版本。Tremor库是一个用于执 ## 使用约束 - IDE版本：DevEco Studio 3.1 Release - SDK版本：ohos_sdk_public 4.0.8.1 (API Version 10 Release) -- 三方库版本：008 +- 三方库版本：0.08 - 当前适配的功能：Ogg Vorbis解压缩. ## 集成方式 -- Gitee