From 7315dcee3513cee00fbd7f6814110a68af34eafc Mon Sep 17 00:00:00 2001 From: huangminzhong Date: Wed, 21 Aug 2024 17:11:46 +0800 Subject: [PATCH] =?UTF-8?q?graphicsmagick=E5=BA=93=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BA=93=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huangminzhong --- thirdparty/graphicsmagick/HPKBUILD | 2 +- thirdparty/graphicsmagick/README.OpenSource | 10 +++++----- thirdparty/graphicsmagick/docs/hap_integrate.md | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/thirdparty/graphicsmagick/HPKBUILD b/thirdparty/graphicsmagick/HPKBUILD index a557ea14..30e2d2af 100644 --- a/thirdparty/graphicsmagick/HPKBUILD +++ b/thirdparty/graphicsmagick/HPKBUILD @@ -21,7 +21,7 @@ pkgdesc="GraphicsMagick is the swiss army knife of image processing." url=http://www.graphicsmagick.org archs=(armeabi-v7a arm64-v8a) license=(MIT) -depends=(libpng jpeg lcms2 jasper libwebp libxml2 jbigkit freetype2 zlib_1_3_1 ImageMagick) +depends=(libpng jpeg lcms2 jasper libwebp libxml2 jbigkit freetype2 zlib_1_3_1 ImageMagick_7_1_1_35) makedepends=() builddir=GraphicsMagick-${pkgver} diff --git a/thirdparty/graphicsmagick/README.OpenSource b/thirdparty/graphicsmagick/README.OpenSource index e5e5ecd5..4c5c9755 100644 --- a/thirdparty/graphicsmagick/README.OpenSource +++ b/thirdparty/graphicsmagick/README.OpenSource @@ -82,11 +82,11 @@ }, { "Name": "ImageMagick", - "License": "ImageMagick License", - "License File": "https://github.com/ImageMagick/ImageMagick/blob/7.1.1-15/LICENSE", - "Version Number": "ImageMagick-7.1.1-15", + "License": "ImageMagick", + "License File": "https://github.com/ImageMagick/ImageMagick/blob/main/LICENSE", + "Version Number": "7.1.1-35", "Owner": "huangminzhong2@huawei.com", - "Upstream URL": "https://github.com/ImageMagick/ImageMagick/releases/tag/7.1.1-15", - "Description": "ImageMagick is a free and open-source software suite for displaying, converting, and editing raster image and vector image files. It can read and write over 200 image file formats, and can support a wide range of image manipulation operations, such as resizing, cropping, and color correction." + "Upstream URL": "https://github.com/ImageMagick/ImageMagick", + "Description": "ImageMagick is a free and open-source software suite for displaying, converting, and editing raster image and vector image files." } ] diff --git a/thirdparty/graphicsmagick/docs/hap_integrate.md b/thirdparty/graphicsmagick/docs/hap_integrate.md index 78926ea1..2f4c0633 100644 --- a/thirdparty/graphicsmagick/docs/hap_integrate.md +++ b/thirdparty/graphicsmagick/docs/hap_integrate.md @@ -34,8 +34,8 @@ - 三方库头文件及生成的库，在lycium目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库 ``` - graphicsmagick/armeabi-v7a-build - graphicsmagick/arm64-v8a-build + graphicsmagick/armeabi-v7a + graphicsmagick/arm64-v8a ``` - [测试三方库](#测试三方库) -- Gitee