mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
TriForceX
@@ -0,0 +1,78 @@
|
||||
# HG changeset patch
|
||||
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
|
||||
# Date 1590851896 18000
|
||||
# Sat May 30 10:18:16 2020 -0500
|
||||
# Node ID 50395430a37188d0d197e71bd85ed6dd0f649ee3
|
||||
# Parent 4917a4242fc0a12f2f6baa10f1c5a9b3e68c20dd
|
||||
MNG: Fix small heap overwrite or assertion if magnifying and image to be magnified has rows or columns == 1.
|
||||
|
||||
[Retrieved (and updated to remove ChangeLog and version changes) from:
|
||||
https://sourceforge.net/p/graphicsmagick/code/ci/50395430a37188d0d197e71bd85ed6dd0f649ee3]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff -r 4917a4242fc0 -r 50395430a371 coders/png.c
|
||||
--- a/coders/png.c Fri May 01 13:49:13 2020 -0500
|
||||
+++ b/coders/png.c Sat May 30 10:18:16 2020 -0500
|
||||
@@ -5304,7 +5304,7 @@
|
||||
if (logging)
|
||||
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
|
||||
"MAGN chunk (%lu bytes): "
|
||||
- "First_magnified_object_id=%u, Last_magnified_object_id=%u, "
|
||||
+ "First_magnified_object_id=%u, Las t_magnified_object_id=%u, "
|
||||
"MB=%u, ML=%u, MR=%u, MT=%u, MX=%u, MY=%u, "
|
||||
"X_method=%u, Y_method=%u",
|
||||
length,
|
||||
@@ -5679,6 +5679,8 @@
|
||||
/*
|
||||
If magnifying and a supported method is requested then
|
||||
magnify the image.
|
||||
+
|
||||
+ http://www.libpng.org/pub/mng/spec/mng-1.0-20010209-pdg.html#mng-MAGN
|
||||
*/
|
||||
if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
|
||||
((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
|
||||
@@ -5689,7 +5691,28 @@
|
||||
|
||||
if (logging)
|
||||
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
|
||||
- " Processing MNG MAGN chunk");
|
||||
+ " Processing MNG MAGN chunk: MB=%u, ML=%u,"
|
||||
+ " MR=%u, MT=%u, MX=%u, MY=%u,"
|
||||
+ " X_method=%u, Y_method=%u",
|
||||
+ mng_info->magn_mb,mng_info->magn_ml,
|
||||
+ mng_info->magn_mr,mng_info->magn_mt,
|
||||
+ mng_info->magn_mx,mng_info->magn_my,
|
||||
+ mng_info->magn_methx,
|
||||
+ mng_info->magn_methy);
|
||||
+
|
||||
+ /*
|
||||
+ If the image width is 1, then X magnification is done
|
||||
+ by simple pixel replication.
|
||||
+ */
|
||||
+ if (image->columns == 1)
|
||||
+ mng_info->magn_methx = 1;
|
||||
+
|
||||
+ /*
|
||||
+ If the image height is 1, then Y magnification is done
|
||||
+ by simple pixel replication.
|
||||
+ */
|
||||
+ if (image->rows == 1)
|
||||
+ mng_info->magn_methy = 1;
|
||||
|
||||
if (mng_info->magn_methx == 1)
|
||||
{
|
||||
@@ -5734,12 +5757,10 @@
|
||||
Image
|
||||
*large_image;
|
||||
|
||||
- int
|
||||
- yy;
|
||||
-
|
||||
long
|
||||
m,
|
||||
- y;
|
||||
+ y,
|
||||
+ yy;
|
||||
|
||||
register long
|
||||
x;
|
||||
17
package/graphicsmagick/Config.in
Normal file
17
package/graphicsmagick/Config.in
Normal file
@@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_GRAPHICSMAGICK
|
||||
bool "graphicsmagick"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
GraphicsMagick is the swiss army knife of image processing.
|
||||
It provides a robust and efficient collection of tools
|
||||
and libraries which support reading, writing,
|
||||
and manipulating an image in over 89 major formats
|
||||
including important formats like DPX, GIF, JPEG, JPEG-2000,
|
||||
PNG, PDF, PNM, TIFF, and WebP.
|
||||
|
||||
http://www.graphicsmagick.org/
|
||||
|
||||
comment "graphicsmagick needs a toolchain w/ threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
3
package/graphicsmagick/graphicsmagick.hash
Normal file
3
package/graphicsmagick/graphicsmagick.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 188a8d6108fea87a0208723e8d206ec1d4d7299022be8ce5d0a9720509250250 GraphicsMagick-1.3.35.tar.xz
|
||||
sha256 1d28851631892098e0bf8653fd4e89f3524184d136391b54c664e89251ca3a9a Copyright.txt
|
||||
127
package/graphicsmagick/graphicsmagick.mk
Normal file
127
package/graphicsmagick/graphicsmagick.mk
Normal file
@@ -0,0 +1,127 @@
|
||||
################################################################################
|
||||
#
|
||||
# graphicsmagick
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GRAPHICSMAGICK_VERSION = 1.3.35
|
||||
GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz
|
||||
GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION)
|
||||
GRAPHICSMAGICK_LICENSE = MIT
|
||||
GRAPHICSMAGICK_LICENSE_FILES = Copyright.txt
|
||||
|
||||
GRAPHICSMAGICK_INSTALL_STAGING = YES
|
||||
GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config
|
||||
|
||||
# 0001-MNG-Fix-small-heap-overwrite-or-assertion.patch
|
||||
GRAPHICSMAGICK_IGNORE_CVES += CVE-2020-12672
|
||||
|
||||
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
GRAPHICSMAGICK_CONFIG_SCRIPTS += GraphicsMagick++-config
|
||||
endif
|
||||
|
||||
GRAPHICSMAGICK_CONF_OPTS = \
|
||||
--without-dps \
|
||||
--without-fpx \
|
||||
--without-jbig \
|
||||
--without-perl \
|
||||
--without-trio \
|
||||
--without-wmf \
|
||||
--without-x \
|
||||
--with-gs-font-dir=/usr/share/fonts/gs
|
||||
|
||||
GRAPHICSMAGICK_DEPENDENCIES = host-pkgconf
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --enable-openmp
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --disable-openmp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-ttf
|
||||
GRAPHICSMAGICK_CONF_ENV += ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config
|
||||
GRAPHICSMAGICK_DEPENDENCIES += freetype
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-ttf
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-jpeg
|
||||
GRAPHICSMAGICK_DEPENDENCIES += jpeg
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENJPEG),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-jp2
|
||||
GRAPHICSMAGICK_DEPENDENCIES += openjpeg
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-jp2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LCMS2),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-lcms2
|
||||
GRAPHICSMAGICK_DEPENDENCIES += lcms2
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-lcms2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-png
|
||||
GRAPHICSMAGICK_DEPENDENCIES += libpng
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-png
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-xml
|
||||
GRAPHICSMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config
|
||||
GRAPHICSMAGICK_DEPENDENCIES += libxml2
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-xml
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TIFF),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-tiff
|
||||
GRAPHICSMAGICK_DEPENDENCIES += tiff
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-tiff
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBP_MUX),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-webp
|
||||
GRAPHICSMAGICK_DEPENDENCIES += webp
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-webp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-lzma
|
||||
GRAPHICSMAGICK_DEPENDENCIES += xz
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-zlib
|
||||
GRAPHICSMAGICK_DEPENDENCIES += zlib
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-bzlib
|
||||
GRAPHICSMAGICK_DEPENDENCIES += bzip2
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-bzlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZSTD),y)
|
||||
GRAPHICSMAGICK_CONF_OPTS += --with-zstd
|
||||
GRAPHICSMAGICK_DEPENDENCIES += zstd
|
||||
else
|
||||
GRAPHICSMAGICK_CONF_OPTS += --without-zstd
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user