mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
imagemagick: bump to version 7.1.2-0, cleanup
This commit is contained in:
Joachim Mairböck
@@ -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="48de548d4977fc226c982ca03b9d6ad8001b47d8dc142b49fdca69333bc4ad82"
|
||||
CHECKSUM_SHA256="edc13694c2f27554b36dc4817d80284f52c07c31e1ef8b88c8a4902a723dd643"
|
||||
SOURCE_DIR="ImageMagick-$imageMagickVersion"
|
||||
PATCHES="imagemagick-$portVersion.patchset"
|
||||
|
||||
@@ -29,12 +29,13 @@ GLOBAL_WRITABLE_FILES="
|
||||
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.xml keep-old
|
||||
settings/ImageMagick-7/type-apple.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
|
||||
settings/ImageMagick-7/type-urw-base35.xml keep-old
|
||||
settings/ImageMagick-7/type-urw-base35-type1.xml keep-old
|
||||
settings/ImageMagick-7/type-windows.xml keep-old
|
||||
"
|
||||
|
||||
commandBinDir=$binDir
|
||||
@@ -44,8 +45,8 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
libMagickVersion="5.0.0"
|
||||
libMagickCoreVersion="10.0.1"
|
||||
libMagickWandVersion="10.0.1"
|
||||
libMagickCoreVersion="10.0.2"
|
||||
libMagickWandVersion="10.0.2"
|
||||
libMagickVersionCompat="$libMagickVersion compat >= ${libMagickVersion%%.*}"
|
||||
libMagickCoreVersionCompat="$libMagickCoreVersion compat >= ${libMagickCoreVersion%%.*}"
|
||||
libMagickWandVersionCompat="$libMagickWandVersion compat >= ${libMagickWandVersion%%.*}"
|
||||
@@ -60,6 +61,7 @@ REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libbz2$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libgomp$secondaryArchSuffix
|
||||
lib:libjpeg$secondaryArchSuffix
|
||||
lib:libltdl$secondaryArchSuffix
|
||||
lib:libpng16$secondaryArchSuffix
|
||||
@@ -68,11 +70,6 @@ REQUIRES="
|
||||
lib:libxml2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
|
||||
REQUIRES="$REQUIRES
|
||||
lib:libgomp$secondaryArchSuffix
|
||||
"
|
||||
fi
|
||||
REPLACES="
|
||||
imagemagick7$secondaryArchSuffix
|
||||
"
|
||||
@@ -1,130 +0,0 @@
|
||||
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.
|
||||
|
||||
|
||||
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
|
||||
index 4b5dc06..4e66b38 100644
|
||||
--- a/MagickCore/magick-config.h
|
||||
+++ b/MagickCore/magick-config.h
|
||||
@@ -169,7 +169,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef MAGICKCORE_MODULES_PATH
|
||||
-# define MAGICKCORE_MODULES_PATH MAGICKCORE_LIBRARY_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_MODULES_DIRNAME
|
||||
+# define MAGICKCORE_MODULES_PATH MAGICKCORE_XLIBRARY_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_MODULES_DIRNAME
|
||||
#endif
|
||||
|
||||
#ifndef MAGICKCORE_MODULES_RELATIVE_PATH
|
||||
@@ -208,7 +208,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef MAGICKCORE_SHAREARCH_PATH
|
||||
-# define MAGICKCORE_SHAREARCH_PATH MAGICKCORE_LIBRARY_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_SHAREARCH_DIRNAME MAGICKCORE_DIR_SEPARATOR
|
||||
+# define MAGICKCORE_SHAREARCH_PATH MAGICKCORE_XLIBRARY_PATH MAGICKCORE_DIR_SEPARATOR MAGICKCORE_SHAREARCH_DIRNAME MAGICKCORE_DIR_SEPARATOR
|
||||
#endif
|
||||
|
||||
#ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0d48abb..6b7e999 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3140,15 +3140,15 @@ AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory wher
|
||||
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([XLIBRARY_PATH],["$DEFINE_XLIBRARY_PATH"],[Directory where architecture-dependent files live.])
|
||||
+AC_SUBST([XLIBRARY_PATH])
|
||||
|
||||
#
|
||||
# path to local binaries
|
||||
@@ -3165,7 +3165,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])
|
||||
|
||||
#
|
||||
@@ -3185,7 +3185,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])
|
||||
|
||||
#
|
||||
@@ -3278,7 +3278,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.45.2
|
||||
|
||||
|
||||
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
|
||||
|
||||
A subdirectory is added to the final docDir
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 6b7e999..81dfc8e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -207,7 +207,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
|
||||
AC_SUBST([LIBEXEC_DIR])
|
||||
eval "eval DATA_DIR=$datadir"
|
||||
AC_SUBST([DATA_DIR])
|
||||
-eval "eval DOC_DIR=$datadir/doc"
|
||||
+eval "eval DOC_DIR=$docdir"
|
||||
AC_SUBST([DOC_DIR])
|
||||
eval "eval SYSCONF_DIR=$sysconfdir"
|
||||
AC_SUBST([SYSCONF_DIR])
|
||||
--
|
||||
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
|
||||
|
||||
46
media-gfx/imagemagick/patches/imagemagick-7.1.2.0.patchset
Normal file
46
media-gfx/imagemagick/patches/imagemagick-7.1.2.0.patchset
Normal file
@@ -0,0 +1,46 @@
|
||||
From 6efd585130bbad7fb32af5c79f8615320bd6e0db 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
|
||||
|
||||
A subdirectory is added to the final docDir
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e0fe9ae..a52668e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -207,7 +207,7 @@ eval "eval LIBEXEC_DIR=$libexecdir"
|
||||
AC_SUBST([LIBEXEC_DIR])
|
||||
eval "eval DATA_DIR=$datadir"
|
||||
AC_SUBST([DATA_DIR])
|
||||
-eval "eval DOC_DIR=$datadir/doc"
|
||||
+eval "eval DOC_DIR=$docdir"
|
||||
AC_SUBST([DOC_DIR])
|
||||
eval "eval SYSCONF_DIR=$sysconfdir"
|
||||
AC_SUBST([SYSCONF_DIR])
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
From e2d4682cf05508b580ed915dd24d58c1deba5b69 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 8523da9..e6d553f 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.48.1
|
||||
|
||||
Reference in New Issue
Block a user