imagemagick: Update to 7.1.1

Add a patch to fix build with upcoming autoconf 2.72

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2023-03-30 20:52:45 -07:00
parent 2b4e21be8e
commit db87078a40
2 changed files with 52 additions and 6 deletions
@@ -0,0 +1,42 @@
From 0912e49d58c2a5f455fabf76ab7dc61cfc44cfb9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 30 Mar 2023 20:50:26 -0700
Subject: [PATCH] m4: Use autconf provided AC_FUNC_FSEEKO
This helps in building with autoconf 2.72
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
m4/ac_func_fseeko.m4 | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/m4/ac_func_fseeko.m4 b/m4/ac_func_fseeko.m4
index eaeabb978..f9b8859cf 100644
--- a/m4/ac_func_fseeko.m4
+++ b/m4/ac_func_fseeko.m4
@@ -53,20 +53,4 @@
# --------------
AN_FUNCTION([ftello], [AC_FUNC_FSEEKO])
AN_FUNCTION([fseeko], [AC_FUNC_FSEEKO])
-AC_DEFUN([AC_FUNC_FSEEKO],
-[_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
- [ac_cv_sys_largefile_source],
- [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).],
- [[#include <sys/types.h> /* for off_t */
- #include <stdio.h>]],
- [[int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);]])
-
-# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-# in glibc 2.1.3, but that breaks too many other things.
-# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-if test $ac_cv_sys_largefile_source != unknown; then
- AC_DEFINE(HAVE_FSEEKO, 1,
- [Define to 1 if fseeko (and presumably ftello) exists and is declared.])
-fi
-])# AC_FUNC_FSEEKO
+AC_FUNC_FSEEKO
--
2.40.0
@@ -4,23 +4,27 @@ HOMEPAGE = "https://www.imagemagick.org/"
DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \ DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
editing raster and vector image files. It can read and write over 200 image file formats." editing raster and vector image files. It can read and write over 200 image file formats."
LICENSE = "ImageMagick" LICENSE = "ImageMagick"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b97c12a9213df1499565d69b92c73dd7 \ LIC_FILES_CHKSUM = "file://LICENSE;md5=ac58ac14f9d9d02cafd2d81ef38fb2cc \
file://NOTICE;md5=d8b9d2ccf273687ad12ebd06e5d8478f" file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed"
# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool" DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
BASE_PV := "${PV}" BASE_PV := "${PV}"
PV .= "-62" PV .= "-5"
SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https" SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https \
SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" file://0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch"
SRCREV = "2d24be538f286962c355cf422bb525375ac77998"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit autotools pkgconfig update-alternatives inherit autotools pkgconfig update-alternatives
export ac_cv_sys_file_offset_bits="64"
# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 # xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2
# if someone needs xml support then fix it first # if someone needs xml support then fix it first
EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl" EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl \
--disable-openmp --without-xml --disable-opencl \
--enable-largefile"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus" PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"