diff --git a/docs/thirdparty_list.md b/docs/thirdparty_list.md index 55c8ea812cfec64557829e1a05442aa08c6adeb9..199cee4178421c229ee8550e34ddcc556a678a76 100755 --- a/docs/thirdparty_list.md +++ b/docs/thirdparty_list.md @@ -44,4 +44,11 @@ | [libxls](../thirdparty/libxls/README_zh.md) | BSD | | 是 | | [libtess2](../thirdparty/libtess2/README_zh.md) | SGI FREE SOFTWARE LICENSE B | | 是 | | [djvulibre](../thirdparty/djvulibre/README_zh.md) | GPLv2 | | 是 | +| [expat](../thirdparty/libexpat/README_zh.md) | MIT License | | 是 | +| [exiv2](../thirdparty/exiv2/README_zh.md) | GPL 2.0 | | 是 | +| [libpng](../thirdparty/libpng/README_zh.md) | zlib/libpng License | | 是 | +| [soundtouch](../thirdparty/soundtouch/README_zh.md) | LGPLv2.1 | | 是 | +| [jbigkit](../thirdparty/jbigkit/README_zh.md) | GNU General Public License | | 是 | +| [zbar](../thirdparty/zbar/README_zh.md) | LGPL2.1 | | 是 | +| [marisa-trie](../thirdparty/marisa-trie/README_zh.md) | LGPL-2.1/GPL-2.0 | | 是 | diff --git a/thirdparty/cryptopp/HPKBUILD b/thirdparty/cryptopp/HPKBUILD index 5fe6c221c9de882d6a3a5168a62666c701a28f75..f0286fc63a47dfe3d6bb15ea666b2a8d5623611e 100644 --- a/thirdparty/cryptopp/HPKBUILD +++ b/thirdparty/cryptopp/HPKBUILD @@ -46,7 +46,7 @@ build() { package() { cd $builddir-$ARCH-build - make install PREFIX=$LYCIUM_ROOT/usr/$pkgname-$ARCH-install >> `pwd`/build.log 2>&1 + make install PREFIX=$LYCIUM_ROOT/usr/$pkgname/$ARCH >> `pwd`/build.log 2>&1 cd $OLDPWD if [ $ARCH == "armeabi-v7a" ] then @@ -67,4 +67,4 @@ check() { cleanbuild(){ rm -rf ${PWD}/$builddir $builddir-armeabi-v7a-build $builddir-arm64-v8a-build #${PWD}/$packagename -} \ No newline at end of file +} diff --git a/thirdparty/djvulibre/HPKBUILD b/thirdparty/djvulibre/HPKBUILD index b7fccdd6bc585a105e3aac77f47a4bf945ed0ea0..7c619974955aeb296edfec54a35bb2bd7ea34f87 100644 --- a/thirdparty/djvulibre/HPKBUILD +++ b/thirdparty/djvulibre/HPKBUILD @@ -34,13 +34,13 @@ prepare() { then setarm32ENV host=arm-linux - export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/12.0.1/lib/arm-linux-ohos/a7_hard_neon-vfpv4/libclang_rt.builtins.a ${LDFLAGS}" + export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/${CLANG_VERSION}/lib/arm-linux-ohos/a7_hard_neon-vfpv4/libclang_rt.builtins.a ${LDFLAGS}" fi if [ $ARCH == "arm64-v8a" ] then setarm64ENV host=aarch64-linux - export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/12.0.1/lib/aarch64-linux-ohos/libclang_rt.builtins.a ${LDFLAGS}" + export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/${CLANG_VERSION}/lib/aarch64-linux-ohos/libclang_rt.builtins.a ${LDFLAGS}" fi cp -rf $builddir $pkgname-$ARCH-build cd $pkgname-$ARCH-build diff --git a/thirdparty/hunspell/HPKBUILD b/thirdparty/hunspell/HPKBUILD index 8ef04ba33f4fa78266efbee27c5c3cc1af823d1f..b56b96445ba0354131381f6ce992a7fc22232278 100644 --- a/thirdparty/hunspell/HPKBUILD +++ b/thirdparty/hunspell/HPKBUILD @@ -27,13 +27,13 @@ prepare() { then setarm32ENV host=arm-linux - export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/12.0.1/lib/arm-linux-ohos/a7_hard_neon-vfpv4/libclang_rt.builtins.a ${LDFLAGS}" + export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/${CLANG_VERSION}/lib/arm-linux-ohos/a7_hard_neon-vfpv4/libclang_rt.builtins.a ${LDFLAGS}" fi if [ $ARCH == ${archs[1]} ] then setarm64ENV host=aarch64-linux - export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/12.0.1/lib/aarch64-linux-ohos/libclang_rt.builtins.a ${LDFLAGS}" + export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/${CLANG_VERSION}/lib/aarch64-linux-ohos/libclang_rt.builtins.a ${LDFLAGS}" fi cd $builddir-$ARCH-build autoreconf -ifv > `pwd`/build.log 2>&1 diff --git a/thirdparty/hunspell/README.OpenSource b/thirdparty/hunspell/README.OpenSource old mode 100755 new mode 100644 diff --git a/thirdparty/hunspell/README_zh.md b/thirdparty/hunspell/README_zh.md old mode 100755 new mode 100644 diff --git a/thirdparty/hunspell/docs/hap_integrate.md b/thirdparty/hunspell/docs/hap_integrate.md old mode 100755 new mode 100644 diff --git a/thirdparty/hunspell/docs/pic/hunspell_install_dir.png b/thirdparty/hunspell/docs/pic/hunspell_install_dir.png old mode 100755 new mode 100644 diff --git a/thirdparty/hunspell/docs/pic/hunspell_test.png b/thirdparty/hunspell/docs/pic/hunspell_test.png old mode 100755 new mode 100644 diff --git a/thirdparty/hunspell/docs/pic/hunspell_usage.png b/thirdparty/hunspell/docs/pic/hunspell_usage.png old mode 100755 new mode 100644 diff --git a/thirdparty/tinyxpath/HPKBUILD b/thirdparty/tinyxpath/HPKBUILD old mode 100755 new mode 100644 index a8dc1fe534a560df075592b669661e7f6b094391..13efb9a38c21111896aa6b111f81bf8ad9bc0d67 --- a/thirdparty/tinyxpath/HPKBUILD +++ b/thirdparty/tinyxpath/HPKBUILD @@ -9,18 +9,18 @@ archs=("armeabi-v7a" "arm64-v8a") license=("LGPL-2.1" "GPL-2.0") depends=() makedepends=() -install= + source="https://sourceforge.net/projects/tinyxpath/files/TinyXPath%20%28Linux%20-%20tar.gz%29/TinyXPath%201.3.1/tinyxpath_1_3_1.tgz" downloadpackage=true autounpack=false buildDir=$pkgname-$pkgver -packageName=tinyxpath_1_3_1.tgz # 压缩包名 +packagename=tinyxpath_1_3_1.tgz # 压缩包名 decompFlag=true prepare() { if [ $decompFlag == true ];then mkdir -p $buildDir - tar xvf $packageName -C $buildDir > /dev/null + tar xvf $packagename -C $buildDir > /dev/null decompFlag=false cd $buildDir patch -p1 < `pwd`/../tinyxpath_oh_pkg.patch @@ -31,7 +31,7 @@ prepare() { build() { cd $buildDir - ${OHOS_SDK}/native/build-tools/cmake/bin/cmake $* -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 make -j4 -C $ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1 ret=$? cd $OLDPWD @@ -50,5 +50,5 @@ check() { # 清理环境 cleanbuild(){ - rm -rf ${PWD}/$buildDir #${PWD}/$packageName + rm -rf ${PWD}/$buildDir #${PWD}/$packagename } diff --git a/thirdparty/tinyxpath/README.OpenSource b/thirdparty/tinyxpath/README.OpenSource old mode 100755 new mode 100644 diff --git a/thirdparty/tinyxpath/README_zh.md b/thirdparty/tinyxpath/README_zh.md old mode 100755 new mode 100644 diff --git a/thirdparty/tinyxpath/SHA512SUM b/thirdparty/tinyxpath/SHA512SUM old mode 100755 new mode 100644 diff --git a/thirdparty/tinyxpath/docs/hap_integrate.md b/thirdparty/tinyxpath/docs/hap_integrate.md old mode 100755 new mode 100644 index d1497dc30a558b8cc76337aed46c4f047bc89623..f64c129265480495a60a5381ee928b55c8443e78 --- a/thirdparty/tinyxpath/docs/hap_integrate.md +++ b/thirdparty/tinyxpath/docs/hap_integrate.md @@ -73,7 +73,7 @@ target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/tinyxpath/${OHOS_ARCH}/include) ``` - ![tinyxpath_usage](pic/tinyxpath_usage.png) + ![tinyxpath_usage](../../thirdparty_template/docs/pic/xxx_usage.png) ## 测试三方库 diff --git a/thirdparty/tinyxpath/docs/pic/tinyxpath_install_dir.png b/thirdparty/tinyxpath/docs/pic/tinyxpath_install_dir.png deleted file mode 100755 index ccf3eb8adaaf3fa591c069aba9369e6d0607cf88..0000000000000000000000000000000000000000 Binary files a/thirdparty/tinyxpath/docs/pic/tinyxpath_install_dir.png and /dev/null differ diff --git a/thirdparty/tinyxpath/docs/pic/tinyxpath_test.png b/thirdparty/tinyxpath/docs/pic/tinyxpath_test.png old mode 100755 new mode 100644 diff --git a/thirdparty/tinyxpath/docs/pic/tinyxpath_usage.png b/thirdparty/tinyxpath/docs/pic/tinyxpath_usage.png deleted file mode 100755 index 676e188a6d5f14109bbb7c907d28ba345c904cfe..0000000000000000000000000000000000000000 Binary files a/thirdparty/tinyxpath/docs/pic/tinyxpath_usage.png and /dev/null differ diff --git a/thirdparty/tinyxpath/tinyxpath_oh_pkg.patch b/thirdparty/tinyxpath/tinyxpath_oh_pkg.patch old mode 100755 new mode 100644