diff --git a/thirdparty/djvulibre/HPKBUILD b/thirdparty/djvulibre/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..b7fccdd6bc585a105e3aac77f47a4bf945ed0ea0 --- /dev/null +++ b/thirdparty/djvulibre/HPKBUILD @@ -0,0 +1,87 @@ +# Contributor: wupingyuan +# Maintainer: wupingyuan +pkgname=djvulibre +pkgver=3.5.27.1-7 +pkgrel=0 +pkgdesc="DjVu (pronounced \"déjà vu\") a set of compression technologies, a file format,and a software platform for the delivery over the Web of digital documents,scanned documents, and high resolution images." +url="https://github.com/barak/djvulibre" +archs=("armeabi-v7a" "arm64-v8a") +license=("GPLv2") +depends=() +makedepends=() +install= +source="https://github.com/barak/djvulibre/archive/refs/tags/debian/$pkgver+deb9u1.tar.gz" + +autounpack=true +downloadpackage=true +patchflag=true +buildtools="configure" +builddir=$pkgname-"debian"-$pkgver-"deb9u1" +packagename=$builddir.tar.gz +source envset.sh +host= + +prepare() { + if $patchflag + then + cd $builddir + # 由于编译找不到这几个函数:pthread_setcancelstate、pthread_setcanceltype、pthread_cancel因此打补丁 + patch -p1 < `pwd`/../djvulibre_oh_pkg.patch + patchflag=false + cd $OLDPWD + fi + if [ $ARCH == "armeabi-v7a" ] + 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}" + 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}" + fi + cp -rf $builddir $pkgname-$ARCH-build + cd $pkgname-$ARCH-build + ./autogen.sh > `pwd`/build.log 2>&1 + cd $OLDPWD +} + +build() { + cd $pkgname-$ARCH-build + ./configure "$@" --host=$host --enable-static >> `pwd`/build.log 2>&1 + make -j4 >> `pwd`/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +package() { + cd $pkgname-$ARCH-build + make install >> `pwd`/build.log 2>&1 + ret=$? + cd $OLDPWD + if [ $ARCH == "armeabi-v7a" ] + then + unsetarm32ENV + fi + if [ $ARCH == "arm64-v8a" ] + then + unsetarm64ENV + fi + unset host + return $ret +} + +check() { + echo "The test must be on an OpenHarmony device!" + # 在OpenHarmony开发板中执行用例 + # ./c44 a.pbm a.djuv + # ./c44 b.pbm b.djuv + # ./djvm -c merge.djuv a.djuv b.djuv +} + +cleanbuild(){ + rm -rf ${PWD}/$builddir $builddir-armeabi-v7a-build $builddir-arm64-v8a-build #${PWD}/$packagename +} diff --git a/thirdparty/djvulibre/README.OpenSource b/thirdparty/djvulibre/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..3ccfcb25008b18d0a59bf83c13302ca57509a6f6 --- /dev/null +++ b/thirdparty/djvulibre/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "djvulibre", + "License": "GPLv2", + "License File": "COPYING", + "Version Number": "3.5.27.1-7", + "Owner": "wupingyuan@huawei.com", + "Upstream URL": "https://github.com/barak/djvulibre/archive/refs/tags/debian/3.5.27.1-7+deb9u1.tar.gz", + "Description": "DjVu (pronounced \"déjà vu\") a set of compression technologies, a file format,and a software platform for the delivery over the Web of digital documents,scanned documents, and high resolution images." + } +] diff --git a/thirdparty/djvulibre/README_zh.md b/thirdparty/djvulibre/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..7ef9d80e5593ad825a3845ae432e83bbb1f99422 --- /dev/null +++ b/thirdparty/djvulibre/README_zh.md @@ -0,0 +1,12 @@ +# djvulibre三方库说明 +## 功能简介 +djvulibre是一组压缩技术,一种文件格式,以及用于通过网络递送数字文档的软件平台,扫描文档和高分辨率图像。 +## 使用约束 +- IDE版本:DevEco Studio 3.1 Beta2 +- SDK版本:ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本:3.5.27.1-7 +- 当前适配的功能:支持把pbm转换djuv以及多个djuv文件合并 +- [GPLv2](https://github.com/barak/djvulibre) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/djvulibre/SHA512SUM b/thirdparty/djvulibre/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..c808a5c0c024c5078367a21ebc6fd40d4f7f92ab --- /dev/null +++ b/thirdparty/djvulibre/SHA512SUM @@ -0,0 +1,2 @@ +0247a57a4c64ad4eee7000627bf293133263115d0fc71352a72aac15bee0a636a4efcc9a165f0e1e29059f6ea827702bd81c3a82a0ef73b2325b13abff22be02 djvulibre-debian-3.5.27.1-7-deb9u1.tar.gz +1f128702999ce3edd197d5f9cf18cd9f0bcaca794da8dfdbc357095e1b62b34024f977563e7910f880389068f08ca9daa58d51ee39905e1efe8ea525a668e01f djvulibre_oh_pkg.patch diff --git a/thirdparty/djvulibre/djvulibre_oh_pkg.patch b/thirdparty/djvulibre/djvulibre_oh_pkg.patch new file mode 100644 index 0000000000000000000000000000000000000000..0423a72f8e50c6e32ed1861f04e378f28c7e6d73 --- /dev/null +++ b/thirdparty/djvulibre/djvulibre_oh_pkg.patch @@ -0,0 +1,27 @@ +diff -Naur djvulibre-debian-3.5.27.1-7-deb9u1/libdjvu/GThreads.cpp djvulibre-debian-3.5.27.1-7-deb9u1-patch/libdjvu/GThreads.cpp +--- djvulibre-debian-3.5.27.1-7-deb9u1/libdjvu/GThreads.cpp 2021-05-28 18:49:55.000000000 +0800 ++++ djvulibre-debian-3.5.27.1-7-deb9u1-patch/libdjvu/GThreads.cpp 2023-04-20 15:51:26.303032418 +0800 +@@ -376,10 +376,10 @@ + # endif + #else // !DCETHREADS + # ifdef PTHREAD_CANCEL_ENABLE +- pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0); ++// pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, 0); + # endif + # ifdef PTHREAD_CANCEL_ASYNCHRONOUS +- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0); ++// pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, 0); + # endif + #endif + // Catch exceptions +@@ -446,8 +446,8 @@ + void + GThread::terminate() + { +- if (xentry || xarg) +- pthread_cancel(hthr); ++// if (xentry || xarg) ++// pthread_cancel(hthr); + } + + int diff --git a/thirdparty/djvulibre/docs/hap_integrate.md b/thirdparty/djvulibre/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..76bfc3f44f50184eb18ecb054c76cf755fcc204e --- /dev/null +++ b/thirdparty/djvulibre/docs/hap_integrate.md @@ -0,0 +1,85 @@ +# djvulibre集成到应用hap +本库是在RK3568开发板上基于OpenHarmony3.2 Release版本的镜像验证的,如果是从未使用过RK3568,可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 +## 开发环境 +- ubuntu20.04 +- [OpenHarmony3.2Release镜像](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2-Release%2Fdayu200_standard_arm32.tar.gz) +- [ohos_sdk_public 3.2.11.9 (API Version 9 Release)](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2-Release%2Fohos-sdk-windows_linux-public.tar.gz) +- [DevEco Studio 3.1 Beta2](https://gitee.com/link?target=https%3A%2F%2Fcontentcenter-vali-drcn.dbankcdn.cn%2Fpvt_2%2FDeveloperAlliance_package_901_9%2Ff3%2Fv3%2FuJyuq3syQ2ak4hE1QZmAug%2Fdevecostudio-windows-3.1.0.400.zip%3FHW-CC-KV%3DV1%26HW-CC-Date%3D20230408T013335Z%26HW-CC-Expire%3D315360000%26HW-CC-Sign%3D96262721EDC9B34E6F62E66884AB7AE2A94C2A7B8C28D6F7FC891F46EB211A70) +- [准备三方库构建环境](../../../tools/README.md#编译环境准备) +- [准备三方库测试环境](../../../tools/README.md#ci环境准备) +## 编译三方库 +- 下载本仓库 + ``` + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` +- 三方库目录结构 + ``` + tpc_c_cplusplus/thirdparty/djvulibre #三方库djvulibre的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── djvulibre_oh_pkg.patch #补丁 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将djvulibre拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/djvulibre tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh djvulibre + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + ``` + djvulibre/arm64-v8a djvulibre/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 + ![thirdparty_install_dir](pic/djvulibre_install_dir.jpg) +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/djvulibre/${OHOS_ARCH}/lib/libdjvulibre.a) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/djvulibre/${OHOS_ARCH}/include) + ``` + ![djvulibre_usage](pic/djvulibre_usage.jpg) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试,[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +- 将编译生成的c44、djvm可执行文件及测试文件a.pbm、b.pbm准备好 + +- 将准备好的文件推送到开发板,在windows命令行进行如下操作 + + ``` + hdc_std shell mount -o remount,rw / #修改系统权限为可读写 + hdc_std file send c44 /data #将可执行文件推入开发板data目录 + hdc_std file send djvm /data + hdc_std file send libc++_shared.so /system/lib64 + hdc_std file send a.pbm /data #将测试文件推入开发板data目录 + hdc_std file send b.pbm /data + hdc_std shell #进入开发板 + chmod 777 c44 #添加权限 + chmod 777 djvm #添加权限 + ./c44 a.pbm a.djuv + ./c44 b.pbm b.djuv + ./djvm -c merge.djuv a.djuv b.djuv + ``` + + ![djvulibre_test](pic/djvulibre_test.jpg) + +## 参考资料 +- [润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld) +- [OpenHarmony三方库地址](https://gitee.com/openharmony-tpc) +- [OpenHarmony知识体系](https://gitee.com/openharmony-sig/knowledge) +- [通过DevEco Studio开发一个NAPI工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) diff --git a/thirdparty/djvulibre/docs/pic/djvulibre_install_dir.jpg b/thirdparty/djvulibre/docs/pic/djvulibre_install_dir.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4f85efc44c113e7dbf514d80a11404479dc3ae26 Binary files /dev/null and b/thirdparty/djvulibre/docs/pic/djvulibre_install_dir.jpg differ diff --git a/thirdparty/djvulibre/docs/pic/djvulibre_test.jpg b/thirdparty/djvulibre/docs/pic/djvulibre_test.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1933dd7d4855f6b6c4a3a09a3cfa0961853297b0 Binary files /dev/null and b/thirdparty/djvulibre/docs/pic/djvulibre_test.jpg differ diff --git a/thirdparty/djvulibre/docs/pic/djvulibre_usage.jpg b/thirdparty/djvulibre/docs/pic/djvulibre_usage.jpg new file mode 100644 index 0000000000000000000000000000000000000000..31892559bd5c801dc1ce996bccad560ac86f997d Binary files /dev/null and b/thirdparty/djvulibre/docs/pic/djvulibre_usage.jpg differ