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

update to ImageMagick-6.9.12-34

Browse Source 
from Volker Schlecht with some tweaks
This commit is contained in:
sthen 2022-01-13 17:45:36 +00:00
parent a58d6439ad
commit 50d9f34a37
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ImageMagick/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.202 2021/08/17 20:41:36 sthen Exp $
# $OpenBSD: Makefile,v 1.203 2022/01/13 17:45:36 sthen Exp $
BROKEN-arm= libm functions (cabs etc) not detected, fallback code is broken
COMMENT= image processing tools
VER= 6.9.12
DASHVER= 19
DASHVER= 34
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
PORTROACH= site:https://imagemagick.org/download/ limit:6.*

4
graphics/ImageMagick/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ImageMagick-6.9.12-19.tar.xz) = GEZ5AbImbYkYw9l3sJuCQhOms4ivrxSyGokDkMsWubc=
SIZE (ImageMagick-6.9.12-19.tar.xz) = 9183520
SHA256 (ImageMagick-6.9.12-34.tar.xz) = 4jMRBQseFmJf3Y88vTgvCIEafDmH0d82leb/EXnWJXg=
SIZE (ImageMagick-6.9.12-34.tar.xz) = 9174284

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

@ -1,9 +1,26 @@
$OpenBSD: patch-configure_ac,v 1.24 2021/08/17 20:41:36 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.25 2022/01/13 17:45:36 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -1186,7 +1186,7 @@ fi
@@ -32,14 +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"
]))
m4_define([magick_release_date],
m4_esyscmd([
- d=$(date -u +%F -r ./ChangeLog)
+ d=$(stat -f %Sm -t %F ./ChangeLog)
printf %s "$d"
]))
@@ -1175,7 +1173,7 @@ fi
# Assume that delegate headers reside under same directory as ImageMagick
# installation prefix.
@ -12,7 +29,7 @@ Index: configure.ac
#
# Find the X11 RGB database
@@ -2936,7 +2936,7 @@ AC_SUBST([PERLMAINCC])
@@ -2925,7 +2923,7 @@ AC_SUBST([PERLMAINCC])
#
# Path to ImageMagick header files
@ -21,7 +38,7 @@ Index: configure.ac
INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
case "${build_os}" in
@@ -2959,7 +2959,7 @@ AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUD
@@ -2948,7 +2946,7 @@ AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUD
AC_SUBST([INCLUDEARCH_PATH])
# Subdirectory under lib to place ImageMagick lib files
@ -30,7 +47,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
@@ -3050,7 +3050,7 @@ AC_SUBST([FILTER_PATH])
@@ -3039,7 +3037,7 @@ AC_SUBST([FILTER_PATH])
#
# Path to ImageMagick documentation files
@ -39,7 +56,7 @@ Index: configure.ac
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
@@ -3070,7 +3070,7 @@ AC_ARG_ENABLE([docs],
@@ -3059,7 +3057,7 @@ AC_ARG_ENABLE([docs],
AM_CONDITIONAL([INSTALL_DOC],[test "$wantdocs" = "yes"])
# Subdirectory to place architecture-dependent configuration files
@ -48,7 +65,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}/"
@@ -3083,7 +3083,7 @@ AC_DEFINE_UNQUOTED([CONFIGURE_PATH],"$DEFINE_CONFIGURE
@@ -3072,7 +3070,7 @@ AC_DEFINE_UNQUOTED([CONFIGURE_PATH],"$DEFINE_CONFIGURE
AC_SUBST([CONFIGURE_PATH])
# Subdirectory to place architecture-independent configuration files

3
graphics/ImageMagick/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.61 2021/03/01 20:42:11 sthen Exp $
@comment $OpenBSD: PLIST,v 1.62 2022/01/13 17:45:36 sthen Exp $
@conflict p5-PerlMagick-*
@pkgpath graphics/ImageMagick,no_x11
@sample ${SYSCONFDIR}/ImageMagick/
@ -376,6 +376,7 @@ share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig
share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
share/doc/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
share/doc/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
share/doc/ImageMagick/www/advanced-linux-installation.html
share/doc/ImageMagick/www/advanced-unix-installation.html
share/doc/ImageMagick/www/advanced-windows-installation.html
share/doc/ImageMagick/www/animate.html