cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ImageMagick-6.9.12-44

Browse Source
This commit is contained in:
sthen 2022-04-13 23:37:54 +00:00
parent 6a9b751ae9
commit dfba663086
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ImageMagick/Makefile
View File

@ -3,13 +3,13 @@ BROKEN-arm= libm functions (cabs etc) not detected, fallback code is broken
COMMENT= image processing tools
VER= 6.9.12
DASHVER= 38
DASHVER= 44
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
PORTROACH= site:https://imagemagick.org/download/ limit:6.*
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += MagickCore-6.Q16 7.0 # 6.0
SHARED_LIBS += MagickCore-6.Q16 8.0 # 6.0
SHARED_LIBS += MagickWand-6.Q16 4.2 # 6.0
SHARED_LIBS += Magick++-6.Q16 5.2 # 8.0

4
graphics/ImageMagick/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ImageMagick-6.9.12-38.tar.xz) = htSoqFfyQHLd9IjVjr3sdTbG6pqV/LXg+MMck+8P6w0=
SIZE (ImageMagick-6.9.12-38.tar.xz) = 9189680
SHA256 (ImageMagick-6.9.12-44.tar.xz) = L6SjHSOcteN8VERpVwv6F/ma9vxzInZaTY6ZLsl9LY0=
SIZE (ImageMagick-6.9.12-44.tar.xz) = 9180080

26
graphics/ImageMagick/patches/patch-configure_ac
View File

@ -1,24 +1,24 @@
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -32,14 +32,12 @@ m4_define([magick_version],
@@ -32,13 +32,12 @@ m4_define([magick_version],
[magick_major_version,magick_minor_version,magick_micro_version,magick_patchlevel_version])
m4_define([magick_git_revision],
m4_esyscmd([
- c=$(git log --full-history --format=tformat:. HEAD | wc -l)
- h=$(git rev-parse --short HEAD)
d=$(date -u +%Y%m%d)
- printf %s "$c:$h:$d"
+ printf %s "0::$d"
- d=$(git log -1 --format=:%cd --date=format:%Y%m%d || date -u +%Y%m%d -r ./ChangeLog.md)
- printf %s "$h$d"
+ d=$(stat -t %Y%m%d -f %Sm ./ChangeLog.md)
+ printf %s "$d"
]))
m4_define([magick_release_date],
m4_esyscmd([
- d=$(date -u +%F -r ./ChangeLog)
+ d=$(stat -f %Sm -t %F ./ChangeLog)
- d=$(git log -1 --format=%cd --date=format:%Y-%m-%d || date -u +%F -r ./ChangeLog.md)
+ d=$(stat -t %Y-%m-%d -f %Sm ./ChangeLog.md)
printf %s "$d"
]))
@@ -1175,7 +1173,7 @@ fi
@@ -1174,7 +1173,7 @@ fi
# Assume that delegate headers reside under same directory as ImageMagick
# installation prefix.
@ -27,7 +27,7 @@ Index: configure.ac
#
# Find the X11 RGB database
@@ -2925,7 +2923,7 @@ AC_SUBST([PERLMAINCC])
@@ -2924,7 +2923,7 @@ AC_SUBST([PERLMAINCC])
#
# Path to ImageMagick header files
@ -36,7 +36,7 @@ Index: configure.ac
INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
case "${build_os}" in
@@ -2948,7 +2946,7 @@ AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUD
@@ -2947,7 +2946,7 @@ AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUD
AC_SUBST([INCLUDEARCH_PATH])
# Subdirectory under lib to place ImageMagick lib files
@ -45,7 +45,7 @@ Index: configure.ac
AC_DEFINE_UNQUOTED([LIBRARY_RELATIVE_PATH],["$LIBRARY_RELATIVE_PATH"],[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
# Path to ImageMagick bin directory
@@ -3039,7 +3037,7 @@ AC_SUBST([FILTER_PATH])
@@ -3038,7 +3037,7 @@ AC_SUBST([FILTER_PATH])
#
# Path to ImageMagick documentation files
@ -54,7 +54,7 @@ Index: configure.ac
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
@@ -3059,7 +3057,7 @@ AC_ARG_ENABLE([docs],
@@ -3058,7 +3057,7 @@ AC_ARG_ENABLE([docs],
AM_CONDITIONAL([INSTALL_DOC],[test "$wantdocs" = "yes"])
# Subdirectory to place architecture-dependent configuration files
@ -63,7 +63,7 @@ Index: configure.ac
AC_DEFINE_UNQUOTED([CONFIGURE_RELATIVE_PATH],"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
@@ -3072,7 +3070,7 @@ AC_DEFINE_UNQUOTED([CONFIGURE_PATH],"$DEFINE_CONFIGURE
@@ -3071,7 +3070,7 @@ AC_DEFINE_UNQUOTED([CONFIGURE_PATH],"$DEFINE_CONFIGURE
AC_SUBST([CONFIGURE_PATH])
# Subdirectory to place architecture-independent configuration files

12
graphics/ImageMagick/patches/patch-magick_random_c Normal file
View File

@ -0,0 +1,12 @@
Index: magick/random.c
--- magick/random.c.orig
+++ magick/random.c
@@ -61,7 +61,7 @@
#include "magick/thread_.h"
#include "magick/thread-private.h"
#include "magick/utility-private.h"
-#if defined(MAGICKCORE_HAVE_GETENTROPY)
+#if defined(MAGICKCORE_HAVE_GETENTROPY) && !defined(__OpenBSD__)
#include <sys/random.h>
#endif
/*

3
graphics/ImageMagick/pkg/PLIST
View File

@ -213,7 +213,7 @@ share/ImageMagick/english.xml
share/ImageMagick/francais.xml
share/ImageMagick/locale.xml
share/doc/ImageMagick/
share/doc/ImageMagick/ChangeLog
share/doc/ImageMagick/ChangeLog.md
share/doc/ImageMagick/LICENSE
share/doc/ImageMagick/NEWS.txt
share/doc/ImageMagick/images/
@ -333,7 +333,6 @@ share/doc/ImageMagick/images/wizard.jpg
share/doc/ImageMagick/images/wizard.png
share/doc/ImageMagick/index.html
share/doc/ImageMagick/www/
share/doc/ImageMagick/www/ImageMagickObject.html
share/doc/ImageMagick/www/Magick++/
share/doc/ImageMagick/www/Magick++/Blob.html
share/doc/ImageMagick/www/Magick++/Cache.fig