haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

imagemagick, bump version (#11140)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-09-19 09:40:31 +02:00
committed by GitHub
parent 4bcb17fc24
commit 07b4d99f19
2 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
media-gfx/imagemagick/imagemagick-7.1.1.34.recipe → media-gfx/imagemagick/imagemagick-7.1.1.38.recipe
View File

@@ -14,7 +14,7 @@ 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
https://github.com/ImageMagick/ImageMagick/archive/$imageMagickVersion.tar.gz"
CHECKSUM_SHA256="abab52de4b8f0356c05ddee3d3398c147fd9f6c099760f2cb15f3b8168a776c7"
CHECKSUM_SHA256="48de548d4977fc226c982ca03b9d6ad8001b47d8dc142b49fdca69333bc4ad82"
SOURCE_DIR="ImageMagick-$imageMagickVersion"
PATCHES="imagemagick-$portVersion.patchset"
@@ -52,19 +52,6 @@ libMagickWandVersionCompat="$libMagickWandVersion compat >= ${libMagickWandVersi
PROVIDES="
imagemagick$secondaryArchSuffix = $portVersion
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
@@ -108,6 +95,34 @@ REPLACES="
imagemagick7${secondaryArchSuffix}_devel
"
SUMMARY_tools="The ImageMagick tools"
PROVIDES_tools="
imagemagick${secondaryArchSuffix}_tools = $portVersion
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
"
REQUIRES_tools="
imagemagick$secondaryArchSuffix == $portVersion base
$REQUIRES
"
SUMMARY_doc="The Imagemagick's documentation"
ARCHITECTURES_doc="any"
PROVIDES_doc="
imagemagick_doc = $portVersion
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
@@ -143,19 +158,19 @@ BUILD_PREREQUIRES="
"
defineDebugInfoPackage imagemagick$secondaryArchSuffix \
$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 \
"$(getPackagePrefix tools)"/bin/animate \
"$(getPackagePrefix tools)"/bin/compare \
"$(getPackagePrefix tools)"/bin/composite \
"$(getPackagePrefix tools)"/bin/conjure \
"$(getPackagePrefix tools)"/bin/convert \
"$(getPackagePrefix tools)"/bin/display \
"$(getPackagePrefix tools)"/bin/identify \
"$(getPackagePrefix tools)"/bin/import \
"$(getPackagePrefix tools)"/bin/magick \
"$(getPackagePrefix tools)"/bin/magick-script \
"$(getPackagePrefix tools)"/bin/mogrify \
"$(getPackagePrefix tools)"/bin/montage \
"$(getPackagePrefix tools)"/bin/stream \
$libDir/libMagick++-7.Q16HDRI.so.$libMagickVersion \
$libDir/libMagickCore-7.Q16HDRI.so.$libMagickCoreVersion \
$libDir/libMagickWand-7.Q16HDRI.so.$libMagickWandVersion
@@ -188,8 +203,14 @@ INSTALL()
packageEntries devel \
$developDir \
$commandBinDir/*-config \
$manDir/man1/*-config.1 \
$documentationDir/packages/ImageMagick-7/www/api
$manDir/man1/*-config.1
packageEntries tools \
$commandBinDir \
$manDir
packageEntries doc \
$documentationDir
}
TEST()

39
media-gfx/imagemagick/patches/imagemagick-7.1.1.34.patchset → media-gfx/imagemagick/patches/imagemagick-7.1.1.38.patchset
View File

@@ -1,4 +1,4 @@
From 7762355c4ecc48701c1b1ab59c6f9c13a6f57ada Mon Sep 17 00:00:00 2001
From afa2bf3f67a1d3c99fc5085c8a9e9194ae94c6b6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 27 Dec 2017 18:43:52 +0100
Subject: Don't reset LIBRARY_PATH.
@@ -27,10 +27,10 @@ index 4b5dc06..4e66b38 100644
#ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH
diff --git a/configure.ac b/configure.ac
index dc52f77..85c7abf 100644
index 0d48abb..6b7e999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3139,15 +3139,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
@@ -3140,15 +3140,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
AC_SUBST([EXECUTABLE_PATH])
# Path to ImageMagick lib
@@ -51,7 +51,7 @@ index dc52f77..85c7abf 100644
#
# path to local binaries
@@ -3164,7 +3164,7 @@ AC_SUBST([LIB_BIN_DIR])
@@ -3165,7 +3165,7 @@ AC_SUBST([LIB_BIN_DIR])
LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
AC_SUBST([LIB_BIN_DIR_RELATIVE_PATH])
@@ -60,7 +60,7 @@ index dc52f77..85c7abf 100644
AC_SUBST([LIB_BIN_DIR_PATH])
#
@@ -3184,7 +3184,7 @@ AC_SUBST([MODULES_DIRNAME])
@@ -3185,7 +3185,7 @@ AC_SUBST([MODULES_DIRNAME])
MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
AC_SUBST([MODULES_RELATIVE_PATH])
@@ -69,7 +69,7 @@ index dc52f77..85c7abf 100644
AC_SUBST([MODULES_PATH])
#
@@ -3277,7 +3277,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
@@ -3278,7 +3278,7 @@ AC_SUBST([SHAREARCH_DIRNAME])
SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
AC_SUBST([SHAREARCH_RELATIVE_PATH])
@@ -82,7 +82,7 @@ index dc52f77..85c7abf 100644
2.45.2
From 9f4779ca6c4f24daed780c156c98a1ec79c0e4e0 Mon Sep 17 00:00:00 2001
From 9d770f0bcf2fd84f6389b23fe333a38608cf7f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sat, 3 Jun 2023 13:17:44 +0200
Subject: set DOC_DIR from configure argument
@@ -90,7 +90,7 @@ Subject: set DOC_DIR from configure argument
A subdirectory is added to the final docDir
diff --git a/configure.ac b/configure.ac
index 85c7abf..7314a7a 100644
index 6b7e999..81dfc8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,7 +207,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
@@ -105,3 +105,26 @@ index 85c7abf..7314a7a 100644
--
2.45.2
From c0d90b4f7136c3571cf75a6310e94f2e01598f47 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 18 Sep 2024 11:54:46 +0200
Subject: Haiku doesn't have sys/random.h
diff --git a/MagickCore/random.c b/MagickCore/random.c
index cb586f5..9692501 100644
--- a/MagickCore/random.c
+++ b/MagickCore/random.c
@@ -64,7 +64,7 @@
#include "MagickCore/timer-private.h"
#include "MagickCore/utility.h"
#include "MagickCore/utility-private.h"
-#if defined(MAGICKCORE_HAVE_GETENTROPY)
+#if defined(MAGICKCORE_HAVE_GETENTROPY) && !defined(__HAIKU__)
#include <sys/random.h>
#endif
/*
--
2.45.2