diff --git a/thirdparty/exiv2/HPKBUILD b/thirdparty/exiv2/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..0d61ad1c920769c1a742b8b863de0ba85b0eec90 --- /dev/null +++ b/thirdparty/exiv2/HPKBUILD @@ -0,0 +1,79 @@ +# Contributor: wupingyuan +# Maintainer: wupingyuan +pkgname=exiv2 +pkgver=v0.27.6 +pkgrel=0 +pkgdesc="Exiv2 is a C++ library and a command-line utility to read, write, delete and modify Exif, IPTC, XMP and ICC image metadata." +url="https://github.com/Exiv2/exiv2" +archs=("armeabi-v7a" "arm64-v8a") +license=("GPL2.0") +depends=("libexpat") +makedepends=() +install= +source="https://github.com/Exiv2/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +downloadpackage=true +builddir=$pkgname-${pkgver:1} +packagename=$builddir.tar.gz + +prepare() { + mkdir -p $builddir/$ARCH-build +} + +build() { + cd ${builddir} + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=${ARCH} -B`pwd`/$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 + make -j4 -C `pwd`/$ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +package() { + cd $builddir + make -C $ARCH-build install >> `pwd`/$ARCH-build/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +check() { + echo "The test must be on an OpenHarmony device!" + # 在OpenHarmony开发板中执行用例 + # 由于ctest测试使用到了python无法在开发板中正常测试，因此使用sample测试 + # 读取iptc + # ./exiv2 -pi exiv2.jpg + # 添加iptc + # ./exiv2 -M "add Iptc.Application2.Credit String mee too!" exiv2.jpg + # 修改iptc + # ./exiv2 -M "set Iptc.Application2.Credit String mee test!" exiv2.jpg + # 删除iptc + # ./exiv2 -M "del Iptc.Application2.Credit" exiv2.jpg + # 读取xmp + # ./exiv2 -px exiv2.jpg + # 添加xmp + # ./exiv2 -M "add Xmp.dc.format XmpText image/jpeg" exiv2.jpg + # 修改xmp + # ./exiv2 -M "set Xmp.dc.format XmpText image/png" exiv2.jpg + # 删除xmp + # ./exiv2 -M "del Xmp.dc.format" exiv2.jpg + # 读取exif + # ./exiv2 -pe exiv2.jpg + # 添加exif + # ./exiv2 -M "add Exif.Image.WhitePoint Short 32 12 4 5 6" exiv2.jpg + # 修改exif + # ./exiv2 -M "set Exif.Image.WhitePoint Short 10" exiv2.jpg + # 删除exif + # ./exiv2 -M "del Exif.Image.WhitePoint" + # 读取icc + # ./exiv2 -b -pC exiv2.jpg + # 添加或修改icc(添加或修改icc文件时，注意icc文件名要和当前的图片的名字保持一致,.icc文件放在和图片文件同目录下) + # ./exiv2 -iC exiv2.jpg + # 删除icc + # ./exiv2 -dC exiv2.jpg +} + +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} diff --git a/thirdparty/exiv2/README.OpenSource b/thirdparty/exiv2/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..2ddc150b3022ae504f41d03dc16c855f64ef1a9c --- /dev/null +++ b/thirdparty/exiv2/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "exiv2", + "License": "GPL2.0", + "License File": "LICENSE.txt", + "Version Number": "v2.0.0",: + "Owner": "wupingyuan@huawei.com", + "Upstream URL": "https://github.com/Exiv2/exiv2/archive/refs/tags/v0.27.6.tar.gz", + "Description": "Exiv2 is a C++ library and a command-line utility to read, write, delete and modify Exif, IPTC, XMP and ICC image metadata." + } +] diff --git a/thirdparty/exiv2/README_zh.md b/thirdparty/exiv2/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..3f17162674ac3c253229393eb785540908a06c34 --- /dev/null +++ b/thirdparty/exiv2/README_zh.md @@ -0,0 +1,12 @@ +# exiv2三方库说明 +## 功能简介 +exiv2是一个C++库和命令行实用程序，用于读取、写入、删除和修改Exif、IPTC、XMP和ICC图像元数据。 +## 使用约束 +- IDE版本：DevEco Studio 3.1 Beta2 +- SDK版本：ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本：v0.27.6 +- 当前适配的功能：读取、写入、删除和修改Exif、IPTC、XMP和ICC图像元数据 +- [GPL2.0](https://github.com/Exiv2/exiv2) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/exiv2/SHA512SUM b/thirdparty/exiv2/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..f59c1da6096656b01bed0b3c1fac81dd9a4e3b6e --- /dev/null +++ b/thirdparty/exiv2/SHA512SUM @@ -0,0 +1 @@ +7d7121770a9394efd31acb74709583e587351fc48c485a2f684cacce4ed19a2d07a6cb1cea986c16bf64851fd53b22a7277c1e1ae1a6cd69a5761afae3c5c731 exiv2-0.27.6.tar.gz \ No newline at end of file diff --git a/thirdparty/exiv2/docs/hap_integrate.md b/thirdparty/exiv2/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..2bfadba8e0689f139c309daa900c433660d56918 --- /dev/null +++ b/thirdparty/exiv2/docs/hap_integrate.md @@ -0,0 +1,118 @@ +# exiv2集成到应用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/exiv2 #三方库exiv2的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md + ``` + +- 将exiv2拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/exiv2 tools/main -rf + cp thirdparty/libexpat tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh libexpat exiv2 + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库 + ``` + exiv2/arm64-v8a exiv2/armeabi-v7a + libexpat/arm64-v8a libexpat/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 拷贝动态库到`\\entry\libs\${OHOS_ARCH}\`目录： + 动态库需要在`\\entry\libs\${OHOS_ARCH}\`目录，才能集成到hap包中，所以需要将对应的so文件拷贝到对应CPU架构的目录 +- 在IDE的cpp目录下新增thirdparty目录，将编译生成的库拷贝到该目录下，如下图所示 + +  ![thirdparty_install_dir](pic/exiv2_install_dir.jpg) +- 在最外层（cpp目录下）CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libexiv2.so.27) + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libexpat.so.1) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/exiv2/${OHOS_ARCH}/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libexpat/${OHOS_ARCH}/include) + ``` + ![exiv2_usage](pic/exiv2_usage.jpg) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试，[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +- 将编译生成的exiv2可执行文件及测试文件exiv2.jpg、large.icc准备好 + +- 将准备好的文件推送到开发板，在windows命令行进行如下操作 + + ``` + hdc_std shell mount -o remount,rw / #修改系统权限为可读写 + hdc_std file send exiv2 /data #将可执行文件推入开发板data目录 + hdc_std file send libc++_shared.so /system/lib64 #将动态库推入开发板 + hdc_std file send libexiv2.so.27 /system/lib64 + hdc_std file send libexpat.so.1 /system/lib64 + hdc_std file send exiv2.jpg /data #将测试文件推入开发板data目录 + hdc_std file send large.icc /data + hdc_std shell #进入开发板 + chmod 777 exiv2 #添加权限 + # 读取iptc #执行测试用例 + # ./exiv2 -pi exiv2.jpg + # 添加iptc + # ./exiv2 -M "add Iptc.Application2.Credit String mee too!" exiv2.jpg + # 修改iptc + # ./exiv2 -M "set Iptc.Application2.Credit String mee test!" exiv2.jpg + # 删除iptc + # ./exiv2 -M "del Iptc.Application2.Credit" exiv2.jpg + # 读取xmp + # ./exiv2 -px exiv2.jpg + # 添加xmp + # ./exiv2 -M "add Xmp.dc.format XmpText image/jpeg" exiv2.jpg + # 修改xmp + # ./exiv2 -M "set Xmp.dc.format XmpText image/png" exiv2.jpg + # 删除xmp + # ./exiv2 -M "del Xmp.dc.format" exiv2.jpg + # 读取exif + # ./exiv2 -pe exiv2.jpg + # 添加exif + # ./exiv2 -M "add Exif.Image.WhitePoint Short 32 12 4 5 6" exiv2.jpg + # 修改exif + # ./exiv2 -M "set Exif.Image.WhitePoint Short 10" exiv2.jpg + # 删除exif + # ./exiv2 -M "del Exif.Image.WhitePoint" exiv2.jpg + # 读取icc + # ./exiv2 -b -pC exiv2.jpg + # 添加或修改icc(添加或修改icc文件时，注意icc文件名要和当前的图片的名字保持一致,.icc文件放在和图片文件同目录下) + # ./exiv2 -iC exiv2.jpg + # 删除icc + # ./exiv2 -dC exiv2.jpg + ``` + + ![exiv2_test1](pic/exiv2_test_1.jpg) ![exiv2_test2](pic/exiv2_test_2.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/exiv2/docs/pic/exiv2_install_dir.jpg b/thirdparty/exiv2/docs/pic/exiv2_install_dir.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ddd45e37595dc08ec1dada07f956ea30f033e447 Binary files /dev/null and b/thirdparty/exiv2/docs/pic/exiv2_install_dir.jpg differ diff --git a/thirdparty/exiv2/docs/pic/exiv2_test_1.jpg b/thirdparty/exiv2/docs/pic/exiv2_test_1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..13703c7bd47e122c30b0bc02f5573a920f8e9811 Binary files /dev/null and b/thirdparty/exiv2/docs/pic/exiv2_test_1.jpg differ diff --git a/thirdparty/exiv2/docs/pic/exiv2_test_2.jpg b/thirdparty/exiv2/docs/pic/exiv2_test_2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..04c87ab3aa3f379decf83b7ecbe7d01f3279dc59 Binary files /dev/null and b/thirdparty/exiv2/docs/pic/exiv2_test_2.jpg differ diff --git a/thirdparty/exiv2/docs/pic/exiv2_usage.jpg b/thirdparty/exiv2/docs/pic/exiv2_usage.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4ad2f05acddf3c772f40c8acf8eb0ebf12842757 Binary files /dev/null and b/thirdparty/exiv2/docs/pic/exiv2_usage.jpg differ