imagemagick, put binaries in $commandBinDir for 32bit (#8597)

This commit is contained in:
Schrijvers Luc
2023-05-06 16:23:24 +02:00
committed by GitHub
parent 78d1cd4a4a
commit e33849c085

View File

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.imagemagick.org/
https://github.com/ImageMagick/ImageMagick/"
COPYRIGHT="1999-2020 ImageMagick Studio LLC"
LICENSE="IMAGEMAGICK"
REVISION="1"
REVISION="2"
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
@@ -37,6 +37,12 @@ GLOBAL_WRITABLE_FILES="
settings/ImageMagick-7/type-urw-base35.xml keep-old
"
commandBinDir=$binDir
commandSuffix=$secondaryArchSuffix
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
libMagickVersion="5.0.0"
libMagickCoreVersion="10.0.1"
libMagickWandVersion="10.0.1"
@@ -46,19 +52,19 @@ libMagickWandVersionCompat="$libMagickWandVersion compat >= ${libMagickWandVersi
PROVIDES="
imagemagick$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
cmd:animate$commandSuffix
cmd:compare$commandSuffix
cmd:composite$commandSuffix
cmd:conjure$commandSuffix
cmd:convert$commandSuffix
cmd:display$commandSuffix
cmd:identify$commandSuffix
cmd:import$commandSuffix
cmd:magick$commandSuffix
cmd:magick_script$commandSuffix
cmd:mogrify$commandSuffix
cmd:montage$commandSuffix
cmd:stream$commandSuffix
lib:libMagick++_7.Q16HDRI$secondaryArchSuffix = $libMagickVersionCompat
lib:libMagickCore_7.Q16HDRI$secondaryArchSuffix = $libMagickCoreVersionCompat
lib:libMagickWand_7.Q16HDRI$secondaryArchSuffix = $libMagickWandVersionCompat
@@ -86,11 +92,11 @@ REPLACES="
PROVIDES_devel="
imagemagick${secondaryArchSuffix}_devel = $portVersion
cmd:Magick++_config$secondaryArchSuffix
cmd:Magick_config$secondaryArchSuffix
cmd:MagickCore_config$secondaryArchSuffix
cmd:MagickWand_config$secondaryArchSuffix
cmd:Wand_config$secondaryArchSuffix
cmd:Magick++_config$commandSuffix
cmd:Magick_config$commandSuffix
cmd:MagickCore_config$commandSuffix
cmd:MagickWand_config$commandSuffix
cmd:Wand_config$commandSuffix
devel:libMagick++_7.Q16HDRI$secondaryArchSuffix = $libMagickVersionCompat
devel:libMagickCore_7.Q16HDRI$secondaryArchSuffix = $libMagickCoreVersionCompat
devel:libMagickWand_7.Q16HDRI$secondaryArchSuffix = $libMagickWandVersionCompat
@@ -137,19 +143,19 @@ BUILD_PREREQUIRES="
"
defineDebugInfoPackage imagemagick$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 \
$commandBinDir/animate \
$commandBinDir/compare \
$commandBinDir/composite \
$commandBinDir/conjure \
$commandBinDir/convert \
$commandBinDir/display \
$commandBinDir/identify \
$commandBinDir/import \
$commandBinDir/magick \
$commandBinDir/magick-script \
$commandBinDir/mogrify \
$commandBinDir/montage \
$commandBinDir/stream \
$libDir/libMagick++-7.Q16HDRI.so.$libMagickVersion \
$libDir/libMagickCore-7.Q16HDRI.so.$libMagickCoreVersion \
$libDir/libMagickWand-7.Q16HDRI.so.$libMagickWandVersion
@@ -158,7 +164,8 @@ BUILD()
{
export LDFLAGS="-lnetwork"
autoreconf -vfi
runConfigure ./configure \
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir \
--enable-shared \
--disable-static \
--without-modules
@@ -179,7 +186,7 @@ INSTALL()
packageEntries devel \
$developDir \
$binDir/*-config \
$commandBinDir/*-config \
$manDir/man1/*-config.1 \
$dataDir/doc/ImageMagick-7/www/api
}