mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-04-02 02:49:12 +00:00
imagemagick: upgrade 7.1.1-8 -> 7.1.1.26
- remove autoconf patch [570a9a048b/configure.ac (L496)] - update sed command - license file changed [2c87d7da1b] Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
29cb1495b0
commit
9a8839e2b7
@ -1,42 +0,0 @@
|
||||
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,16 +4,15 @@ HOMEPAGE = "https://www.imagemagick.org/"
|
||||
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."
|
||||
LICENSE = "ImageMagick"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=ac58ac14f9d9d02cafd2d81ef38fb2cc \
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \
|
||||
file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed"
|
||||
# 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"
|
||||
|
||||
BASE_PV := "${PV}"
|
||||
PV .= "-8"
|
||||
SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https \
|
||||
file://0001-m4-Use-autconf-provided-AC_FUNC_FSEEKO.patch"
|
||||
SRCREV = "920f79206ff59f30a4cff22c9c9c393508b82663"
|
||||
PV .= "-26"
|
||||
SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https"
|
||||
SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@ -38,7 +37,7 @@ PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2"
|
||||
|
||||
do_install:append:class-target() {
|
||||
for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do
|
||||
sed -i 's,${STAGING_DIR_NATIVE},,g' ${D}${bindir}/"$file"
|
||||
sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file"
|
||||
done
|
||||
sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
|
||||
sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user