diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 9 | ||||
| -rw-r--r-- | patches/imagemagick-7.0.9-12.local.patch | 54 | ||||
| -rw-r--r-- | patches/imagemagick-7.1.0-51.local.patch | 196 |
3 files changed, 200 insertions, 59 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 907cc7e4..7f17c96e 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -225,13 +225,12 @@ ac_cv_lib_ncursesw6_addnwstr=yes"}; : ${PKG_ICOUTILS_CONFIG_CACHE_EXTRA:=" am_cv_func_working_getline=yes gl_cv_func_getopt_gnu=yes"}; -: ${PKG_IMAGEMAGICK_DEPENDS:="curl bzip2 libz xz zstd"}; -: ${PKG_IMAGEMAGICK_SHA256SUM:=67859f9cba97f2c06b5e416898216e49216be00c7cba3dd89896e49331aef96d}; -: ${PKG_IMAGEMAGICK_VERSION:=7.0.9-12}; +: ${PKG_IMAGEMAGICK_DEPENDS:="bzip2 curl freetype2 fontconfig libpng libz libzip libxml2 tiff xz zstd"}; +: ${PKG_IMAGEMAGICK_SHA256SUM:=d1976c829c10aadfd52549d59934db4e9ea5d1f457a167445b37883ee751a0f9}; +: ${PKG_IMAGEMAGICK_VERSION:=7.1.0-51}; : ${PKG_IMAGEMAGICK_URL:=https://imagemagick.org/download/releases/ImageMagick-${PKG_IMAGEMAGICK_VERSION}.tar.xz}; : ${PKG_IMAGEMAGICK_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"}; -: ${PKG_IMAGEMAGICK_CONFIGURE_ARGS_EXTRA:="--enable-shared=yes --with-modules=yes --without-x --without-pango"}; -: ${PKG_IMAGEMAGICK_DISABLED:=1}; +: ${PKG_IMAGEMAGICK_CONFIGURE_ARGS_EXTRA:="--with-modules --without-x --without-pango --without-jemalloc --without-tcmalloc --without-umem"}; : ${PKG_INFOUNZIP_URLS_GIT:=infounzip=https://github.com/Redfoxmoon3/infounzip.git@master}; : ${PKG_INFOUNZIP_IN_TREE:=1}; : ${PKG_INFOUNZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}}; diff --git a/patches/imagemagick-7.0.9-12.local.patch b/patches/imagemagick-7.0.9-12.local.patch deleted file mode 100644 index abc7d617..00000000 --- a/patches/imagemagick-7.0.9-12.local.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- ImageMagick-7.0.9-12/configure.orig 2019-12-28 16:36:23.721685562 +0000 -+++ ImageMagick-7.0.9-12/configure 2019-12-28 16:36:28.661685403 +0000 -@@ -3622,7 +3622,7 @@ - for ac_dir in config "$srcdir"/config; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir -- ac_install_sh="$SHELL $ac_pwd/$ac_aux_dir/install-sh -c" -+ ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir -@@ -4566,7 +4566,7 @@ - - MAGICK_VERSION=7.0.9-12 - --MAGICK_GIT_REVISION=16588:7fdd47e:20191226 -+MAGICK_GIT_REVISION=0::20191228 - - - # Substitute library versioning -@@ -18287,6 +18287,16 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -22252,6 +22262,16 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+midipix*) -+ version_type=linux # correct to gnu/linux during the next big refactor -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' -+ soname_spec='$libname$release$shared_ext$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no diff --git a/patches/imagemagick-7.1.0-51.local.patch b/patches/imagemagick-7.1.0-51.local.patch new file mode 100644 index 00000000..79b4012f --- /dev/null +++ b/patches/imagemagick-7.1.0-51.local.patch @@ -0,0 +1,196 @@ +diff -ru ImageMagick-7.1.0-51.orig/configure ImageMagick-7.1.0-51/configure +--- ImageMagick-7.1.0-51.orig/configure 2022-10-16 17:54:02.000000000 +0200 ++++ ImageMagick-7.1.0-51/configure 2022-11-05 22:37:15.089499439 +0100 +@@ -18236,6 +18236,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -22765,6 +22775,16 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++midipix*) ++ version_type=linux # correct to gnu/linux during the next big refactor ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ soname_spec='$libname$release$shared_ext$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +Only in ImageMagick-7.1.0-51: configure.orig +diff -ru ImageMagick-7.1.0-51.orig/MagickCore/module.c ImageMagick-7.1.0-51/MagickCore/module.c +--- ImageMagick-7.1.0-51.orig/MagickCore/module.c 2022-10-16 17:53:13.000000000 +0200 ++++ ImageMagick-7.1.0-51/MagickCore/module.c 2022-11-05 22:34:35.101498468 +0100 +@@ -66,18 +66,14 @@ + #include "MagickCore/utility.h" + #include "MagickCore/utility-private.h" + #if defined(MAGICKCORE_MODULES_SUPPORT) +-#if defined(MAGICKCORE_LTDL_DELEGATE) +-#include "ltdl.h" +-typedef lt_dlhandle ModuleHandle; +-#else ++#include <dlfcn.h> + typedef void *ModuleHandle; +-#endif + + /* + Define declarations. + */ + #if defined(MAGICKCORE_LTDL_DELEGATE) +-# define ModuleGlobExpression "*.la" ++# define ModuleGlobExpression "*.so" + #else + # if defined(_DEBUG) + # define ModuleGlobExpression "IM_MOD_DB_*.dll" +@@ -893,9 +889,6 @@ + if (status == MagickFalse) + ThrowFatalException(ResourceLimitFatalError, + "MemoryAllocationFailed"); +- if (lt_dlinit() != 0) +- ThrowFatalException(ModuleFatalError, +- "UnableToInitializeModuleLoader"); + module_list=splay_tree; + } + UnlockSemaphoreInfo(module_semaphore); +@@ -992,11 +985,11 @@ + /* + Open the module. + */ +- handle=(ModuleHandle) lt_dlopen(path); ++ handle=(ModuleHandle) dlopen(path, RTLD_NOW); + if (handle == (ModuleHandle) NULL) + { + (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, +- "UnableToLoadModule","'%s': %s",name,lt_dlerror()); ++ "UnableToLoadModule","'%s': %s",name,dlerror()); + return(MagickFalse); + } + /* +@@ -1012,10 +1005,10 @@ + Execute the module. + */ + ClearMagickException(exception); +- image_filter=(ImageFilterHandler *) lt_dlsym(handle,name); ++ image_filter=(ImageFilterHandler *) dlsym(handle,name); + if (image_filter == (ImageFilterHandler *) NULL) + (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, +- "UnableToLoadModule","'%s': %s",name,lt_dlerror()); ++ "UnableToLoadModule","'%s': %s",name,dlerror()); + else + { + size_t +@@ -1036,9 +1029,9 @@ + /* + Close the module. + */ +- if (lt_dlclose(handle) != 0) ++ if (dlclose(handle) != 0) + (void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning, +- "UnableToCloseModule","'%s': %s",name,lt_dlerror()); ++ "UnableToCloseModule","'%s': %s",name,dlerror()); + return(exception->severity < ErrorException ? MagickTrue : MagickFalse); + } + +@@ -1283,11 +1276,11 @@ + */ + (void) LogMagickEvent(ModuleEvent,GetMagickModule(), + "Opening module at path \"%s\"",path); +- handle=(ModuleHandle) lt_dlopen(path); ++ handle=(ModuleHandle) dlopen(path, RTLD_NOW); + if (handle == (ModuleHandle) NULL) + { + (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, +- "UnableToLoadModule","'%s': %s",path,lt_dlerror()); ++ "UnableToLoadModule","'%s': %s",path,dlerror()); + return(MagickFalse); + } + /* +@@ -1301,11 +1294,11 @@ + Define RegisterFORMATImage method. + */ + TagToModuleName(module_name,"Register%sImage",name); +- module_info->register_module=(size_t (*)(void)) lt_dlsym(handle,name); ++ module_info->register_module=(size_t (*)(void)) dlsym(handle,name); + if (module_info->register_module == (size_t (*)(void)) NULL) + { + (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, +- "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror()); ++ "UnableToRegisterImageFormat","'%s': %s",module_name,dlerror()); + return(MagickFalse); + } + (void) LogMagickEvent(ModuleEvent,GetMagickModule(), +@@ -1315,11 +1308,11 @@ + Define UnregisterFORMATImage method. + */ + TagToModuleName(module_name,"Unregister%sImage",name); +- module_info->unregister_module=(void (*)(void)) lt_dlsym(handle,name); ++ module_info->unregister_module=(void (*)(void)) dlsym(handle,name); + if (module_info->unregister_module == (void (*)(void)) NULL) + { + (void) ThrowMagickException(exception,GetMagickModule(),ModuleError, +- "UnableToRegisterImageFormat","'%s': %s",module_name,lt_dlerror()); ++ "UnableToRegisterImageFormat","'%s': %s",module_name,dlerror()); + return(MagickFalse); + } + (void) LogMagickEvent(ModuleEvent,GetMagickModule(), +@@ -1471,7 +1464,7 @@ + if (IsEventLogging() != MagickFalse) + (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag); + #if defined(MAGICKCORE_LTDL_DELEGATE) +- (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag); ++ (void) FormatLocaleString(name,MagickPathExtent,"%s.so",tag); + (void) LocaleLower(name); + #else + #if defined(MAGICKCORE_WINDOWS_SUPPORT) +@@ -1525,7 +1518,7 @@ + #elif !defined(MAGICKCORE_LTDL_DELEGATE) + (void) FormatLocaleString(name,MagickPathExtent,"%s.dll",tag); + #else +- (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag); ++ (void) FormatLocaleString(name,MagickPathExtent,"%s.so",tag); + #endif + } + +@@ -1622,10 +1615,10 @@ + if (module_info->unregister_module == NULL) + return(MagickTrue); + module_info->unregister_module(); +- if (lt_dlclose((ModuleHandle) module_info->handle) != 0) ++ if (dlclose((ModuleHandle) module_info->handle) != 0) + { + (void) ThrowMagickException(exception,GetMagickModule(),ModuleWarning, +- "UnableToCloseModule","'%s': %s",module_info->tag,lt_dlerror()); ++ "UnableToCloseModule","'%s': %s",module_info->tag,dlerror()); + return(MagickFalse); + } + return(MagickTrue); +diff -ru ImageMagick-7.1.0-51.orig/MagickCore/opencl.c ImageMagick-7.1.0-51/MagickCore/opencl.c +--- ImageMagick-7.1.0-51.orig/MagickCore/opencl.c 2022-10-16 17:53:13.000000000 +0200 ++++ ImageMagick-7.1.0-51/MagickCore/opencl.c 2022-11-05 22:36:35.473499198 +0100 +@@ -2607,7 +2607,7 @@ + if (openCL_library != (MagickLibrary *) NULL) + { + if (openCL_library->library != (void *) NULL) +- (void) lt_dlclose(openCL_library->library); ++ (void) dlclose(openCL_library->library); + openCL_library=(MagickLibrary *) RelinquishMagickMemory(openCL_library); + } + } |