diff --git a/thirdparty/PROJ/HPKBUILD b/thirdparty/PROJ/HPKBUILD index 64b1a102b6256f984fe9fd2e5e22b2e8029bf47b..6fac6043fc7b1a0d02d07fc1e2ae774ec22068e5 100644 --- a/thirdparty/PROJ/HPKBUILD +++ b/thirdparty/PROJ/HPKBUILD @@ -21,7 +21,7 @@ pkgdesc="PROJ is a general purpose coordinate conversion software that can conve url="https://github.com/OSGeo/PROJ" archs=("armeabi-v7a" "arm64-v8a") license=("MIT License") -depends=("sqlite" "tiff" "curl" "openssl") +depends=("sqlite_3_46_0" "tiff" "curl_8_9_0" "openssl_1_1_1w") source="https://github.com/OSGeo/$pkgname/archive/refs/tags/$pkgver.tar.gz" @@ -94,8 +94,8 @@ build() { cd $builddir ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" \ -DEXE_SQLITE3=$LYCIUM_ROOT/../thirdparty/PROJ/$sqlitebuilddir/sqlite3 \ - -DOPENSSL_INCLUDE_DIR=$LYCIUM_ROOT/usr/openssl/${ARCH}/include \ - -DOPENSSL_SSL_LIBRARY=$LYCIUM_ROOT/usr/openssl/${ARCH}/lib \ + -DOPENSSL_INCLUDE_DIR=$LYCIUM_ROOT/usr/openssl_1_1_1w/${ARCH}/include \ + -DOPENSSL_SSL_LIBRARY=$LYCIUM_ROOT/usr/openssl_1_1_1w/${ARCH}/lib \ -DCMAKE_PREFIX_PATH=${LYCIUM_ROOT}/usr/tiff/${ARCH} \ -B$ARCH-build -S./ -L >> $buildlog 2>&1 ret=$? diff --git a/thirdparty/PROJ/HPKCHECK b/thirdparty/PROJ/HPKCHECK index 8ba53bf227a53bb2ca8a3bc5644733484218e614..a9ab811de62a2d8404185569badeb0f303cda480 100644 --- a/thirdparty/PROJ/HPKCHECK +++ b/thirdparty/PROJ/HPKCHECK @@ -21,7 +21,7 @@ openharmonycheck() { cd $builddir/$ARCH-build echo "total test 61" > $logfile 2>&1 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/data/tpc_c_cplusplus/thirdparty/PROJ/PROJ-9.4.1/${ARCH}-build/lib/ - export PATH=${PATH}:/data/tpc_c_cplusplus/lycium/usr/sqlite/${ARCH}/bin/ + export PATH=${PATH}:/data/tpc_c_cplusplus/lycium/usr/sqlite_3_46_0/${ARCH}/bin/ ctest >> ${logfile} 2>&1 res=$? if [ $res -ne 0 ];then diff --git a/thirdparty/PROJ/README.OpenSource b/thirdparty/PROJ/README.OpenSource index ca9da074a8e398a64525a219fc7134ab9b55832a..7cc38958923e207e600ee8e024b8de0b846ea64d 100644 --- a/thirdparty/PROJ/README.OpenSource +++ b/thirdparty/PROJ/README.OpenSource @@ -9,12 +9,12 @@ "Description": "PROJ is the most famous map projection library of open source GIS, which provides the function of coordinate conversion between multiple coordinate systems. " }, { - "Name": "sqlite", - "License": "Public Domain", - "License File": "https://www.sqlite.org/copyright.html", - "Version Number": "version-3.42.0", - "Owner": "wupingyuan@huawei.com", - "Upstream URL": "https://github.com/sqlite/sqlite/archive/refs/tags/.tar.gz", + "Name": "sqlite_3_46_0", + "License": "blessing", + "License File": "https://github.com/sqlite/sqlite/blob/master/LICENSE.md", + "Version Number": "version-3.46.0", + "Owner": "huangminzhong2@huawei.com", + "Upstream URL": "https://github.com/sqlite/sqlite", "Description": "This repository contains the complete source code for the SQLite database engine. Some test scripts are also included. However, many other test scripts and most of the documentation are managed separately." }, { @@ -27,12 +27,21 @@ "Description": "a small collection of tools for doingsimple manipulations of TIFF images, and documentation on the library and tools." }, { - "Name": "curl", + "Name": "curl-8_9_0", "License": "BSD/ISC/curl", - "License File": "https://github.com/curl/curl/blob/master/COPYING", - "Version Number": "curl-8_0_1", + "License File": "https://github.com/curl/curl/tree/curl-8_9_0/LICENSES", + "Version Number": "curl-8_9_0", "Owner": "hanjinfei@foxmail.com", - "Upstream URL": "https://github.com/curl/curl/archive/refs/tags/curl-8_0_1.tar.gz", + "Upstream URL": "https://github.com/curl/curl/archive/refs/tags/curl-8_9_0.tar.gz", "Description": "Curl is a command-line tool for transferring data specified with URL syntax. Find out how to use curl by reading the curl.1 man page or the MANUAL document. Find out how to install Curl by reading the INSTALL document." + }, + { + "Name": "openssl_1_1_1w", + "License": "OpenSSL License and Original SSLeay License", + "License File": "https://www.openssl.org/source/license-openssl-ssleay.txt", + "Version Number": "1.1.1w", + "Owner": "xiafeng@huawei.com", + "Upstream URL": "https://gitee.com/mirrors/openssl/repository/archive/OpenSSL_1_1_1w.zip", + "Description": "OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit for the Transport Layer Security (TLS) protocol formerly known as the Secure Sockets Layer (SSL) protocol." } ] diff --git a/thirdparty/PROJ/docs/hap_integrate.md b/thirdparty/PROJ/docs/hap_integrate.md index 46c199fdc42e849cb5efd8e3a2d0e96d0641c960..8d4eb732510478903d846d141ebcf3d0a8793461 100644 --- a/thirdparty/PROJ/docs/hap_integrate.md +++ b/thirdparty/PROJ/docs/hap_integrate.md @@ -112,11 +112,11 @@ target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/ 进入到构建目录运行测试用例(注意arm64-v8a为构建64位的目录,armeabi-v7a为构建32位的目录),执行ctest前,需要导入环境变量 ```shell - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/data/tpc_c_cplusplus/thirdparty/PROJ/PROJ-9.4.1/armeabi-v7a-build/lib/:/data/tpc_c_cplusplus/lycium/usr/sqlite/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/tiff/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/curl/armeabi-v7a/lib/:/data/lycium-citools/armeabi-v7a-gdb/lib/:/data/tpc_c_cplusplus/lycium/usr/libdeflate/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/libjpeg-turbo/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/xz/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/zstd_1_5_6/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/libwebp/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/nghttp2/armeabi-v7a/lib/ - (或者export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/data/tpc_c_cplusplus/thirdparty/PROJ/PROJ-9.4.1/arm64-v8a-build/lib/:/data/tpc_c_cplusplus/lycium/usr/sqlite/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/tiff/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/curl/arm64-v8a/lib/:/data/lycium-citools/arm64-v8a-gdb/lib/:/data/tpc_c_cplusplus/lycium/usr/libdeflate/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/libjpeg-turbo/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/xz/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/zstd_1_5_6/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/libwebp/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/nghttp2/arm64-v8a/lib/) + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/data/tpc_c_cplusplus/thirdparty/PROJ/PROJ-9.4.1/armeabi-v7a-build/lib/:/data/tpc_c_cplusplus/lycium/usr/sqlite_3_46_0/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/tiff/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/curl_8_9_0/armeabi-v7a/lib/:/data/lycium-citools/armeabi-v7a-gdb/lib/:/data/tpc_c_cplusplus/lycium/usr/libdeflate/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/libjpeg-turbo/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/xz/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/zstd_1_5_6/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/libwebp/armeabi-v7a/lib/:/data/tpc_c_cplusplus/lycium/usr/nghttp2/armeabi-v7a/lib/ + (或者export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/data/tpc_c_cplusplus/thirdparty/PROJ/PROJ-9.4.1/arm64-v8a-build/lib/:/data/tpc_c_cplusplus/lycium/usr/sqlite_3_46_0/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/tiff/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/curl_8_9_0/arm64-v8a/lib/:/data/lycium-citools/arm64-v8a-gdb/lib/:/data/tpc_c_cplusplus/lycium/usr/libdeflate/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/libjpeg-turbo/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/xz/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/zstd_1_5_6/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/libwebp/arm64-v8a/lib/:/data/tpc_c_cplusplus/lycium/usr/nghttp2/arm64-v8a/lib/) - export PATH=${PATH}:/data/tpc_c_cplusplus/lycium/usr/sqlite/armeabi-v7a/bin/ - (或者export PATH=${PATH}:/data/tpc_c_cplusplus/lycium/usr/sqlite/arm64-v8a/bin/) + export PATH=${PATH}:/data/tpc_c_cplusplus/lycium/usr/sqlite_3_46_0/armeabi-v7a/bin/ + (或者export PATH=${PATH}:/data/tpc_c_cplusplus/lycium/usr/sqlite_3_46_0/arm64-v8a/bin/) ``` 执行ctest及结果如图所示 ```shell