From 60298f8adebd6f2f7a94cf13680806d7799a41d6 Mon Sep 17 00:00:00 2001 From: miqlas Date: Sat, 17 Jun 2017 17:35:45 +0200 Subject: [PATCH] ImageMagick: bump version (#1407) --- .../imagemagick/imagemagick7-7.0.5.10.recipe | 157 ++++++++++++++++++ .../patches/imagemagick7-7.0.5.10.patchset | 63 +++++++ 2 files changed, 220 insertions(+) create mode 100644 media-gfx/imagemagick/imagemagick7-7.0.5.10.recipe create mode 100644 media-gfx/imagemagick/patches/imagemagick7-7.0.5.10.patchset diff --git a/media-gfx/imagemagick/imagemagick7-7.0.5.10.recipe b/media-gfx/imagemagick/imagemagick7-7.0.5.10.recipe new file mode 100644 index 000000000..299f7c9ce --- /dev/null +++ b/media-gfx/imagemagick/imagemagick7-7.0.5.10.recipe @@ -0,0 +1,157 @@ +SUMMARY="Convert, edit, or compose bitmap images" +DESCRIPTION="ImageMagick® is a software suite to create, edit, compose, or \ +convert bitmap images. It can read and write images in a variety of formats \ +(over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PNG, Postscript, \ +SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear \ +and transform images, adjust image colors, apply various special effects, or \ +draw text, lines, polygons, ellipses and Bézier curves." +HOMEPAGE="https://www.imagemagick.org/" +COPYRIGHT="1999-2017 ImageMagick Studio LLC" +LICENSE="IMAGEMAGICK" +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="0058fcde533986334458a5c99600b1b9633182dd9562cbad4ba618c5ccf2a28f" +SOURCE_DIR="ImageMagick-$imageMagickVersion" +PATCHES="imagemagick-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + imagemagick7$secondaryArchSuffix = $portVersion + cmd:animate$secondaryArchSuffix + cmd:compare$secondaryArchSuffix + cmd:composite$secondaryArchSuffix + cmd:conjure$secondaryArchSuffix + cmd:convert$secondaryArchSuffix + cmd:display$secondaryArchSuffix + cmd:identify$secondaryArchSuffix + cmd:import$secondaryArchSuffix + cmd:magick$secondaryArchSuffix + cmd:magick_script$secondaryArchSuffix + 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 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libltdl$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then + REQUIRES="$REQUIRES + lib:libgomp$secondaryArchSuffix + " +fi + +PROVIDES_devel=" + imagemagick7${secondaryArchSuffix}_devel = $portVersion + cmd:Magick++_config$secondaryArchSuffix + cmd:Magick_config$secondaryArchSuffix + 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 + " +REQUIRES_devel=" + imagemagick7$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix +# devel:liblcms2$secondaryArchSuffix +# devel:libdjvulibre$secondaryArchSuffix +# devel:libfftw3$secondaryArchSuffix +# devel:libfontconfig$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix +# devel:libilmimf$secondaryArchSuffix #openexr +# devel:libjbig2dec$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libltdl$secondaryArchSuffix +# devel:liblzma$secondaryArchSuffix +# devel:libopenjp2$secondaryArchSuffix +# devel:libpango_1.0$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:perl + cmd:pkg_config$secondaryArchSuffix + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/ImageMagick-7/coder.xml keep-old + settings/ImageMagick-7/colors.xml keep-old + settings/ImageMagick-7/delegates.xml keep-old + settings/ImageMagick-7/log.xml keep-old + settings/ImageMagick-7/magic.xml keep-old + settings/ImageMagick-7/mime.xml keep-old + settings/ImageMagick-7/policy.xml keep-old + settings/ImageMagick-7/quantization-table.xml keep-old + settings/ImageMagick-7/thresholds.xml keep-old + settings/ImageMagick-7/type-dejavu.xml keep-old + settings/ImageMagick-7/type-ghostscript.xml keep-old + settings/ImageMagick-7/type-windows.xml keep-old + settings/ImageMagick-7/type-apple.xml keep-old + settings/ImageMagick-7/type.xml keep-old + " + +BUILD() +{ + export LDFLAGS="-lnetwork" + autoconf + automake + runConfigure ./configure \ + --enable-shared \ + --without-modules + make $jobArgs +} + +INSTALL() +{ + make install + + # remove libtool files + rm -f $libDir/libMagick*.la + + prepareInstalledDevelLibs libMagick++-7.Q16HDRI libMagickCore-7.Q16HDRI \ + libMagickWand-7.Q16HDRI + fixPkgconfig + + packageEntries devel \ + $developDir \ + $binDir/*-config \ + $manDir/man1/*-config.1 \ + $dataDir/doc/ImageMagick-7/www/api +} + +TEST() +{ + make check +} diff --git a/media-gfx/imagemagick/patches/imagemagick7-7.0.5.10.patchset b/media-gfx/imagemagick/patches/imagemagick7-7.0.5.10.patchset new file mode 100644 index 000000000..f75093f1a --- /dev/null +++ b/media-gfx/imagemagick/patches/imagemagick7-7.0.5.10.patchset @@ -0,0 +1,63 @@ +From 2e2dd08b3fdbb7e899eae8ee072b894e96ffa246 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 26 Oct 2014 17:47:29 +0100 +Subject: Don't reset LIBRARY_PATH. + +Using a variable named LIBRARY_PATH is not a good idea on Haiku. Just +rename it. + +diff --git a/configure.ac b/configure.ac +index d8fc51b..5def208 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2885,15 +2885,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex + AC_SUBST(EXECUTABLE_PATH) + + # Path to ImageMagick lib +-LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}" +-DEFINE_LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/" ++XLIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}" ++DEFINE_XLIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}/" + case "${build_os}" in + mingw* ) +- DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1` ++ DEFINE_XLIBRARY_PATH=`$WinPathScript "$DEFINE_XLIBRARY_PATH" 1` + ;; + esac +-AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.]) +-AC_SUBST(LIBRARY_PATH) ++AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_XLIBRARY_PATH",[Directory where architecture-dependent files live.]) ++AC_SUBST(XLIBRARY_PATH) + + # + # path to local binaries +@@ -2910,7 +2910,7 @@ AC_SUBST(LIB_BIN_DIR) + + LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR + AC_SUBST(LIB_BIN_DIR_RELATIVE_PATH) +-LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}" ++LIB_BIN_DIR_PATH="${XLIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}" + AC_SUBST(LIB_BIN_DIR_PATH) + + # +@@ -2930,7 +2930,7 @@ AC_SUBST(MODULES_DIRNAME) + + MODULES_RELATIVE_PATH="${MODULES_DIRNAME}" + AC_SUBST(MODULES_RELATIVE_PATH) +-MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}" ++MODULES_PATH="${XLIBRARY_PATH}/${MODULES_RELATIVE_PATH}" + AC_SUBST(MODULES_PATH) + + # +@@ -3023,7 +3023,7 @@ AC_SUBST(SHAREARCH_DIRNAME) + + SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}" + AC_SUBST(SHAREARCH_RELATIVE_PATH) +-SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}" ++SHAREARCH_PATH="${XLIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}" + AC_SUBST(SHAREARCH_PATH) + + # +-- +2.10.2 +