From 8177d6a99d50b33241b53b52cba08398b945dba3 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 11 Feb 2018 18:59:38 +0100 Subject: [PATCH] imagemagick, bump version (#2204) --- ...17.recipe => imagemagick7-7.0.7.22.recipe} | 39 +++++++++++++++---- ...patchset => imagemagick-7.0.7.22.patchset} | 0 2 files changed, 32 insertions(+), 7 deletions(-) rename media-gfx/imagemagick/{imagemagick7-7.0.7.17.recipe => imagemagick7-7.0.7.22.recipe} (76%) rename media-gfx/imagemagick/patches/{imagemagick-7.0.7.17.patchset => imagemagick-7.0.7.22.patchset} (100%) diff --git a/media-gfx/imagemagick/imagemagick7-7.0.7.17.recipe b/media-gfx/imagemagick/imagemagick7-7.0.7.22.recipe similarity index 76% rename from media-gfx/imagemagick/imagemagick7-7.0.7.17.recipe rename to media-gfx/imagemagick/imagemagick7-7.0.7.22.recipe index af06f675e..fc2ae7c4e 100644 --- a/media-gfx/imagemagick/imagemagick7-7.0.7.17.recipe +++ b/media-gfx/imagemagick/imagemagick7-7.0.7.22.recipe @@ -12,13 +12,20 @@ REVISION="1" imageMagickVersion="${portVersion%.*}-${portVersion##*.}" SOURCE_URI="https://www.imagemagick.org/download/releases/ImageMagick-$imageMagickVersion.tar.xz https://mirror.sobukus.de/files/src/imagemagick/ImageMagick-$imageMagickVersion.tar.xz" -CHECKSUM_SHA256="13548d1670a488f48f89ef6e09395c213efd47978bef9cff564c4b1b3f5df84a" +CHECKSUM_SHA256="49de9e08ea255a1f939158d85d50dfa29285bccbdcb7fee0fe4309061d438489" SOURCE_DIR="ImageMagick-$imageMagickVersion" PATCHES="imagemagick-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libMagickVersion="4.0.0" +libMagickCoreVersion="5.0.0" +libMagickWandVersion="5.0.0" +libMagickVersionCompat="$libMagickVersion compat >= ${libMagickVersion%%.*}" +libMagickCoreVersionCompat="$libMagickCoreVersion compat >= ${libMagickCoreVersion%%.*}" +libMagickWandVersionCompat="$libMagickWandVersion compat >= ${libMagickWandVersion%%.*}" + PROVIDES=" imagemagick7$secondaryArchSuffix = $portVersion cmd:animate$secondaryArchSuffix @@ -34,9 +41,9 @@ PROVIDES=" cmd:mogrify$secondaryArchSuffix cmd:montage$secondaryArchSuffix cmd:stream$secondaryArchSuffix - lib:libMagick++_7.Q16HDRI$secondaryArchSuffix = 7.0.0 compat >= 7 - lib:libMagickCore_7.Q16HDRI$secondaryArchSuffix = 4.0.0 compat >= 4 - lib:libMagickWand_7.Q16HDRI$secondaryArchSuffix = 4.0.0 compat >= 4 + lib:libMagick++_7.Q16HDRI$secondaryArchSuffix = $libMagickVersionCompat + lib:libMagickCore_7.Q16HDRI$secondaryArchSuffix = $libMagickCoreVersionCompat + lib:libMagickWand_7.Q16HDRI$secondaryArchSuffix = $libMagickWandVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -63,14 +70,32 @@ PROVIDES_devel=" cmd:MagickCore_config$secondaryArchSuffix cmd:MagickWand_config$secondaryArchSuffix cmd:Wand_config$secondaryArchSuffix - devel:libMagick++_7.Q16HDRI$secondaryArchSuffix = 7.0.0 compat >= 7 - devel:libMagickCore_7.Q16HDRI$secondaryArchSuffix = 4.0.0 compat >= 4 - devel:libMagickWand_7.Q16HDRI$secondaryArchSuffix = 4.0.0 compat >= 4 + devel:libMagick++_7.Q16HDRI$secondaryArchSuffix = $libMagickVersionCompat + devel:libMagickCore_7.Q16HDRI$secondaryArchSuffix = $libMagickCoreVersionCompat + devel:libMagickWand_7.Q16HDRI$secondaryArchSuffix = $libMagickWandVersionCompat " REQUIRES_devel=" imagemagick7$secondaryArchSuffix == $portVersion base " +defineDebugInfoPackage imagemagick7$secondaryArchSuffix \ + $binDir/animate \ + $binDir/compare \ + $binDir/composite \ + $binDir/conjure \ + $binDir/convert \ + $binDir/display \ + $binDir/identify \ + $binDir/import \ + $binDir/magick \ + $binDir/magick-script \ + $binDir/mogrify \ + $binDir/montage \ + $binDir/stream \ + $libDir/libMagick++-7.Q16HDRI.so.$libMagickVersion \ + $libDir/libMagickCore-7.Q16HDRI.so.$libMagickCoreVersion \ + $libDir/libMagickWand-7.Q16HDRI.so.$libMagickWandVersion + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix diff --git a/media-gfx/imagemagick/patches/imagemagick-7.0.7.17.patchset b/media-gfx/imagemagick/patches/imagemagick-7.0.7.22.patchset similarity index 100% rename from media-gfx/imagemagick/patches/imagemagick-7.0.7.17.patchset rename to media-gfx/imagemagick/patches/imagemagick-7.0.7.22.patchset