!26 fix build error due to libjpeg-turbo LOSSLESS_SUPPORTED is broken
From: @cherry530 Reviewed-by: @lyn1001, @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
ed56d960f6
36
Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch
Normal file
36
Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 5ce2dc8c917812a029b2328ca34381f32952fcc6 Mon Sep 17 00:00:00 2001
|
||||
From: cherry530 <707078654@qq.com>
|
||||
Date: Fri, 4 Aug 2023 15:49:43 +0800
|
||||
Subject: [PATCH] Disable LOSSLESS_SUPPORTED checks for libjpeg turbo because
|
||||
they break with their latest code.
|
||||
|
||||
Signed-off-by: cherry530 <707078654@qq.com>
|
||||
---
|
||||
coders/jpeg.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/coders/jpeg.c b/coders/jpeg.c
|
||||
index e0ecb09..c7b30d9 100644
|
||||
--- a/coders/jpeg.c
|
||||
+++ b/coders/jpeg.c
|
||||
@@ -954,7 +954,7 @@ EstimateJPEGQuality(const struct jpeg_decompress_struct *jpeg_info,
|
||||
i;
|
||||
|
||||
save_quality=0;
|
||||
-#ifdef D_LOSSLESS_SUPPORTED
|
||||
+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED)
|
||||
if (image->compression==LosslessJPEGCompression)
|
||||
{
|
||||
save_quality=100;
|
||||
@@ -1461,7 +1461,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
|
||||
}
|
||||
#endif
|
||||
#if (JPEG_LIB_VERSION >= 61) && defined(D_PROGRESSIVE_SUPPORTED)
|
||||
-#ifdef D_LOSSLESS_SUPPORTED
|
||||
+#if !defined(LIBJPEG_TURBO_VERSION_NUMBER) && defined(D_LOSSLESS_SUPPORTED)
|
||||
image->interlace=
|
||||
jpeg_info.process == JPROC_PROGRESSIVE ? LineInterlace : NoInterlace;
|
||||
image->compression=jpeg_info.process == JPROC_LOSSLESS ?
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
Summary: An ImageMagick fork, offering faster image generation and better quality
|
||||
Name: GraphicsMagick
|
||||
Version: 1.3.40
|
||||
Release: 1
|
||||
Release: 2
|
||||
|
||||
License: MIT
|
||||
Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
|
||||
@ -37,6 +37,7 @@ Url: http://www.graphicsmagick.org/
|
||||
|
||||
Patch001: GraphicsMagick-1.3.16-multilib.patch
|
||||
Patch002: GraphicsMagick-1.3.31-perl_linkage.patch
|
||||
Patch003: Disable-LOSSLESS_SUPPORTED-checks-for-libjpeg-turbo-.patch
|
||||
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: freetype-devel
|
||||
@ -161,6 +162,7 @@ rm -f urw-fonts/ChangeLog urw-fonts/README* urw-fonts/fonts*
|
||||
|
||||
%patch002 -p1 -b .perl_linkage
|
||||
%patch001 -p1 -b .multilib
|
||||
%patch003 -p1
|
||||
|
||||
for f in ChangeLog.{2006,2008,2009,2012} NEWS.txt ; do
|
||||
iconv -f iso-8859-2 -t utf8 < $f > $f.utf8
|
||||
@ -340,6 +342,9 @@ exit 1
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Fri Aug 04 2023 xu_ping <707078654@qq.com> - 1.3.40-2
|
||||
- fix build error due to LOSSLESS_SUPPORTED is broken
|
||||
|
||||
* Fri Apr 14 2023 liyanan <thistleslyn@163.com> - 1.3.40-1
|
||||
- Update to 1.3.40
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user