diff --git a/thirdparty/graphicsmagick/HPKBUILD b/thirdparty/graphicsmagick/HPKBUILD index 764f7541774dd478bbe5c3fe8123b445cb9dab86..a557ea14513be9f21472ae711b5eefdac9f596ed 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) +depends=(libpng jpeg lcms2 jasper libwebp libxml2 jbigkit freetype2 zlib_1_3_1 ImageMagick) makedepends=() builddir=GraphicsMagick-${pkgver} @@ -63,6 +63,7 @@ build() { -L${LYCIUM_ROOT}/usr/lcms2/${ARCH}/lib \ -L${LYCIUM_ROOT}/usr/libxml2/${ARCH}/lib \ -L${LYCIUM_ROOT}/usr/xz/${ARCH}/lib \ + -L${LYCIUM_ROOT}/usr/zlib_1_3_1/${ARCH}/lib \ -L${LYCIUM_ROOT}/usr/freetype2/${ARCH}/lib \ -L${LYCIUM_ROOT}/usr/libjpeg-turbo/${ARCH}/lib \ -L${LYCIUM_ROOT}/usr/libpng/${ARCH}/lib" \ @@ -70,6 +71,7 @@ build() { -I${LYCIUM_ROOT}/usr/libwebp/${ARCH}/include \ -I${LYCIUM_ROOT}/usr/jbigkit/${ARCH}/include \ -I${LYCIUM_ROOT}/usr/jasper/${ARCH}/include \ + -I${LYCIUM_ROOT}/usr/zlib_1_3_1/${ARCH}/include \ -I${LYCIUM_ROOT}/usr/libxml2/${ARCH}/include \ -I${LYCIUM_ROOT}/usr/libjpeg-turbo/${ARCH}/include \ -I${LYCIUM_ROOT}/usr/jpeg/${ARCH}/include" \ diff --git a/thirdparty/graphicsmagick/README.OpenSource b/thirdparty/graphicsmagick/README.OpenSource index fc0bc6da36836f9669dc19b80a03c34a205c62df..e5e5ecd549d284858bf1129831b438629767cc02 100644 --- a/thirdparty/graphicsmagick/README.OpenSource +++ b/thirdparty/graphicsmagick/README.OpenSource @@ -64,11 +64,29 @@ }, { "Name": "freetype", - "License": "GPL FTL", - "License File": "https://github.com/freetype/freetype/blob/master/LICENSE.TXT", + "License": "GPL-2-only or FTL", + "License File": "https://github.com/freetype/freetype/blob/master/docs/FTL.TXT", "Version Number": "2.13.0", - "Owner": "tianyong13@huawei.com", + "Owner": "xiafeng@huawei.com", "Upstream URL": "https://sourceforge.net/projects/freetype/files/freetype2/2.13.0/freetype-2.13.0.tar.xz", "Description": "FreeType is written in C. It is designed to be small, efficient, and highly customizable while capable of producing high-quality output (glyph images) of most vector and bitmap font formats for digital typography. FreeType is a freely available and portable software library to render fonts." + }, + { + "Name": "zlib_1_3_1", + "License": "Zlib", + "License File": "https://github.com/madler/zlib/blob/master/LICENSE", + "Version Number": "v1.3.1", + "Owner": "huangminzhong2@huawei.com", + "Upstream URL": "https://github.com/madler/zlib", + "Description": "zlib 1.3.1 is a general purpose data compression library.All the code is thread safe." + }, + { + "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", + "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." } ]